Fixing bugs and cleaning up: Continuing sub-graph executions when there is no matched...

[jpf-core.git] / main.jpf

diff --git a/main.jpf b/main.jpf
index 0842997ff83148cb1d0898b4ad1930d7a8e6a6ab..5d6e6a8bec1f4d21e7c06bd7100e1a4a14c09ce9 100644 (file)
--- a/main.jpf
+++ b/main.jpf
@@ -6,13 +6,19 @@ 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.ConflictTracker
+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.ConflictTracker,gov.nasa.jpf.listener.StateReducerClean
+#listener=gov.nasa.jpf.listener.StateReducerClean
+#listener=gov.nasa.jpf.listener.StateReducer
 
 # Potentially conflicting variables
 # Alarms
 #variables=currentAlarm
 # Locks
-#variables=currentLock
+variables=lock
 # Thermostats
 #variables=currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,thermostatOperatingState,thermostatFanMode,currentThermostatMode
 # Switches
@@ -20,7 +26,7 @@ listener=gov.nasa.jpf.listener.ConflictTracker
 # Lights
 #variables=colorChanged,currentHue,currentSaturation,currentLevel,currentSwitch,colorTemperature
 # Dimmers
-variables=currentSwitch,currentLevel
+#variables=currentSwitch,currentLevel
 # Speeches
 #variables=level,oneUser
 # Music players
@@ -37,8 +43,9 @@ variables=currentSwitch,currentLevel
 # 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
+# Debug mode for ConflictTracker
+# We do not report any conflicts if the value is true
+debug_mode=true
 
 # Debug mode for StateReducer
 #debug_state_transition=true