Testing DPORStateReducer and ConflictTracker: JPF seems to work fine and find the...

diff --git a/main.jpf b/main.jpf
index 0665ff278cd59fec861036dfed8e300fbe2cb4b1..d6a241e13170b00bf48863c93d6e38920bb8250d 100644 (file)
--- a/main.jpf
+++ b/main.jpf
@@ -9,7 +9,8 @@ target = main
 ##listener=gov.nasa.jpf.listener.ConflictTrackerOld,gov.nasa.jpf.listener.StateReducer
 ##listener=gov.nasa.jpf.listener.ConflictTrackerOld,gov.nasa.jpf.listener.DPORStateReducer
 ##listener=gov.nasa.jpf.listener.ConflictTrackerOld
-listener=gov.nasa.jpf.listener.DPORStateReducer
+#listener=gov.nasa.jpf.listener.DPORStateReducer
+listener=gov.nasa.jpf.listener.DPORStateReducer,gov.nasa.jpf.listener.ConflictTrackerOld
 
 # Potentially conflicting variables
 # Alarms
@@ -43,10 +44,10 @@ apps=App1,App2
 
 # Debug mode for ConflictTracker
 # We do not report any conflicts if the value is true
-#debug_mode=true
+debug_mode=true
 
 # Debug mode for StateReducer
-printout_state_transition=true
+#printout_state_transition=true
 #activate_state_reduction=true
 
 # Timeout in minutes (default is 0 which means no timeout)

diff --git a/src/main/gov/nasa/jpf/listener/DPORStateReducer.java b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
index d8133e397a43c38622abbd0f64577ba64ccbffaa..632edea45df8511f5b6881a9e364e44a7c589a6a 100644 (file)
--- a/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
+++ b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
@@ -28,7 +28,6 @@ import gov.nasa.jpf.vm.bytecode.WriteInstruction;
 import gov.nasa.jpf.vm.choice.IntChoiceFromSet;
 import gov.nasa.jpf.vm.choice.IntIntervalGenerator;
 
-import java.awt.*;
 import java.io.PrintWriter;
 import java.util.*;