Clear PO counterexample/messages on re-runs

nickbattle · Oct 28, 2023 · ba820f4 · ba820f4
1 parent ba99ad8
commit ba820f4
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/examples/quickcheck/src/main/java/quickcheck/QuickCheck.java b/examples/quickcheck/src/main/java/quickcheck/QuickCheck.java
@@ -403,6 +403,8 @@ else if (results.provedBy != null)
 			{
 				po.setStatus(POStatus.PROVED);
 				po.setProvedBy(results.provedBy);
+				po.setCounterexample(null);
+				po.setCounterMessage(null);
 				printf("PO #%d, PROVED by %s strategy %s\n", po.number, results.provedBy, duration(results.duration));
 				return;
 			}
@@ -516,18 +518,24 @@ else if (results.hasAllValues)
 
 						printf("PO #%d, %s %s\n", po.number, outcome.toString().toUpperCase(), duration(before, after));
 						po.setStatus(outcome);
+						po.setCounterexample(null);
+						po.setCounterMessage(null);
 					}
 					else
 					{
 						if (didTimeout)		// Result would have been true (above), but...
 						{
 							printf("PO #%d, TIMEOUT %s\n", po.number, duration(before, after));
 							po.setStatus(POStatus.TIMEOUT);
+							po.setCounterexample(null);
+							po.setCounterMessage(null);
 						}
 						else if (po.getCheckedExpression() instanceof TCExistsExpression)
 						{
 							printf("PO #%d, MAYBE %s\n", po.number, duration(before, after));
 							po.setStatus(POStatus.MAYBE);
+							po.setCounterexample(null);
+							po.setCounterMessage(null);
 						}
 						else
 						{
@@ -541,6 +549,10 @@ else if (po.getCheckedExpression() instanceof TCExistsExpression)
 								println(msg);
 								po.setCounterMessage(msg);
 							}
+							else
+							{
+								po.setCounterMessage(null);
+							}
 
 							println("----");
 							println(po);
@@ -552,6 +564,7 @@ else if (po.getCheckedExpression() instanceof TCExistsExpression)
 					String msg = String.format("Error: PO evaluation returns %s?\n", execResult.kind());
 					printf("PO #%d, %s\n", po.number, msg);
 					po.setStatus(POStatus.FAILED);
+					po.setCounterexample(null);
 					po.setCounterMessage(msg);
 					println("----");
 					printBindings(bindings);
@@ -564,6 +577,7 @@ else if (po.getCheckedExpression() instanceof TCExistsExpression)
 				String msg = String.format("Exception: %s", e.getMessage());
 				printf("PO #%d, %s\n", po.number, msg);
 				po.setStatus(POStatus.FAILED);
+				po.setCounterexample(null);
 				po.setCounterMessage(msg);
 				println("----");
 				printBindings(bindings);