add pma etc. in bin directory, run pma.py etc. in pymodel

revise test*.py in all samples to use pma etc. not pma.py etc.
remove bin/tpath and tpath.bat, now included in pymodel_paths

Author: jon-jacky

bin/pma

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+"""
+This is pma command in bin directory, runs pma.py module in pymodel directory
+"""
+
+import pma  # find pma.py anywhere on Python path
+
+pma.main()

bin/pmg

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+"""
+This is pmg command in bin directory, runs pmg.py module in pymodel directory
+"""
+
+import pmg  # find pmg.py anywhere on Python path
+
+pmg.main()

bin/pmv

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+"""
+This is pmv command in bin directory, runs pmv.py module in pymodel directory
+"""
+
+import pmv  # find pmv.py anywhere on Python path
+
+pmv.main()

bin/tpath

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+import sys
+import os
+
+# argv[1] is name of module containing test cases
+# dir containing this module must be on PYTHONPATH
+
+test = __import__(sys.argv[1])
+
+# Test cases are in 'cases', a list of pairs of strings, descrip. and commmand:
+# cases = [
+#  ('Test PowerOn, PowerOff alternate due to enabling conditions',
+#   'pct.py -n 10 PowerSwitch'),
+#  ... ]
+
+for (description, cmd) in test.cases: 
+  print description
+  os.system(cmd)
+  print

bin/tpath.bat

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+"""
+This is wsgirunner command in bin directory, runs wsgirunner.py module in pymodel directory
+"""
+
+import wsgirunner  # find wsgirunner.py anywhere on Python path
+
+wsgirunner.main()

bin/trun

@@ -32,12 +32,16 @@ def command(cmd):
     if status:
         print 'Failed: %s' % cmd  # status 0 means success
 
-(options, args) = ViewerOptions.parse_args()
-basename = options.__dict__['output'] if options.__dict__['output'] else '%sFSM' % args[0]
-pma = 'pma.py ' + make_opts(pma_keys, options) + ' ' + ' '.join(args)
-command(pma)
-pmg = 'pmg.py ' + make_opts(pmg_keys, options) + ' %s' % basename
-command(pmg)
-dot = 'dot -T%(type)s -o %(name)s.%(type)s %(name)s.dot' % \
-    {'type': options.__dict__['fileType'], 'name': basename}
-command(dot)
+def main():
+    (options, args) = ViewerOptions.parse_args()
+    basename = options.__dict__['output'] if options.__dict__['output'] else '%sFSM' % args[0]
+    pma = 'pma ' + make_opts(pma_keys, options) + ' ' + ' '.join(args)
+    command(pma)
+    pmg = 'pmg ' + make_opts(pmg_keys, options) + ' %s' % basename
+    command(pmg)
+    dot = 'dot -T%(type)s -o %(name)s.%(type)s %(name)s.dot' % \
+        {'type': options.__dict__['fileType'], 'name': basename}
+    command(dot)
+
+if __name__ == ' __main__':
+    main()

bin/wsgirunner

@@ -1,14 +1,33 @@
-"""
-SpeedControl defined by FSM, no shared actions with PowerSwitch
-"""
+
+# pma --maxTransitions 100 --output SpeedControl SpeedControl
+# 3 states, 3 transitions, 1 accepting states, 0 unsafe states, 0 finished and 0 deadend states
+
+# actions here are just labels, but must be symbols with __name__ attribute
 
 def IncrementSpeed(): pass
 
-cleanup = (IncrementSpeed,)
+# states, key of each state here is its number in graph etc. below
+
+states = {
+  0 : {'SpeedControl': 0},
+  1 : {'SpeedControl': 1},
+  2 : {'SpeedControl': 2},
+}
+
+# initial state, accepting states, unsafe states, frontier states, deadend states
 
 initial = 0
-accepting = (0,)
+accepting = [0]
+unsafe = []
+frontier = []
+finished = []
+deadend = []
+runstarts = [0]
+
+# finite state machine, list of tuples: (current, (action, args, result), next)
 
-graph = ((0, (IncrementSpeed, (), None), 1),
-         (1, (IncrementSpeed, (), None), 2),
-         (2, (IncrementSpeed, (), None), 0))
+graph = (
+  (0, (IncrementSpeed, (), None), 1),
+  (1, (IncrementSpeed, (), None), 2),
+  (2, (IncrementSpeed, (), None), 0),
+)

pymodel/pmv.py

@@ -4,25 +4,25 @@
 
 cases = [
     ('Generate FSM from PowerSwitch model program',
-     'pma.py PowerSwitch'),
+     'pma PowerSwitch'),
 
     ('Generate dot graphics commands from generated PowerSwitchFSM',
-     'pmg.py PowerSwitchFSM'),
+     'pmg PowerSwitchFSM'),
 
     ('Generate SVG file from dot commands',
      'dotsvg PowerSwitchFSM'),
 
     ('Generate dot commands from SpeedControl FSM',
-     'pmg.py SpeedControl'),
+     'pmg SpeedControl'),
 
     ('Generate SVG file from dot commands',
      'dotsvg SpeedControl'),
 
     ('Generate FSM from composition of PowerSwitch and SpeedControl, show interleaving',
-     'pma.py SpeedControl PowerSwitch -o PowerSpeed'),
+     'pma SpeedControl PowerSwitch -o PowerSpeed'),
 
     ('Generate dot commands from composed FSM',
-     'pmg.py PowerSpeed'),
+     'pmg PowerSpeed'),
 
     ('Generate SVG from dot',
      'dotsvg PowerSpeed')