umaudemc 0.15.1__py3-none-any.whl → 0.17.0__py3-none-any.whl

umaudemc/statistical.py

@@ -2,6 +2,7 @@
 # Statistical model-checking engine
 #
 
+import contextlib
 import math
 import os
 import random
@@ -40,7 +41,7 @@ def run(program, qdata, simulator):
 	# List where to store the results of each query
 	results = [None] * len(qdata)
 	# Remaining queries for being processed
-	remaining = list(range(len(qdata)))
+	remaining = [k for k, q in enumerate(qdata) if not q.converged]
 
 	# Variables when evaluating expressions
 	cvars = [{'rval': simulator.rval, **q.params} for q in qdata]
@@ -62,8 +63,16 @@ def run(program, qdata, simulator):
 				# Execute the compiled slot
 				value = eval(program.slots[pc[k]], cvars[k])
 
+				# The expression finishes with a call
+				if isinstance(value, tuple):
+					has_next, jump, *args = value
+
+					pc[k] = jump
+					cvars[k] = dict(zip(program.varnames[pc[k]], args),
+					                rval=simulator.rval)
+
 				# The evaluation of the k-th query has finished
-				if isinstance(value, float):
+				else:
 					remaining.pop(index)
 					results[k] = value
 
@@ -73,13 +82,6 @@ def run(program, qdata, simulator):
 
 					break
 
-				# The expression finishes with a call
-				else:
-					has_next, jump, *args = value
-
-					pc[k] = jump
-					cvars[k] = dict(zip(program.varnames[pc[k]], args),
-					                rval=simulator.rval)
 
 			if has_next:
 				index += 1
@@ -91,11 +93,13 @@ def run(program, qdata, simulator):
 class QueryData:
 	"""Data associated to a query under evaluation"""
 
-	def __init__(self, query, params):
+	def __init__(self, query, delta, params):
 		# Query expression index
 		self.query = query
 		# Initial dictionary of variable values
 		self.params = params
+		# Radius of the confidence interval
+		self.delta = delta
 
 		# Sum of the query outcomes
 		self.sum = 0.0
@@ -107,50 +111,74 @@ class QueryData:
 		self.s = 0.0
 		# Radius of the confidence interval
 		self.h = 0.0
+		# Number of runs
+		self.n = 0
+		# Whether the query has converged
+		self.converged = False
+
+		# Number of discarded runs
+		self.discarded = 0
 
 
-def make_parameter_dicts(qinfo):
+def make_parameter_dicts(qinfo, delta):
 	"""Make the initial variable mapping for the parameters of a query"""
 
-	if qinfo is None:
-		yield {}
+	if qinfo.parameters is None:
+		yield {}, (qinfo.delta() if qinfo.delta else delta)
 
 	else:
-		var, x, step, end = qinfo
+		var, x, step, end = qinfo.parameters
 
 		while x <= end:
-			yield {var: x}
+			yield {var: x}, (qinfo.delta(x) if qinfo.delta else delta)
 			x += step
 
 
-def check_interval(qdata, num_sims, alpha, delta, quantile, verbose):
+def check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose):
 	"""Check the confidence interval"""
 
-	# The radius of encloses the confidence level in the reference
-	# distribution for calculating confidence intervals
-	tinv = quantile(num_sims - 1, 1 - alpha / 2) / math.sqrt(num_sims)
-
 	# Whether the size of the confidence interval for all queries have converged
 	converged = True
 
 	for query in qdata:
-		query.mu = query.sum / num_sims
-		query.s = math.sqrt(max(query.sum_sq - query.sum * query.mu, 0.0) / (num_sims - 1))
-		query.h = query.s * tinv
+		# This query has already converged
+		if query.converged:
+			continue
+		# All executions of this query have been discarded
+		elif query.n == 0:
+			converged = False
+			continue
+		# A single execution
+		elif query.n == 1:
+			query.mu, query.s, query.h = query.sum, 0.0, 0.0
+		# General case
+		else:
+			# The radius encloses the confidence level in the reference
+			# distribution for calculating confidence intervals
+			tinv = quantile(query.n - 1, 1 - alpha / 2) / math.sqrt(query.n)
 
-		if query.h > delta:
+			query.mu = query.sum / query.n
+			query.s = math.sqrt(max(query.sum_sq - query.sum * query.mu, 0.0) / (query.n - 1))
+			query.h = query.s * tinv
+
+		if query.h <= query.delta and query.n >= min_sim:
+			query.converged = True
+			query.discarded = num_sims - query.n
+		else:
 			converged = False
 
 	# Print intermediate results if in verbose mode
 	if verbose:
-		usermsgs.print_info(f'  step={num_sims} μ={" ".join(str(q.mu) for q in qdata)}'
+		usermsgs.print_info(f'  step={num_sims} n={" ".join(str(q.n) for q in qdata)}'
+		                    f' μ={" ".join(str(q.mu) for q in qdata)}'
 		                    f' σ={" ".join(str(q.s) for q in qdata)}'
 		                    f' r={" ".join(str(q.h) for q in qdata)}')
 
 	return converged
 
 
-def run_single(program, qdata, num_sims, max_sim, simulator, alpha, delta, block_size, verbose=False):
+def run_single(program, qdata, num_sims, min_sim, max_sim, simulator, alpha, block_size,
+               verbose=False, dump=None):
 	"""Run simulation in a single thread"""
 
 	# Size of the first block of execution (it coincides with num_sims
@@ -166,11 +194,17 @@ def run_single(program, qdata, num_sims, max_sim, simulator, alpha, delta, block
 			# Run the simulation and compute all queries at once
 			values = run(program, qdata, simulator)
 
-			for k, query in enumerate(qdata):
-				query.sum += values[k]
-				query.sum_sq += values[k] * values[k]
+			# Dump evaluations if required
+			if dump:
+				print(*values, file=dump)
 
-		converged = check_interval(qdata, num_sims, alpha, delta, quantile, verbose)
+			for value, query in zip(values, qdata):
+				if value is not None:
+					query.sum += value
+					query.sum_sq += value * value
+					query.n += 1
+
+		converged = check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose)
 
 		if converged or max_sim and num_sims >= max_sim:
 			break
@@ -181,7 +215,7 @@ def run_single(program, qdata, num_sims, max_sim, simulator, alpha, delta, block
 	return num_sims, qdata
 
 
-def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, barrier, more):
+def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, barrier, more, dump=None):
 	"""Entry point of a calculating thread"""
 
 	maude.setRandomSeed(seed)
@@ -189,8 +223,12 @@ def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, ba
 
 	block = num_sims
 
+	# Open dump file for the raw data
+	dump_file = open(dump, 'w') if dump else None
+
 	sums = [0.0] * len(qdata)
 	sum_sq = [0.0] * len(qdata)
+	counts = [0] * len(qdata)
 
 	# Repeat until the main process says we are done
 	while True:
@@ -199,17 +237,23 @@ def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, ba
 			# Run the simulation and compute all queries at once
 			values = run(program, qdata, simulator)
 
+			if dump is not None:
+				print(*values, file=dump_file)
+
 			for k in range(len(qdata)):
-				sums[k] += values[k]
-				sum_sq[k] += values[k] * values[k]
+				if values[k] is not None:
+					sums[k] += values[k]
+					sum_sq[k] += values[k] * values[k]
+					counts[k] += 1
 
 		# Send the results to the main process and wait for it
-		queue.put((sums, sum_sq))
+		queue.put((sums, sum_sq, counts))
 		barrier.wait()
 
 		for k in range(len(qdata)):
 			sums[k] = 0.0
 			sum_sq[k] = 0.0
+			counts[k] = 0
 
 		if not more.value:
 			break
@@ -218,7 +262,7 @@ def thread_main(program, qdata, simulator, num_sims, block_size, seed, queue, ba
 		block = block_size
 
 
-def run_parallel(program, qdata, num_sims, max_sim, simulator, alpha, delta, block_size, jobs, verbose=False):
+def run_parallel(program, qdata, num_sims, min_sim, max_sim, simulator, alpha, block_size, jobs, verbose=False, dump=None):
 	"""Run the simulation in multiple threads"""
 	import multiprocessing as mp
 	mp.set_start_method('fork', force=True)
@@ -234,6 +278,8 @@ def run_parallel(program, qdata, num_sims, max_sim, simulator, alpha, delta, blo
 
 	# Random number seeds
 	seeds = [random.getrandbits(20) for _ in range(jobs)]
+	# Dump file names
+	dumps = [f'{dump}.{os.getpid()}-{k}' for k in range(jobs)] if dump else ([None] * jobs)
 	# Queue for transferring the query evaluations
 	queue = mp.Queue()
 	barrier = mp.Barrier(jobs + 1)
@@ -243,7 +289,7 @@ def run_parallel(program, qdata, num_sims, max_sim, simulator, alpha, delta, blo
 	processes = [mp.Process(target=thread_main,
 	                        args=(program, qdata, simulator, num_sims // jobs + (k < rest),
 	                              block_size // jobs + (k < rest_block),
-	                              seeds[k], queue, barrier, more)) for k in range(jobs)]
+	                              seeds[k], queue, barrier, more, dumps[k])) for k in range(jobs)]
 
 	# Start all processes
 	for p in processes:
@@ -252,13 +298,14 @@ def run_parallel(program, qdata, num_sims, max_sim, simulator, alpha, delta, blo
 	# Exactly as in run_single but with several threads
 	while True:
 		for _ in range(jobs):
-			sums, sum_sq = queue.get()
+			sums, sum_sq, counts = queue.get()
 
 			for k, query in enumerate(qdata):
 				query.sum += sums[k]
 				query.sum_sq += sum_sq[k]
+				query.n += counts[k]
 
-		converged = check_interval(qdata, num_sims, alpha, delta, quantile, verbose)
+		converged = check_interval(qdata, num_sims, min_sim, alpha, quantile, verbose)
 
 		if converged or max_sim and num_sims >= max_sim:
 			break
@@ -285,30 +332,35 @@ def qdata_to_dict(num_sims, qdata, program):
 	qdata_it = iter(qdata)
 	q = next(qdata_it, None)
 
-	for k, (fname, line, column, params) in enumerate(program.query_locations):
+	for k, query in enumerate(program.queries):
 		# For parametric queries, we return an array of values
-		if params:
-			mean, std, radius = [], [], []
+		if query.parameters:
+			mean, std, radius, count, discarded = [], [], [], [], []
 
 			while q and q.query == k:
 				mean.append(q.mu)
 				std.append(q.s)
 				radius.append(q.h)
+				count.append(q.n)
+				discarded.append(q.discarded)
 				q = next(qdata_it, None)
 
 			# We also write information about the parameter
-			param_info = {'params': [dict(name=params[0], start=params[1], step=params[2], stop=params[3])]}
+			param_info = {'params': [dict(zip(('name', 'start', 'step', 'stop'), query.parameters))]}
 
 		else:
-			mean, std, radius = q.mu, q.s, q.h
+			mean, std, radius, count, discarded = q.mu, q.s, q.h, q.n, q.discarded
+			q = next(qdata_it, None)
 			param_info = {}
 
-		queries.append(dict(mean=mean, std=std, radius=radius, file=fname, line=line, column=column, **param_info))
+		queries.append(dict(mean=mean, std=std, radius=radius,
+		                    file=query.filename, line=query.line, column=query.column,
+		                    nsims=count, discarded=discarded, **param_info))
 
 	return dict(nsims=num_sims, queries=queries)
 
 
-def check(program, simulator, seed, alpha, delta, block, min_sim, max_sim, jobs, verbose=False):
+def check(program, simulator, seed, alpha, delta, block, min_sim, max_sim, jobs, verbose=False, dump=None):
 	"""Run the statistical model checker"""
 
 	# The number of simulations for the first block
@@ -324,14 +376,15 @@ def check(program, simulator, seed, alpha, delta, block, min_sim, max_sim, jobs,
 
 	# Each query maintains some data like the sum of the outcomes
 	# and the sum of their squares
-	qdata = [QueryData(k, idict)
-	         for k, qinfo in enumerate(program.query_locations)
-	         for idict in make_parameter_dicts(qinfo[3])]
+	qdata = [QueryData(k, dt, idict)
+	         for k, qinfo in enumerate(program.queries)
+	         for idict, dt in make_parameter_dicts(qinfo, delta)]
 
 	# Run the simulations
 	if jobs == 1 and num_sims != 1:
-		return run_single(program, qdata, num_sims, max_sim, simulator, alpha,
-		                  delta, block, verbose=verbose)
+		with (open(dump, 'w') if dump else contextlib.nullcontext()) as dump_file:
+			return run_single(program, qdata, num_sims, min_sim, max_sim, simulator, alpha,
+					  block, verbose=verbose, dump=dump_file)
 	else:
-		return run_parallel(program, qdata, num_sims, max_sim, simulator, alpha,
-		                    delta, block, jobs, verbose=verbose)
+		return run_parallel(program, qdata, num_sims, min_sim, max_sim, simulator, alpha,
+				    block, jobs, verbose=verbose, dump=dump)

{umaudemc-0.15.1.dist-info → umaudemc-0.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umaudemc
-Version: 0.15.1
+Version: 0.17.0
 Summary: Unified Maude model-checking utility
 Author-email: ningit <ningit@users.noreply.github.com>
 License-Expression: GPL-3.0-or-later

{umaudemc-0.15.1.dist-info → umaudemc-0.17.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-umaudemc/__init__.py,sha256=8WhJAZouJDJEIY8zYgYIOv2VtMy_b_0q-sscUgsm7U0,23
-umaudemc/__main__.py,sha256=x7HLEryX--lIKW1JYjF66XLZQ9lUnAQmd2ADGRipEfo,14823
-umaudemc/api.py,sha256=I-o5foy8NUlO4JT4pX9L7kkuHQG_8_GMkWlOKt708E8,19733
+umaudemc/__init__.py,sha256=ctD9pjqBvASXR0DHHzalDZFaQsnMJWDpTalYrvY3e_Y,23
+umaudemc/__main__.py,sha256=LgKeZWi1JRrEclPS3asyZziErEJyldQvlZTtTt_tcyc,15063
+umaudemc/api.py,sha256=naZ5edEbvx-S-NU29yAAJtqglfYnSAYVS2RJNyxJMQQ,19893
 umaudemc/backends.py,sha256=mzJkALYwcKPInT0lBiRsCxJSewKvx5j_akQsqWN1Ezo,4590
 umaudemc/common.py,sha256=UcIf7hTpP2qjcT9u_9-UcYR0nNeosx1xRZW7wsuT2bE,7305
 umaudemc/counterprint.py,sha256=vVqM_UjGRk_xeftFxBGI5m6cQXV7mf8KvbQ_fvAvSQk,9226
-umaudemc/distributed.py,sha256=2InONr9a4-n8lFVMWr57Hai3Rbuq6m4K-X4aDD1dYgE,8842
+umaudemc/distributed.py,sha256=aCvU1TaM5SZhAtWahclyANc1I0YXj8SuPXO_VjaqDdo,9115
 umaudemc/formatter.py,sha256=nbQlIsR5Xv18OEcpJdnTDGqO9xGL_amvBGFMU2OmheU,6026
 umaudemc/formulae.py,sha256=jZPPDhjgsb7cs5rWvitiQoO0fd8JIlK98at2SN-LzVE,12156
 umaudemc/grapher.py,sha256=K1chKNNlEzQvfOsiFmRPJmd9OpxRIrg6OyiMW6gqOCU,4348
@@ -14,11 +14,11 @@ umaudemc/kleene.py,sha256=sW5SGdXpbLrjGtihPn8qgnhSH5WgltFaLVRx6GLwQU4,4697
 umaudemc/mproc.py,sha256=9X5pTb3Z3XHcdOo8ynH7I5RZQpjzm9xr4IBbEtaglUE,11766
 umaudemc/opsem.py,sha256=Xfdi9QGy-vcpmQ9ni8lBDAlKNw-fCRzYr6wnPbv6m1s,9448
 umaudemc/probabilistic.py,sha256=MNvFeEd84-OYedSnyksZB87UckPfwizVNJepCItgRy8,29306
-umaudemc/pyslang.py,sha256=zOfVGtfnOWDGghtaYLfQHq61KvbzVFmAM_0-upNhrTk,87753
-umaudemc/quatex.py,sha256=SQAbVz1csGXGqcfzFcjP89BdIpN8K2aiwP_PMLGPr1o,23239
+umaudemc/pyslang.py,sha256=ABSXYUQO2TmDq8EZ3EpVZV8NecZ0p0gERlSvLUIVAm8,87970
+umaudemc/quatex.py,sha256=7n7ugusjFUyO5jqKeb6-O8hdH4vj2fgnc-V_Z41w-40,27271
 umaudemc/resources.py,sha256=qKqvgLYTJVtsQHQMXFObyCLTo6-fssQeu_mG7tvVyD0,932
-umaudemc/simulators.py,sha256=Lk50Ql7hWUasWkQSWxboeR5LYfJtpwrANjUDuxYjuZ4,13232
-umaudemc/statistical.py,sha256=buthWv4ovvxsvDs0eWgJw7lX2_9BsnLsW_PxW17RHCI,9087
+umaudemc/simulators.py,sha256=K8NFgwvvTgj1lueksnWOSc-7bo6VxS1_CA9g-6l5umc,14367
+umaudemc/statistical.py,sha256=aogqx2JCur9Lw9ZfOI6jaggwLcVTflDSs_Mn7yCmOGE,10815
 umaudemc/terminal.py,sha256=B4GWLyW4Sdymgoavj418y4TI4MnWqNu3JS4BBoSYeTc,1037
 umaudemc/usermsgs.py,sha256=h4VPxljyKidEI8vpPcToKJA6mcLu9PtMkIh6vH3rDuA,719
 umaudemc/webui.py,sha256=XlDV87tOOdcclHp2_oerrvHwRmCZdqAR4PppqeZm47A,11072
@@ -40,8 +40,8 @@ umaudemc/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 umaudemc/command/check.py,sha256=PyaPDMw5OnPxSIZ10U4we0b5tTrjnYKAtAeQkJh2uLE,12031
 umaudemc/command/graph.py,sha256=JqGzESC2sn-LBh2sqctrij03ItzwDO808s2qkNKUle0,6112
 umaudemc/command/pcheck.py,sha256=eV4e4GcOHanP4hcIhMKd5Js22_ONac6kYj70FXun3mY,7274
-umaudemc/command/scheck.py,sha256=jiVNsLfbNDUleWl9HuNW7GTQdszd5cefZJn0_Epm9UU,4967
-umaudemc/command/sworker.py,sha256=0WzLoJBnjc5EYTuZK0fOQ5yoVhEBCH2ffm4WS8oM_yw,4383
+umaudemc/command/scheck.py,sha256=mmAzCdGdIHgKbsyEi0uW-jcj9X0MSc-EEkEPR-EiB8U,6208
+umaudemc/command/sworker.py,sha256=1icakFDO_qSr4ga-5Cu6eDfLirjLPJLNtO7OkbwTUQQ,4651
 umaudemc/command/test.py,sha256=Ru21JXNF61F5N5jayjwxp8okIjOAvuZuAlV_5ltQ-GU,37088
 umaudemc/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umaudemc/data/opsem.maude,sha256=geDP3_RMgtS1rRmYOybJDCXn_-dyHHxg0JxfYg1ftv0,27929
@@ -52,9 +52,9 @@ umaudemc/data/smcgraph.js,sha256=iCNQNmsuGdL_GLnqVhGDisediFtedxw3C24rxSiQwx8,667
 umaudemc/data/smcview.css,sha256=ExFqrMkSeaf8VxFrJXflyCsRW3FTwbv78q0Hoo2UVrM,3833
 umaudemc/data/smcview.js,sha256=_fHum1DRU1mhco-9-c6KqTLgiC5u_cCUf61jIK7wcIQ,14509
 umaudemc/data/templog.maude,sha256=TZ-66hVWoG6gp7gJpS6FsQn7dpBTLrr76bKo-UfHGcA,9161
-umaudemc-0.15.1.dist-info/licenses/LICENSE,sha256=MrEGL32oSWfnAZ0Bq4BZNcqnq3Mhp87Q4w6-deXfFnA,17992
-umaudemc-0.15.1.dist-info/METADATA,sha256=zePwkmspjbYQuOOw0NfnjpS3XxFa-LvX5LH_azwapys,1654
-umaudemc-0.15.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-umaudemc-0.15.1.dist-info/entry_points.txt,sha256=8rYRlLkn4orZtAoujDSeol1t_UFBrK0bfjmLTNv9B44,52
-umaudemc-0.15.1.dist-info/top_level.txt,sha256=Yo_CF78HLGBSblk3890qLcx6XZ17zHCbGcT9iG8sfMw,9
-umaudemc-0.15.1.dist-info/RECORD,,
+umaudemc-0.17.0.dist-info/licenses/LICENSE,sha256=MrEGL32oSWfnAZ0Bq4BZNcqnq3Mhp87Q4w6-deXfFnA,17992
+umaudemc-0.17.0.dist-info/METADATA,sha256=HMhQv0StUz5ODf2H8vanIt_FnkK6p7BDZd-nkc8o0Fg,1654
+umaudemc-0.17.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+umaudemc-0.17.0.dist-info/entry_points.txt,sha256=8rYRlLkn4orZtAoujDSeol1t_UFBrK0bfjmLTNv9B44,52
+umaudemc-0.17.0.dist-info/top_level.txt,sha256=Yo_CF78HLGBSblk3890qLcx6XZ17zHCbGcT9iG8sfMw,9
+umaudemc-0.17.0.dist-info/RECORD,,

{umaudemc-0.15.1.dist-info → umaudemc-0.17.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any