umaudemc 0.12.1__py3-none-any.whl → 0.13.0__py3-none-any.whl

umaudemc/__init__.py

@@ -1 +1 @@
-__version__ = '0.12.1'
+__version__ = '0.12.2'

umaudemc/__main__.py

@@ -62,7 +62,8 @@ def add_backend_arg(parser):
 
 	parser.add_argument(
 		'--backend',
-		help='comma-separated prioritized list of model-checking backends (among maude, ltsmin, pymc, nusmv, spot, spin, builtin)'
+		help='comma-separated prioritized list of model-checking backends '
+		     '(among maude, ltsmin, pymc, nusmv, spot, spin, builtin)'
 	)
 
 
@@ -205,6 +206,11 @@ def build_parser():
 		help='probability assignment method for adding them to the graph',
 		metavar='METHOD'
 	)
+	parser_graph.add_argument(
+		'-k', '--kleene-iteration',
+		help='write annotations on the transitions starting and terminating an iteration',
+		action='store_true'
+	)
 	parser_graph.set_defaults(mode='graph')
 
 	#

umaudemc/api.py

@@ -215,7 +215,7 @@ class MaudeModel:
 		:type merge_states: str
 		:param backends: Prioritized list of model checking backends to be used
 		:type backends: str or list of str
-		:param formula_str: Formula given a a string (in case formula is a list)
+		:param formula_str: Formula given a string (in case formula is a list)
 		:type formula_str: str or None
 		:param logic: Logic (in case formula is a list)
 		:type logic: str
@@ -297,7 +297,7 @@ class MaudeModel:
 				wgraph = _wrappers.BoundedGraph(self.graph, depth) if depth > 0 else self.graph
 
 				# Create and store the wrapped graph
-				wgraph = _wrappers.wrapGraph(wgraph, purge, merge)
+				wgraph = _wrappers.wrap_graph(wgraph, purge, merge)
 				self.wgraphs[(purge, merge, depth > 0)] = wgraph
 
 				# In case both purge and merge are used, we keep the purged
@@ -517,7 +517,7 @@ class MaudeModel:
 
 	def print_counterexample(self, stats, printer=None, sformat=None, eformat=None):
 		"""
-		Pretty print an counterexample for a previous check (nothing is printed
+		Pretty print a counterexample for a previous check (nothing is printed
 		if no counterexample has been found)
 
 		:param stats: Statistics produced by the check method

umaudemc/backend/_spot.py

@@ -8,7 +8,6 @@ import buddy
 import spot
 
 from ..formulae import collect_aprops
-from ..opsem import OpSemKleeneInstance, OpSemGraph
 from ..wrappers import create_graph
 
 
@@ -136,9 +135,10 @@ class KleeneModelBuilder(SpotModelBuilder):
 	"""Generator of ω-automata for strategy-controlled models with an iteration like the Kleene star"""
 
 	def __init__(self, module, initial, strategy, aprops, bdd_dict, metamodule=None, opaques=()):
-		self.instance = OpSemKleeneInstance.make_instance(module, metamodule)
+		from ..kleene import get_kleene_graph_mts
 
-		super().__init__(self.instance.make_graph(initial, strategy, opaques), aprops, bdd_dict)
+		# opaque strategies are ignored with the new implementation
+		super().__init__(get_kleene_graph_mts(module, initial, strategy), aprops, bdd_dict)
 
 		# Table of distinct iterations (from their context to the index of
 		# its accepting condition)
@@ -166,7 +166,7 @@ class KleeneModelBuilder(SpotModelBuilder):
 			state = pending.pop()
 			state_spot = self.state_map[state]
 
-			for next_state in self.graph.getNextStates(state):
+			for next_state, edge in self.graph.getTransitions(state):
 				next_state_spot = self.state_map.get(next_state)
 
 				if next_state_spot is None:
@@ -175,10 +175,10 @@ class KleeneModelBuilder(SpotModelBuilder):
 					pending.append(next_state)
 
 				# Check the iteration tags and set the accepting labels of the edges
-				next_state_term = self.instance.get_cterm(self.graph.getStateTerm(next_state))
+				next_state_term = self.graph.getStateTerm(next_state)
 				acc_set = []
 
-				for tag, enter in self.instance.extract_tags(self.graph.getStateTerm(next_state)):
+				for tag, enter in edge.iterations:
 					acc_index = self.iter_map.get(tag)
 
 					if acc_index is None:
@@ -299,7 +299,6 @@ class SpotBackend:
 			stats['counterexample'] = model_builder.extract_counterexample(run, model_automaton)
 
 		if get_graph:
-			stats['graph'] = model_builder.graph if not kleene_iteration \
-				else OpSemGraph(model_builder.graph, model_builder.instance)
+			stats['graph'] = model_builder.graph
 
 		return holds, stats

umaudemc/backend/bmcalc.py

@@ -85,21 +85,21 @@ class ParityGame:
 
 		# The recursive Zielonka's algorithm implemented in solve_rec does not
 		# take finite plays into account, which are handled here. The recursive
-		# algorithm receives a a game without deadlock states.
+		# algorithm receives a game without deadlock states.
 		# (this decomposition is sound, because if player i can force the game
 		# to reach a deadlock state for 1-i, player 1-i cannot force reaching a
 		# deadlock state for i nor an infinite play)
 		w0, w1 = self.solve_rec(whole_game - finite_win0 - finite_win1)
 
-		# The winning states for each player are the union of those in which
-		# they have an infinite and those in which they a finite winning strategy
+		# The winning states for each player are the union of those in which they
+		# have an infinite and those in which they have a finite winning strategy
 		return w0.union(finite_win0), w1.union(finite_win1)
 
 	def attractor(self, player, subgame, subset):
 		"""Compute the attractor of a subset on a subgraph for a player"""
 
-		# Iteratively extend subset with the states where it is sure that
-		# the given player can reach the previous subset.
+		# Iteratively extend subset with the states where it is certain
+		# that the given player can reach the previous subset.
 
 		while True:
 			# reach is what will be added to the attractor at each step
@@ -180,7 +180,7 @@ class ParityGame:
 
 			# Solve subgame once subgame - B has been solved
 			# (notice that the subgame variable is not really the
-			# subgame, which is not longer needed, but B)
+			# subgame, which is no longer needed, but B)
 			elif phase == 2:
 				B = subgame
 				result[1-player].update(B)
@@ -382,7 +382,7 @@ class MuMaudeGame(ParityGame):
 				node = self.add_state(player, 0)
 
 			elif head == '~_':
-				# Formulae is assumed to be in negative normal form
+				# Formulae are assumed to be in negative normal form
 				player = 0 if self.check_aprop(state, self.formula_nodes[fnode.children[0]].extra) else 1
 				node = self.add_state(player, 0)
 
@@ -440,7 +440,7 @@ class MuMaudeGame(ParityGame):
 				self.add_edge(parent, node)
 
 	def solve_mucalc(self):
-		"""Generate a solve the μ-calculus game"""
+		"""Solve the μ-calculus game"""
 
 		self.build()
 		w0, w1 = self.solve()

umaudemc/backend/ltsmin.py

@@ -330,7 +330,7 @@ class LTSmin:
 			aprops = set()
 			collect_aprops(formula, aprops)
 
-		# Create a instance of LTSmin and run it
+		# Create an instance of LTSmin and run it
 		runner = self.new_runner()
 		runner.set_module(module_str, metamodule_str, labels, opaque)
 		runner.add_formula(formula, logic, aprops)

umaudemc/backend/nusmv.py

@@ -315,7 +315,7 @@ class NuSMVGrapher:
 		print('  esac;', file=self.outfile)
 
 	def explore(self, graph, stateNr, bound=-1):
-		"""Explore the graph up to a optional given depth, adding the nodes to the visited set"""
+		"""Explore the graph up to an optional given depth, adding the nodes to the visited set"""
 		# Depth-first search with a stack
 		pending = [(stateNr, bound)]
 		self.visited.add(stateNr)

umaudemc/backend/prism.py

@@ -136,7 +136,7 @@ def make_prism_query(form, aprops, deterministic, raw_form=None, cost=False, rew
 		else:
 			full_formula = f'{query}=? [ {prism_formula} ]'
 
-	# Otherwise, if the model is a MDP, we calculate the minimum
+	# Otherwise, if the model is an MDP, we calculate the minimum
 	# and maximum probabilities for the formula
 	else:
 		# Multiple formulae are admitted separated by semicolon
@@ -148,7 +148,7 @@ def make_prism_query(form, aprops, deterministic, raw_form=None, cost=False, rew
 def collect_raw_aprops(form, aprops):
 	"""Collect atomic propositions from raw formula"""
 
-	# The start of the last string, whether a escape character
+	# The start of the last string, whether an escape character
 	# has been just seen, the algorithm state (out, string or braces),
 	# and the position where the current proposition starts
 	last, escaped, state, pos = 0, False, 'o', 0
@@ -208,7 +208,7 @@ class PRISMBasedBackend:
 			# Output the DTMC or MDP for the model
 			# Expand the graph and calculate the output degrees
 			grapher.graph(graph)
-			# Output the map of an user-specified reward
+			# Output the map of a user-specified reward
 			if reward is not None:
 				grapher.make_reward(graph, 'user', reward)
 

umaudemc/backend/spin.py

@@ -295,7 +295,7 @@ class SpinGrapher:
 		print('  od\n}', file=self.outfile)
 
 	def explore(self, graph, stateNr, bound=-1):
-		"""Explore the graph up to a optional given depth, adding the nodes to the visited set"""
+		"""Explore the graph up to an optional given depth, adding the nodes to the visited set"""
 		# Depth-first search with a stack
 		pending = [(stateNr, bound)]
 		self.visited.add(stateNr)

umaudemc/command/acheck.py

@@ -0,0 +1,21 @@
+#
+# Admissibility checking subcommand
+#
+
+import os
+
+from ..common import parse_initial_data, usermsgs
+# Meter las herramientas en backends y usar la misma estrategia que en otros contextos
+
+def acheck(args):
+	"""Admissibility check subcommand"""
+
+	# Parse the module data
+	data = parse_initial_data(args, only_module=True)
+
+	if data is None:
+		return 1
+
+	print(data.module)
+
+	return 0

umaudemc/command/graph.py

@@ -11,7 +11,7 @@ from shutil import which
 from ..common import maude, usermsgs, default_model_settings, parse_initial_data, split_comma
 from ..formatter import get_formatters
 from ..grapher import DOTGrapher, PDOTGrapher, TikZGrapher
-from ..wrappers import wrapGraph
+from ..wrappers import wrap_graph
 
 
 class ProcessStream:
@@ -96,6 +96,18 @@ def graph(args):
 	                                                   args.merge_states,
 	                                                   args.strategy)
 
+	# Check the Kleene iteration flag
+	kleene_graph = False
+
+	if args.kleene_iteration:
+		if not with_strategy:
+			usermsgs.print_warning('The --kleene-iteration flag should only be used with a strategy. Ignoring.')
+		elif args.passign:
+			usermsgs.print_warning('The --kleene-iteration flag cannot be used with probabilities. Ignoring.')
+		else:
+			kleene_graph = True
+
+
 	# Select the appropriate rewriting graph
 	# (probabilistic, strategy-controlled, or standard)
 	if args.passign or oformat in ('prism', 'jani'):
@@ -106,20 +118,25 @@ def graph(args):
 		                                  purge_fails=args.purge_fails,
 		                                  merge_states=args.merge_states)
 
+	elif kleene_graph:
+		from ..kleene import get_kleene_graph
+		rwgraph = get_kleene_graph(initial_data)
+		rwgraph = wrap_graph(rwgraph, purge_fails, merge_states)
+
 	elif not with_strategy:
 		rwgraph = maude.RewriteGraph(initial_data.term)
 
 	else:
 		rwgraph = maude.StrategyRewriteGraph(initial_data.term, initial_data.strategy,
 		                                     initial_data.opaque, initial_data.full_matchrew)
-		rwgraph = wrapGraph(rwgraph, purge_fails, merge_states)
+		rwgraph = wrap_graph(rwgraph, purge_fails, merge_states)
 
 	# If something has failed when creating the graph
 	if rwgraph is None:
 		return 1
 
 	# It is possible to generate models of the NuSMV and PRISM model checkers instead of
-	# DOT graphs. They are can be annotated with atomic propositions that are checked in the states.
+	# DOT graphs. They can be annotated with atomic propositions that are checked in the states.
 	if args.aprops is not None:
 		aprops = [initial_data.module.parseTerm(prop) for prop in split_comma(args.aprops)]
 
@@ -129,8 +146,19 @@ def graph(args):
 	else:
 		aprops = []
 
+	# State and edge labels
 	slabel, elabel = get_formatters(args.slabel, args.elabel, with_strategy, only_labels=True)
 
+	if kleene_graph:
+		# Extend the label with the iteration flags
+		original_elabel = elabel
+
+		def kleene_elabel(stmt):
+			iterations_txt = ''.join(f'{" +" if enter else " -"}{iid}' for iid, enter in stmt.iterations)
+			return f'{original_elabel(stmt)}{iterations_txt}'
+
+		elabel = kleene_elabel
+
 	# Whether the graph should be seen as a CTMC and probabilities should not be normalized
 	is_ctmc = args.passign and args.passign.startswith('ctmc-')
 

umaudemc/command/scheck.py

@@ -61,7 +61,7 @@ def plot_results(program, qdata):
 			rs.append(query.h)
 
 		else:
-			# Parametric queries with less that two points are
+			# Parametric queries with less than two points are
 			# ignored (line plots do not make sense for them)
 			if len(xs) > 1:
 				results.append((index, xs, ys, rs))

umaudemc/command/test.py

@@ -64,9 +64,9 @@ def load_cases(filename):
 
 	extension = os.path.splitext(filename)[1]
 
-	# The YAML package is only loaded if YAML will be used because
-	# it is an optional dependency
-	if extension in {'.yaml', '.yml'}:
+	# The YAML package is only loaded when needed
+	# (pyaml is an optional dependency)
+	if extension in ('.yaml', '.yml'):
 		try:
 			import yaml
 			from yaml.loader import SafeLoader
@@ -79,7 +79,7 @@ def load_cases(filename):
 
 		# The YAML loader is replaced so that entities have its line number
 		# associated to print more useful messages. This is not possible with
-		# the standard JSON library as easily.
+		# the standard JSON library.
 
 		class SafeLineLoader(SafeLoader):
 			def construct_mapping(self, node, deep=False):
@@ -89,16 +89,34 @@ def load_cases(filename):
 				return mapping
 
 		try:
-			with open(filename, 'r') as caspec:
+			with open(filename) as caspec:
 				return yaml.load(caspec, Loader=SafeLineLoader)
 
 		except yaml.error.YAMLError as ype:
 			usermsgs.print_error(f'Error while parsing test file: {ype}.')
 
+	# TOML format
+	if extension == '.toml':
+		try:
+			import tomllib
+
+		except ImportError:
+			usermsgs.print_error(
+				'Cannot load cases from TOML file, '
+				'which is only available since Python 3.10.')
+			return None
+
+		try:
+			with open(filename) as caspec:
+				return tomllib.load(caspec)
+
+		except tomllib.TOMLDecodeError as tde:
+			usermsgs.print_error(f'Error while parsing test file: {tde}.')
+
 	# JSON format
 	else:
 		try:
-			with open(filename, 'r') as caspec:
+			with open(filename) as caspec:
 				return json.load(caspec)
 
 		except json.JSONDecodeError as jde:
@@ -321,7 +339,7 @@ class ParameterSet:
 # Fields admitted by the test specification format
 # (some others keys are admitted but treated apart)
 #
-# They consists of a name, a type, the function that need to be called for
+# They consist of a name, a type, the function that need to be called for
 # parsing them, and the arguments that must be reparsed because of it.
 
 TEST_FIELDS = {
@@ -524,7 +542,7 @@ def read_cases(filename, source, parser, skip=0):
 			if test.initial is None or test.formula is None:
 				usermsgs.print_error((f'Missing initial state or formula for a test case in file {test.rel_filename}'
 				                      f'(line {test.line_number}).') if len(test_stack) > 0 else
-				                      f'Expected cases for file {test.rel_filename}.')
+				                     f'Expected cases for file {test.rel_filename}.')
 				return None, None
 
 			# Whether the model has changed
@@ -573,7 +591,7 @@ def _run_backend(name, backend, case, timeout, args):
 	                     timeout=timeout)
 
 
-def run_tests(suite, backends, args, only_file=None, only_logic=None, resume=None, **kwargs):
+def run_tests(suite, backends, args, only_file=None, only_logic=None, resume=None, **_):
 	"""Run the tests in the suite with the first backend available"""
 
 	for source, cases in suite:
@@ -964,7 +982,7 @@ def _memory_case(memusage, psutil, case, name, backend, args, log, maudebin=None
 	              total,
 	              peak,
 	              stack
-		))
+	              ))
 
 
 def memory_tests(suite, backends, args, only_file=None, only_logic=None,

umaudemc/common.py

@@ -14,30 +14,6 @@ from . import usermsgs
 # Warn about old versions of the maude package installed
 #
 
-if hasattr(maude, 'StateTransitionGraph'):
-	usermsgs.print_warning('Version 0.3 of the maude package contains bugs related to model checking.\n'
-	                       'Please update.')
-
-	# Anyhow, allow using it at their own risk, for which some adaptations are needed
-	maude.RewriteGraph = maude.StateTransitionGraph
-	maude.StrategyRewriteGraph = maude.StrategyTransitionGraph
-
-	maude.Symbol.__call__ = lambda self, *args: self.makeTerm(args)
-
-if not hasattr(maude, 'Hook'):
-	usermsgs.print_warning('Version 0.5 of the maude package adds some useful features for this program.\n'
-	                       'Please update.')
-
-	maude.RewriteGraph.getNrRewrites = lambda: 0
-	maude.StrategyRewriteGraph.getNrRewrites = lambda: 0
-	maude.ModelCheckResult.nrBuchiStates = 0
-	maude.downModule = lambda term: term.symbol().getModule().downModule(term)
-	maude.Sort.__le__ = lambda self, other: self.leq(other)
-	maude.Term.__eq__ = lambda self, other: self.equal(other)
-
-if not hasattr(maude.StrategyRewriteGraph, 'getNrRealStates'):
-	maude.StrategyRewriteGraph.getNrRealStates = maude.StrategyRewriteGraph.getNrStates
-
 if not hasattr(maude.Term, 'getVarName'):
 	usermsgs.print_warning('Version 1.0 of the maude package adds some useful features for this program.\n'
 	                       'Please update.')

umaudemc/counterprint.py

@@ -78,17 +78,21 @@ def print_counterexample(graph, counter, printer_triple):
 		next_index = lead_in[i+1] if i+1 < len(lead_in) else cycle[0]
 
 		if graph.strategyControlled:
+			trans = graph.getTransition(index, next_index)
+
 			printer.next_step_strat(
 				sformat(graph, index),
 				graph.getStateStrategy(index),
-				eformat(graph, index, next_index),
+				eformat(trans),
 				sformat(graph, next_index),
 				first_index=index,
 				second_index=next_index)
 		else:
+			rule = graph.getRule(index, next_index)
+
 			printer.next_step(
 				sformat(graph, index),
-				eformat(graph, index, next_index),
+				eformat(rule),
 				sformat(graph, next_index),
 				first_index=index,
 				second_index=next_index)
@@ -103,17 +107,21 @@ def print_counterexample(graph, counter, printer_triple):
 		next_index = cycle[i+1] if i+1 < len(cycle) else cycle[0]
 
 		if graph.strategyControlled:
+			trans = graph.getTransition(index, next_index)
+
 			printer.next_step_strat(
 				sformat(graph, index),
 				graph.getStateStrategy(index),
-				eformat(graph, index, next_index),
+				eformat(trans),
 				sformat(graph, next_index),
 				first_index=index,
 				second_index=next_index)
 		else:
+			rule = graph.getRule(index, next_index)
+
 			printer.next_step(
 				sformat(graph, index),
-				eformat(graph, index, next_index),
+				eformat(rule),
 				sformat(graph, next_index),
 				first_index=index,
 				second_index=next_index)

umaudemc/data/smcgraph.js

@@ -63,6 +63,9 @@ function showPopup(state, nr)
 
 function transitionText(transition)
 {
+	if (!transition)
+		return '';
+
 	switch (transition.type)
 	{
 		case 0 : return 'idle' ; break

umaudemc/data/smcview.js

@@ -38,13 +38,11 @@ function browseDir(dir)
 		}
 	}
 
-	var question = new FormData()
-
-	question.append('question', 'ls')
-	question.append('url', dir)
+	var question = {question: 'ls', url: dir}
 
 	request.open('post', 'ask')
-	request.send(question)
+	request.setRequestHeader('Content-Type', 'application/json')
+	request.send(JSON.stringify(question))
 }
 
 function openFile(file)
@@ -57,6 +55,23 @@ function openFile(file)
 	loadSourceModules(file)
 }
 
+function loadSourceNative()
+{
+	const request = new XMLHttpRequest()
+
+	request.onreadystatechange = function()
+	{
+		if (this.readyState == XMLHttpRequest.DONE && this.status == 200)
+		{
+			console.log(this.responseText)
+			openFile(this.responseText)
+		}
+	}
+
+	request.open('get', 'umaudemc://open/')
+	request.send()
+}
+
 function incompletePassign()
 {
 	switch (document.getElementById('pmethod').value) {
@@ -193,11 +208,10 @@ function loadSourceModules(file)
 	// Discard modules from previous files
 	smodule.options.length = 0
 
-	var question = new FormData()
-	question.append('question', 'sourceinfo')
-	question.append('url', file)
+	var question = {question: 'sourceinfo', url: file}
 	request.open('post', 'ask')
-	request.send(question)
+	request.setRequestHeader('Content-Type', 'application/json')
+	request.send(JSON.stringify(question))
 }
 
 function addPropToFormula(prop)
@@ -318,11 +332,11 @@ function loadModule()
 
 	description.innerText = 'Please select a Maude file and a Maude module defining the system and properties specification.'
 
-	var question = new FormData()
-	question.append('question', 'modinfo')
-	question.append('mod', currentModule)
+	var question = {question: 'modinfo', mod: currentModule}
+
 	request.open('post', 'ask')
-	request.send(question)
+	request.setRequestHeader('Content-Type', 'application/json')
+	request.send(JSON.stringify(question))
 }
 
 function modelcheck()
@@ -356,14 +370,14 @@ function modelcheck()
 		}
 	}
 
-	var question = new FormData()
-
-	question.append('question', 'modelcheck')
-	question.append('mod', document.getElementById('module').value)
-	question.append('initial', document.getElementById('initial').value)
-	question.append('formula', document.getElementById('formula').value)
-	question.append('strategy', document.getElementById('strategy').value)
-	question.append('opaques', document.getElementById('opaques').value)
+	const question = {
+		question: 'modelcheck',
+		mod: document.getElementById('module').value,
+		initial: document.getElementById('initial').value,
+		formula: document.getElementById('formula').value,
+		strategy: document.getElementById('strategy').value,
+		opaques: document.getElementById('opaques').value
+	}
 
 	// Quantitative model checking stuff
 	if (document.getElementById('command').value == 'qt')
@@ -375,7 +389,8 @@ function modelcheck()
 	}
 
 	request.open('post', 'ask')
-	request.send(question)
+	request.setRequestHeader('Content-Type', 'application/json')
+	request.send(JSON.stringify(question))
 }
 
 function escapeHTMLChars(text) {
@@ -460,17 +475,15 @@ function waitModelChecker(mcref) {
 	// Disable input until model checking has finished
 	disableInput(true)
 
-	var question = new FormData()
+	const question = {question: 'wait', mcref: mcref}
 
-	question.append('question', 'wait')
-	question.append('mcref', mcref)
 	request.open('post', 'ask')
-	request.send(question)
+	request.setRequestHeader('Content-Type', 'application/json')
+	request.send(JSON.stringify(question))
 }
 
 function cancelChecking() {
 	const request = new XMLHttpRequest()
-	const question = new FormData()
 
 	request.onreadystatechange = function()
 	{
@@ -486,9 +499,9 @@ function cancelChecking() {
 		}
 	}
 
-	question.append('question', 'cancel')
 	request.open('post', 'ask')
-	request.send(question)
+	request.setRequestHeader('Content-Type', 'application/json')
+	request.send('{"question": "cancel"}')
 }
 
 function closeResultDialog()