From ddfba54c168c5ab975014328ea1766bef10fc0d5 Mon Sep 17 00:00:00 2001
From: rtrimana <rtrimana@uci.edu>
Date: Thu, 26 Mar 2020 11:52:49 -0700
Subject: [PATCH 1/1] Adding the old tracker variable for debugging/testing
 purposes.

---
 main.jpf                                               | 7 ++++---
 src/main/gov/nasa/jpf/listener/ConflictTrackerOld.java | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/main.jpf b/main.jpf
index 5d6e6a8..fdeadac 100644
--- 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.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
+listener=gov.nasa.jpf.listener.ConflictTrackerOld
 
 #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
-variables=lock
+#variables=lock
+variables=currentLock
 # 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 0341cd5..fc6b6de 100644
--- 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 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 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
-- 
2.34.1