- A large number of fixes and additions to the test programs.

* More default options (e.g. --program)
  * Results testing
- Added a heuristics comparison test.

test/compareheuristics.py

@@ -0,0 +1,72 @@
+#!/usr/bin/python
+#
+#	Compare heuristics
+#
+import sys
+from optparse import OptionParser
+
+import scythertest
+
+# Parse
+def parse(scout):
+	ra = 0
+	rb = 0
+	rp = 0
+	nc = 0
+	for l in scout.splitlines():
+		data = l.split()
+		if len(data) > 6 and data[0] == 'claim':
+			nc = nc + 1
+			tag = data[6]
+			if tag == 'failed:':
+				ra = ra + 1
+			if tag == 'correct:':
+				if l.rfind("complete_proof") != -1:
+					rp = rp + 1
+				else:
+					rb = rb + 1
+	return (ra,rb,rp,nc)
+
+
+# Test with a goal selector
+def test_goal_selector(goalselector):
+	import protocollist
+
+	scythertest.set_extra_parameters("--goal-select=" + str(goalselector))
+	result = str(goalselector)
+	plist = protocollist.from_literature()
+	np = len(plist)
+
+	attacks = 0
+	bounds = 0
+	proofs = 0
+	claims = 0
+	for p in plist:
+		(status,scout) = scythertest.default_test([p],0,0)
+		(ra,rb,rp,nc) = parse(scout)
+		attacks = attacks + ra
+		bounds = bounds + rb
+		proofs = proofs + rp
+		claims = claims + nc
+	
+	return (attacks,bounds,proofs,claims,np)
+
+
+# Main code
+def main():
+	parser = OptionParser()
+	scythertest.default_options(parser)
+	(options, args) = parser.parse_args()
+	scythertest.process_default_options(options)
+
+	print "G-sel\tAttack\tBound\tProof"
+	print 
+	for g in range(1,31):
+		(ra,rb,rp,nc,np) = test_goal_selector(g)
+		print str(g) + "\t" + str(ra) + "\t" + str(rb) + "\t" + str(rp) + "\t" + str(nc)
+	print
+	print "Goal selector scan completed."
+
+# Only if main stuff
+if __name__ == '__main__':
+	main()