X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.jpf;h=0293eb94063e37278851ba893921fc18c0ec0909;hb=HEAD;hp=0842997ff83148cb1d0898b4ad1930d7a8e6a6ab;hpb=df37e18934c9210bdfa81f9197984a056093e4af;p=jpf-core.git

diff --git a/main.jpf b/main.jpf
index 0842997..0293eb9 100644
--- a/main.jpf
+++ b/main.jpf
@@ -5,14 +5,16 @@ target = main
 #listener=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.ConflictTracker
+#listener=gov.nasa.jpf.listener.ConflictTrackerOld
+#listener=gov.nasa.jpf.listener.DPORStateReducer
+listener=gov.nasa.jpf.listener.DPORStateReducer,gov.nasa.jpf.listener.ConflictTrackerOld
 
 # Potentially conflicting variables
 # Alarms
 #variables=currentAlarm
 # Locks
-#variables=currentLock
+#variables=lock
+variables=currentLock
 # Thermostats
 #variables=currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,thermostatOperatingState,thermostatFanMode,currentThermostatMode
 # Switches
@@ -20,12 +22,12 @@ listener=gov.nasa.jpf.listener.ConflictTracker
 # Lights
 #variables=colorChanged,currentHue,currentSaturation,currentLevel,currentSwitch,colorTemperature
 # Dimmers
-variables=currentSwitch,currentLevel
-# Speeches
+#variables=currentSwitch,currentLevel
+# Speech Synthesizers
 #variables=level,oneUser
 # Music players
 #variables=status,duration,level,trackDescription,trackData,mute
-# Relay switch
+# Relay switches
 #variables=currentSwitch
 # Valves
 #variables=valve,valveLatestValue
@@ -37,14 +39,17 @@ 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
-#activate_state_reduction=true
+printout_state_transition=true
+#activate_state_reduction=false
+file_output=moreStatistics
 
 # Timeout in minutes (default is 0 which means no timeout)
+#timeout=1440
 timeout=30
 
 #search.class = gov.nasa.jpf.search.heuristic.RandomHeuristic