umaudemc 0.12.2__py3-none-any.whl → 0.13.1__py3-none-any.whl

umaudemc/simulators.py

@@ -79,8 +79,9 @@ class BaseSimulator:
 		if not t:
 			t, var = parse_hole_term(self.module, observation)
 			self.obs_cache[observation] = (t, var)
-		subs = maude.Substitution({var: self.state})
-		t = subs.instantiate(t)
+		if var is not None:
+			subs = maude.Substitution({var: self.state})
+			t = subs.instantiate(t)
 		t.reduce()
 
 		return float(t == self.true) if t.getSort() == self.bool_sort else float(t)

umaudemc/statistical.py

@@ -221,6 +221,7 @@ def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, ba
 def run_parallel(program, qdata, num_sims, max_sim, simulator, alpha, delta, block_size, jobs, verbose=False):
 	"""Run the simulation in multiple threads"""
 	import multiprocessing as mp
+	mp.set_start_method('fork', force=True)
 
 	# When the number of jobs is zero or negative, we take the CPU count
 	if jobs <= 0:

umaudemc/webui.py

@@ -2,7 +2,6 @@
 # Web-based user interface
 #
 
-import cgi
 import http.server
 import json
 import math
@@ -156,10 +155,10 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
 	"""Object charged of handling the requests"""
 
 	STATIC_FILES = {
-		'/'		: ('select.htm', 'text/html; charset=utf-8'),
-		'/smcview.css'	: ('smcview.css', 'text/css; charset=utf-8'),
-		'/smcview.js'	: ('smcview.js', 'text/javascript; charset=utf-8'),
-		'/smcgraph.js'	: ('smcgraph.js', 'text/javascript; charset=utf-8'),
+		'/'            : ('select.htm', 'text/html; charset=utf-8'),
+		'/smcview.css' : ('smcview.css', 'text/css; charset=utf-8'),
+		'/smcview.js'  : ('smcview.js', 'text/javascript; charset=utf-8'),
+		'/smcgraph.js' : ('smcgraph.js', 'text/javascript; charset=utf-8'),
 	}
 
 	def do_GET(self):
@@ -176,12 +175,11 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
 			self.send_error(404)
 
 	def do_POST(self):
-		form = cgi.FieldStorage(fp=self.rfile, headers=self.headers,
-		                        environ={'REQUEST_METHOD': 'POST',
-		                                 'CONTENT_TYPE': self.headers['Content-Type']})
+		# Read the JSON body of the request
+		form = json.loads(self.rfile.read(int(self.headers['Content-Length'])))
 
-		question = form.getvalue('question')
-		url = form.getvalue('url', None)
+		question = form.get('question')
+		url = form.get('url', None)
 
 		if question == 'ls':
 			base, parent, dirs, files = self.server.info.path_handler.browse_dir(url)
@@ -194,10 +192,10 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
 				self.end_headers()
 
 				response = {
-					'base'		: base,
-					'parent'	: parent,
-					'dirs'		: dirs,
-					'files'		: files
+					'base'	 : base,
+					'parent' : parent,
+					'dirs'   : dirs,
+					'files'  : files
 				}
 				self.wfile.write(json.dumps(response).encode('utf-8'))
 		elif question == 'sourceinfo':
@@ -217,16 +215,16 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
 			self.send_response(200)
 			self.send_header('Content-Type', 'text/json; charset=utf-8')
 			self.end_headers()
-			mod = form.getvalue('mod')
+			mod = form.get('mod')
 			minfo = self.server.info.remote.getModuleInfo(mod)
 			response = {
-				'name'		: mod,
-				'type'		: minfo['type'],
-				'params'	: [],
-				'valid'		: minfo['valid'],
-				'stateSorts'	: minfo.get('state', []),
-				'strategies'	: [self.make_signature(signat) for signat in minfo.get('strat', ())],
-				'props'		: [self.make_signature(signat) for signat in minfo.get('prop', ())]
+				'name'       : mod,
+				'type'       : minfo['type'],
+				'params'     : [],
+				'valid'      : minfo['valid'],
+				'stateSorts' : minfo.get('state', []),
+				'strategies' : [self.make_signature(signat) for signat in minfo.get('strat', ())],
+				'props'      : [self.make_signature(signat) for signat in minfo.get('prop', ())]
 			}
 			self.wfile.write(json.dumps(response).encode('utf-8'))
 		elif question == 'modelcheck':
@@ -234,13 +232,13 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
 			self.send_header('Content-Type', 'text/json; charset=utf-8')
 			self.end_headers()
 			data = {
-				'module':  form.getvalue('mod'),
-				'initial': form.getvalue('initial'),
-				'formula': form.getvalue('formula'),
-				'strat':   form.getvalue('strategy'),
-				'opaques': form.getvalue('opaques'),
-				'passign': self.make_passign(form),
-				'reward':  form.getvalue('reward', None),
+				'module'  :  form.get('mod'),
+				'initial' : form.get('initial'),
+				'formula' : form.get('formula'),
+				'strat'   :   form.get('strategy'),
+				'opaques' : form.get('opaques'),
+				'passign' : self.make_passign(form),
+				'reward'  :  form.get('reward', None),
 			}
 			result = self.server.info.remote.modelCheck(data)
 			response = {
@@ -267,7 +265,7 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
 
 			self.wfile.write(json.dumps(response).encode('utf-8'))
 		elif question == 'wait':
-			mcref = int(form.getvalue('mcref'))
+			mcref = int(form.get('mcref'))
 
 			# Model checking is actually done here
 			result = self.server.info.remote.get_result(mcref)
@@ -327,16 +325,16 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
 	def make_passign(form):
 		"""Build a passign term from its name and argument"""
 
-		name = form.getvalue('pmethod', None)
+		name = form.get('pmethod', None)
 
 		if name is None:
 			return None
 
-		argument = form.getvalue('pargument', '')
+		argument = form.get('pargument', '')
 
 		# Add mdp- prefix when MDP is selected and admissible
 		can_mdp = name not in ('uaction', 'strategy')
-		mdp = 'mdp-' if can_mdp and form.getvalue('mdp') == 'true' else ''
+		mdp = 'mdp-' if can_mdp and form.get('mdp') == 'true' else ''
 
 		return f'{mdp}{name}({argument})' if argument else f'{mdp}{name}'
 

umaudemc/wrappers.py

@@ -11,6 +11,8 @@ from .common import maude, default_model_settings
 
 
 def default_getNextStates(self, stateNr):
+	"""Generator of all the successors of a state"""
+
 	index = 0
 	next_state = self.getNextState(stateNr, index)
 
@@ -20,10 +22,38 @@ def default_getNextStates(self, stateNr):
 		next_state = self.getNextState(stateNr, index)
 
 
+def standard_getTransitions(self, stateNr):
+	"""Generator of all the transitions (target state and rule) of a rewrite graph"""
+
+	index = 0
+	next_state = self.getNextState(stateNr, index)
+
+	while next_state != -1:
+		yield next_state, self.getRule(stateNr, next_state)
+		index = index + 1
+		next_state = self.getNextState(stateNr, index)
+
+
+def strategy_getTransitions(self, stateNr):
+	"""Generator of all the transitions of a strategy-controlled rewrite graph"""
+
+	index = 0
+	next_state = self.getNextState(stateNr, index)
+
+	while next_state != -1:
+		yield next_state, self.getTransition(stateNr, next_state)
+		index = index + 1
+		next_state = self.getNextState(stateNr, index)
+
+
 # Add getNextStates to the original graphs
 maude.RewriteGraph.getNextStates = default_getNextStates
 maude.StrategyRewriteGraph.getNextStates = default_getNextStates
 
+# Add getTransitions to the original graphs
+maude.RewriteGraph.getTransitions = standard_getTransitions
+maude.StrategyRewriteGraph.getTransitions = strategy_getTransitions
+
 # Add a property to know whether the graph is strategy-controlled
 maude.RewriteGraph.strategyControlled = False
 maude.StrategyRewriteGraph.strategyControlled = True
@@ -50,6 +80,9 @@ class WrappedGraph:
 	def getTransition(self, *args):
 		return self.graph.getTransition(*args)
 
+	def getTransitions(self, stateNr):
+		return self.graph.getTransitions(stateNr)
+
 	def getNrStates(self):
 		return self.graph.getNrStates()
 
@@ -113,6 +146,11 @@ class FailFreeGraph(WrappedGraph):
 			if self.valid_states[next_state]:
 				yield next_state
 
+	def getTransitions(self, stateNr):
+		for next_state, edge in self.graph.getTransitions(stateNr):
+			if self.valid_states[next_state]:
+				yield next_state, edge
+
 
 class MergedGraph:
 	"""A graph where states are merged"""
@@ -141,6 +179,10 @@ class MergedGraph:
 					return trans
 		return None
 
+	def getTransitions(self, stateNr):
+		for next_state in self.getNextStates(stateNr):
+			yield next_state, self.getTransition(stateNr, next_state)
+
 	def getNrStates(self):
 		return len(self.states)
 
@@ -252,7 +294,7 @@ class BoundedGraph(WrappedGraph):
 				yield next_state
 
 
-def wrapGraph(graph, purge_fails, merge_states):
+def wrap_graph(graph, purge_fails, merge_states):
 	"""Wrap graphs according to the model modification options"""
 	if purge_fails == 'yes':
 		graph = FailFreeGraph(graph)
@@ -277,4 +319,4 @@ def create_graph(term=None, strategy=None, opaque=(), full_matchrew=False, purge
 	# Wrap the graph with the model modification for branching-time
 	purge_fails, merge_states = default_model_settings(logic, purge_fails, merge_states, strategy,
 	                                                   tableau=tableau)
-	return wrapGraph(graph, purge_fails, merge_states)
+	return wrap_graph(graph, purge_fails, merge_states)

{umaudemc-0.12.2.dist-info → umaudemc-0.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umaudemc
-Version: 0.12.2
+Version: 0.13.1
 Summary: Unified Maude model-checking utility
 Author-email: ningit <ningit@users.noreply.github.com>
 License: GPLv3

{umaudemc-0.12.2.dist-info → umaudemc-0.13.1.dist-info}/RECORD

@@ -1,29 +1,30 @@
-umaudemc/__init__.py,sha256=KzYlv9mV5BAclb_b4mb6NprSS8L9Xd0qsNzjQFwnp30,23
-umaudemc/__main__.py,sha256=KsbrKvz4NZdZqgzMwPGtZRGVNlyhGcYIB8PawpB_8uA,13892
-umaudemc/api.py,sha256=dgpq4gfYQ6eCoaI5ChHGAeibbsXYItLO1nUuB5qkssk,19732
+umaudemc/__init__.py,sha256=pMjW1X1oCiVe0NrTCY4GkT0Wt53V0JJzr08mFS8RKk8,23
+umaudemc/__main__.py,sha256=PBIa2mStJwNIK5YnwoCefEB_a59VLkHE_Zp_1hnMyg4,14060
+umaudemc/api.py,sha256=I-o5foy8NUlO4JT4pX9L7kkuHQG_8_GMkWlOKt708E8,19733
 umaudemc/backends.py,sha256=mzJkALYwcKPInT0lBiRsCxJSewKvx5j_akQsqWN1Ezo,4590
-umaudemc/common.py,sha256=oEEjXfdytVnfoq60N1iayjiAfHS6C4L4d_RKJl8Q3rw,6032
-umaudemc/counterprint.py,sha256=WCPiEKXXWXKzALjz7onsbt74_L3OUnk2iWCI_tTHoDM,9114
-umaudemc/formatter.py,sha256=jZbrDUr6fnJiVG9hRCU63rvdLk9TnHs22Tw1R3M5HbU,6560
+umaudemc/common.py,sha256=5jtR_HLZmTDrZFU2Isd3tJudZdMD-RbkiuHMUA3wPiE,4922
+umaudemc/counterprint.py,sha256=vVqM_UjGRk_xeftFxBGI5m6cQXV7mf8KvbQ_fvAvSQk,9226
+umaudemc/formatter.py,sha256=36l0nc9IIe4B0_eW_PPfDTIxJj0mHKZfddCUugrEyjM,6024
 umaudemc/formulae.py,sha256=jZPPDhjgsb7cs5rWvitiQoO0fd8JIlK98at2SN-LzVE,12156
-umaudemc/grapher.py,sha256=mUQjf48Rv0Ej0j6TIozVHfq2Np__j_KbEnygs1n_fbQ,4291
-umaudemc/gtk.py,sha256=WyAvI4ovXatKxJuKyAcJ36o2py5-thMAzSh-CfdT8Gg,17883
+umaudemc/grapher.py,sha256=K1chKNNlEzQvfOsiFmRPJmd9OpxRIrg6OyiMW6gqOCU,4348
+umaudemc/gtk.py,sha256=61p4_OSFDfNHFD4lLz3QTZ7yZBra3RINmgbcnB-mUis,4249
 umaudemc/jani.py,sha256=N5tE28jZC_OsI041nXOn02THlokpweATtEK-nx9pfWE,4130
+umaudemc/kleene.py,sha256=Yxo9O2rjJNpS6y4Qfb_SP71tDrryV0KKUfmBIKXypwg,4458
 umaudemc/mproc.py,sha256=9X5pTb3Z3XHcdOo8ynH7I5RZQpjzm9xr4IBbEtaglUE,11766
-umaudemc/opsem.py,sha256=ICIzlAb6ubwpKbOVM8Un23LZ5ZW2DDr7euapwM1axMY,9451
-umaudemc/probabilistic.py,sha256=muyRxvmiMUw8GWkmm3mCPa0OJ6DUbbuCDE69BrsIYy0,29211
-umaudemc/pyslang.py,sha256=UnQwHov_2-mq-G0DN8N5TEd220rzG6uVWxbmDsFz2lE,81128
+umaudemc/opsem.py,sha256=p49k8Dto0zJ7jeI8Ih5Q9bB4lqMQaF39kxprlvCMN3U,9448
+umaudemc/probabilistic.py,sha256=f1ZtV84mAuaaGSmYCpun8gaUi5PFGCPD96BUgYvvBGk,29304
+umaudemc/pyslang.py,sha256=m501iqJb4fVlIimpOy_tO7woK5QLkTWYav0no7onoXM,85099
 umaudemc/quatex.py,sha256=HQoiC8N7WnloHPBgNlcpWUi0NcIyUXm3IK_glfHbu4A,21611
 umaudemc/resources.py,sha256=k1sekrTafAcOb7GQN-mx2BgCBEBPUi-IR_4EjNjRRmU,1530
-umaudemc/simulators.py,sha256=gjCWR-TiPeOv65viH-djAkazqaLV0olwfbU6Nak2rdE,13205
-umaudemc/statistical.py,sha256=Az7r4uuB1XrO4akBiYu2th7DSPGzDDAacu6W5wJym-Q,9015
+umaudemc/simulators.py,sha256=84W30MWWe4QRxK24RGA0zuwXjPya4wH18PrhPKdOpyU,13229
+umaudemc/statistical.py,sha256=g5tfSzRWzKWivP793dxXuUJ1ftRrJKlSi27qvPPMxZs,9056
 umaudemc/terminal.py,sha256=B4GWLyW4Sdymgoavj418y4TI4MnWqNu3JS4BBoSYeTc,1037
 umaudemc/usermsgs.py,sha256=d3RfyBGEBmcV_c2MeXWCtZIiiM2vFnaHsN3MHwMnyAs,583
-umaudemc/webui.py,sha256=OQNqCigp1KepgLk-K4JX6TXEcKLWRzDaqTtvQiZTXaI,11196
-umaudemc/wrappers.py,sha256=8auVvHxdJdBgdMaMWCerdtJ-OurHYrFUWNR0XxJkA9g,8104
+umaudemc/webui.py,sha256=7dWf5VVl5dGN9oBVTT8m6F4v_QqEbsKSH67q5FljuT8,11071
+umaudemc/wrappers.py,sha256=uz9JV1zBVqzkuoByUd569fEcSxT_00aCJw-jcDtrFpE,9399
 umaudemc/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umaudemc/backend/_pymc.py,sha256=asfN3uc0PbizVTiBt0Hs1n7jxzUN629Baj90z5X8Gjc,6679
-umaudemc/backend/_spot.py,sha256=aLj--3xBbYYOF7vkch0n2RFPUm-R49LFQUIy2O6P2nQ,9346
+umaudemc/backend/_spot.py,sha256=rwnXJG98kLsjjobeYdFh5RqK07al0bGMzjz2gLnUPOQ,9166
 umaudemc/backend/_storm.py,sha256=yhHPNxLOekr9ZdzZv5Jzv1K6R5hIrYKQ4SES0rds_0A,4675
 umaudemc/backend/_stormpy.py,sha256=KPbRkVYZhwlL007GfbJJc2VBHbBz3_UKqUNM0FV7PyU,8280
 umaudemc/backend/bmcalc.py,sha256=fE6RxIETYu-ywzrwRvWJP5ZZbZXuUbO6TdV4bcJjA6E,17502
@@ -36,7 +37,7 @@ umaudemc/backend/spot.py,sha256=P7vkxhY7Tx9J_rOmlua3bfiO8iMgNIuEi25ZNYZRLHk,283
 umaudemc/backend/storm.py,sha256=FlhJ0ZkJO84GjEUxuE2hQQJxJoeE_lElBB5NJL4NXTU,276
 umaudemc/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umaudemc/command/check.py,sha256=fzRUGAHNudZPYFk94ekwKplv9N7Fhsrmf5pOFsvPZwA,12030
-umaudemc/command/graph.py,sha256=_daLmzaE_Wads2jDET4Ry7xrwbQc338rm7bGluKh24o,5257
+umaudemc/command/graph.py,sha256=74U-yY9NEm5oTeUjspkwy6Ve_eLBTwx8LgZDzUk2LQw,6112
 umaudemc/command/pcheck.py,sha256=RcgwQn8xBgt9eZC1sE3JzR97MB0SC6Q1AXuiKkkzJes,7274
 umaudemc/command/scheck.py,sha256=eRGE-2SsOf6etIfJQ9dJe4cSch8qAs7IuOR94i-E1_U,4653
 umaudemc/command/test.py,sha256=4Uw83V-gVbm21L0Zkv3mKOUpamiNM-qMxGVAYs-trdY,38734
@@ -47,11 +48,11 @@ umaudemc/data/result.htm,sha256=IwllBM3p4F-QFvOYZZR6bZicL-FuuPLainU9DUPPyNA,1766
 umaudemc/data/select.htm,sha256=g0eXHHFxRpxJ9tqOfSgn_QmSQy0E-ET7MimBllGk6vk,4600
 umaudemc/data/smcgraph.js,sha256=iCNQNmsuGdL_GLnqVhGDisediFtedxw3C24rxSiQwx8,6674
 umaudemc/data/smcview.css,sha256=ExFqrMkSeaf8VxFrJXflyCsRW3FTwbv78q0Hoo2UVrM,3833
-umaudemc/data/smcview.js,sha256=ioE4DNE1bOJjc0hQND0KKjzVDZIYnZZH58D40Y9nPqI,14113
+umaudemc/data/smcview.js,sha256=_fHum1DRU1mhco-9-c6KqTLgiC5u_cCUf61jIK7wcIQ,14509
 umaudemc/data/templog.maude,sha256=TZ-66hVWoG6gp7gJpS6FsQn7dpBTLrr76bKo-UfHGcA,9161
-umaudemc-0.12.2.dist-info/LICENSE,sha256=MrEGL32oSWfnAZ0Bq4BZNcqnq3Mhp87Q4w6-deXfFnA,17992
-umaudemc-0.12.2.dist-info/METADATA,sha256=GmoVoe-UdJ48-q77XoULloQvXkOyNr8rKdRtEgcXRLk,1693
-umaudemc-0.12.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-umaudemc-0.12.2.dist-info/entry_points.txt,sha256=8rYRlLkn4orZtAoujDSeol1t_UFBrK0bfjmLTNv9B44,52
-umaudemc-0.12.2.dist-info/top_level.txt,sha256=Yo_CF78HLGBSblk3890qLcx6XZ17zHCbGcT9iG8sfMw,9
-umaudemc-0.12.2.dist-info/RECORD,,
+umaudemc-0.13.1.dist-info/LICENSE,sha256=MrEGL32oSWfnAZ0Bq4BZNcqnq3Mhp87Q4w6-deXfFnA,17992
+umaudemc-0.13.1.dist-info/METADATA,sha256=FYNu7K2Mr4bn93Y0ssvIMn7jXBcK-okaAgVKP4nlBHY,1693
+umaudemc-0.13.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+umaudemc-0.13.1.dist-info/entry_points.txt,sha256=8rYRlLkn4orZtAoujDSeol1t_UFBrK0bfjmLTNv9B44,52
+umaudemc-0.13.1.dist-info/top_level.txt,sha256=Yo_CF78HLGBSblk3890qLcx6XZ17zHCbGcT9iG8sfMw,9
+umaudemc-0.13.1.dist-info/RECORD,,

{umaudemc-0.12.2.dist-info → umaudemc-0.13.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any