Adding the old tracker variable for debugging/testing purposes.

diff --git a/main.jpf b/main.jpf
index 5d6e6a8bec1f4d21e7c06bd7100e1a4a14c09ce9..fdeadacc503dbba1349e62bec125d49543b6889f 100644 (file)
--- a/main.jpf
+++ b/main.jpf
@@ -6,9 +6,9 @@ target = main
 #listener=gov.nasa.jpf.listener.StateReducerOld
 #listener=gov.nasa.jpf.listener.VariableConflictTracker,gov.nasa.jpf.listener.StateReducer
 #listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducer
 #listener=gov.nasa.jpf.listener.StateReducerOld
 #listener=gov.nasa.jpf.listener.VariableConflictTracker,gov.nasa.jpf.listener.StateReducer
 #listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducer

-listener=gov.nasa.jpf.listener.ConflictTrackerOld,gov.nasa.jpf.listener.StateReducer
+#listener=gov.nasa.jpf.listener.ConflictTrackerOld,gov.nasa.jpf.listener.StateReducer

 #listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducerSimple
 #listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducerSimple

-#listener=gov.nasa.jpf.listener.ConflictTracker
+listener=gov.nasa.jpf.listener.ConflictTrackerOld

 
 #listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducerClean
 #listener=gov.nasa.jpf.listener.StateReducerClean
 
 #listener=gov.nasa.jpf.listener.ConflictTracker,gov.nasa.jpf.listener.StateReducerClean
 #listener=gov.nasa.jpf.listener.StateReducerClean


@@ -18,7 +18,8 @@ listener=gov.nasa.jpf.listener.ConflictTrackerOld,gov.nasa.jpf.listener.StateRed
 # Alarms
 #variables=currentAlarm
 # Locks
 # Alarms
 #variables=currentAlarm
 # Locks

-variables=lock
+#variables=lock
+variables=currentLock

 # Thermostats
 #variables=currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,thermostatOperatingState,thermostatFanMode,currentThermostatMode
 # Switches
 # Thermostats
 #variables=currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,thermostatOperatingState,thermostatFanMode,currentThermostatMode
 # Switches

diff --git a/src/main/gov/nasa/jpf/listener/ConflictTrackerOld.java b/src/main/gov/nasa/jpf/listener/ConflictTrackerOld.java
index 0341cd564f9d4a3357a02318433f7e69d79713ca..fc6b6de2d903d0ee1482bd35494e4210fdd2124a 100644 (file)
--- a/src/main/gov/nasa/jpf/listener/ConflictTrackerOld.java
+++ b/src/main/gov/nasa/jpf/listener/ConflictTrackerOld.java
@@ -38,9 +38,10 @@ import java.util.*;
  **/
 
 public class ConflictTrackerOld extends ListenerAdapter {
  **/
 
 public class ConflictTrackerOld extends ListenerAdapter {

-
+  // Public graph: to allow the StateReducer class to access it
+  public static final HashMap<Integer, Node> nodes = new HashMap<Integer, Node>(); // Nodes of a graph
+  // Private

   private final PrintWriter out;
   private final PrintWriter out;

-  private final HashMap<Integer, Node> nodes = new HashMap<Integer, Node>(); // Nodes of a graph

   private final HashSet<String> conflictSet = new HashSet<String>(); // Variables we want to track
   private final HashSet<String> appSet = new HashSet<String>(); // Apps we want to find their conflicts
   private final HashSet<String> manualSet = new HashSet<String>(); // Writer classes with manual inputs to detect direct-direct(No Conflict) interactions
   private final HashSet<String> conflictSet = new HashSet<String>(); // Variables we want to track
   private final HashSet<String> appSet = new HashSet<String>(); // Apps we want to find their conflicts
   private final HashSet<String> manualSet = new HashSet<String>(); // Writer classes with manual inputs to detect direct-direct(No Conflict) interactions