Mad

pymodel/ModelProgram.py

@@ -10,7 +10,7 @@
 import inspect
 import itertools
 from pymodel.model import Model
-import collections
+import collections, collections.abc
 import pprint
 
 DEBUG = False
@@ -69,15 +69,15 @@ def make_argslist(self, a):
     """
     Parameter generator: return list of all args combos for action symbol a
     """
-    arginfo = inspect.getargspec(a)# ArgInfo(args,varargs,keywords,locals)
+    arginfo = inspect.getfullargspec(a)# ArgInfo(args,varargs,keywords,locals)
     if arginfo[0]:
       args = arginfo[0] # usual case: fixed sequence of positional arguments
     elif arginfo[1]:
       args = [arginfo[1]] # special case: either no arg, or one exception arg
     else:
       args = () # no arguments anywhere, args must have this value
     domains = [ self.module.domains[a][arg]() # evaluate state-dependent domain
-                if isinstance(self.module.domains[a][arg], collections.Callable) 
+                if isinstance(self.module.domains[a][arg], collections.abc.Callable)
                 else self.module.domains[a][arg] # look up static domain
                 for arg in args if a in self.module.domains ]
     combination = self.module.combinations.get(a, 'all')  # default is 'all'
@@ -125,7 +125,7 @@ def ActionEnabled(self, a, args):
     else:
       # Assumes enablers[a] has only one item, always true in this version
       a_enabled = self.module.enablers[a][0]
-      nparams = len(inspect.getargspec(a_enabled)[0])
+      nparams = len(inspect.getfullargspec(a_enabled)[0])
       nargs = len(args)
       # nparams == 0 means match any args
       if nparams > 0 and nparams != nargs:

pymodel/pmg.py

@@ -2,17 +2,21 @@
 """
 PyModel Graphics - generate graphics from pymodel FSM
 """
+import os.path
 
 from pymodel import GraphicsOptions
 from pymodel.Dot import dotfile
+import importlib
+import sys
 
 def main():
     (options, args) = GraphicsOptions.parse_args()
     if not args or len(args) > 2: # args must include one FSM module
         GraphicsOptions.print_help()
         exit()
     else:
-        fsm = __import__(args[0])
+        sys.path.append(os.path.dirname(os.path.abspath(args[0])))
+        fsm = importlib.import_module(args[0])
         fbasename = options.output if options.output else args[0]
         fname = '%s.dot' % fbasename
         dotfile(fname, fsm, options.transitionLabels, options.noStateTooltip,

pymodel/trun.py

@@ -2,6 +2,7 @@
 
 import sys
 import os
+import importlib
 
 # argv[1] is name of module containing test cases
 # dir containing this module must be on PYTHONPATH
@@ -11,7 +12,8 @@
   sys.exit()
 
 try:
-  test = __import__(sys.argv[1])
+  sys.path.append(os.path.curdir)
+  test = importlib.import_module(sys.argv[1])
 except ModuleNotFoundError:
   print('\nCould not find tests file "{}".\n\n'.format(sys.argv[1]))
   sys.exit()

samples/PowerSwitch/SpeedControlFSM.py

@@ -0,0 +1,33 @@
+
+# pma 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
+
+# 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]
+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),
+)