- Print the arguments for each protocol count again.
This commit is contained in:
parent
fa20f369d2
commit
91ed26f1ff
@ -132,17 +132,19 @@ def ScytherEval (plist):
|
|||||||
# These bounds assume at least two protocols, otherwise
|
# These bounds assume at least two protocols, otherwise
|
||||||
# stuff breaks.
|
# stuff breaks.
|
||||||
if n < 2:
|
if n < 2:
|
||||||
n = 2
|
nmin = 2
|
||||||
|
else:
|
||||||
|
nmin = n
|
||||||
timer = 1
|
timer = 1
|
||||||
maxruns = 2
|
maxruns = 2
|
||||||
maxlength = 10
|
maxlength = 10
|
||||||
if options.bounds == 0:
|
if options.bounds == 0:
|
||||||
timer = n**2
|
timer = nmin**2
|
||||||
maxruns = 2*n
|
maxruns = 2*nmin
|
||||||
maxlength = 2 + maxruns * 3
|
maxlength = 2 + maxruns * 3
|
||||||
elif options.bounds == 1:
|
elif options.bounds == 1:
|
||||||
timer = n**3
|
timer = nmin**3
|
||||||
maxruns = 3*n
|
maxruns = 3*nmin
|
||||||
maxlength = 2 + maxruns * 4
|
maxlength = 2 + maxruns * 4
|
||||||
else:
|
else:
|
||||||
print "Don't know bounds method", options.bounds
|
print "Don't know bounds method", options.bounds
|
||||||
@ -155,9 +157,9 @@ def ScytherEval (plist):
|
|||||||
CommandPrefix = "scyther " + ScytherArgs
|
CommandPrefix = "scyther " + ScytherArgs
|
||||||
|
|
||||||
# If these arguments had not been shown before, do so now
|
# If these arguments had not been shown before, do so now
|
||||||
if not ScytherArgs in ArgumentsList:
|
if not (n,ScytherArgs) in ArgumentsList:
|
||||||
ArgumentsList.append(ScytherArgs)
|
ArgumentsList.append((n,ScytherArgs))
|
||||||
print "\nArguments for", len(plist), "protocols:", ScytherArgs
|
print "\nArguments for", n, "protocols:", ScytherArgs
|
||||||
|
|
||||||
# Combine protocol list to an input
|
# Combine protocol list to an input
|
||||||
input = ""
|
input = ""
|
||||||
|
Loading…
Reference in New Issue
Block a user