Updating main.jpf; Cleaning up the StateReducer.

[jpf-core.git] / main.jpf

diff --git a/main.jpf b/main.jpf
index a2a28d51fd53a0e2b7d327dc564826e8c20d5082..ce6708fe2e64f2943a4be0c861e8eef747fa4d1d 100644 (file)
--- a/main.jpf
+++ b/main.jpf
@@ -1,13 +1,15 @@
 target = main
 
 # This is the listener that can detect variable write-after-write conflicts
-listener=gov.nasa.jpf.listener.VariableConflictTracker
+#listener=gov.nasa.jpf.listener.VariableConflictTracker
+#listener=gov.nasa.jpf.listener.StateReducer
+listener=gov.nasa.jpf.listener.VariableConflictTracker,gov.nasa.jpf.listener.StateReducer
 
 # Potentially conflicting variables
 # Alarms
 #variables=currentAlarm
 # Locks
-#variables=currentLock
+variables=currentLock
 # Thermostats
 #variables=currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,thermostatOperatingState,thermostatFanMode,currentThermostatMode
 # Switches
@@ -22,12 +24,17 @@ listener=gov.nasa.jpf.listener.VariableConflictTracker
 #variables=currentSwitch
 # Valves
 #variables=valve,valveLatestValue
+# Cameras
+#variables=image,alarmState
                        
 # Potentially conflicting apps (we default to App1 and App2 for now)
 apps=App1,App2
 
 # Tracking the location.mode variable conflict
-track_location_var_conflict=true
+#track_location_var_conflict=true
+
+# Debug mode for StateReducer
+debug_state_transition=true
 
 # Timeout in minutes (default is 0 which means no timeout)
 timeout=30