Adding a null value filter in the tracker; Adding a new conflict variable for lights.

[jpf-core.git] / main.jpf

diff --git a/main.jpf b/main.jpf
index 85af65a5ccedf82e64dccbc07d1cdb7fb441caf1..98264ca019a50beb596e0e62034989d73bec17a3 100644 (file)
--- a/main.jpf
+++ b/main.jpf
@@ -4,11 +4,22 @@ target = main
 listener=gov.nasa.jpf.listener.VariableConflictTracker
 
 # Potentially conflicting variables
-variables=currentAlarm,currentContact,doorState,currentLock,currentMotion,status,currentPresence,\
-                       currentSmokeValue,currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,\
-                       thermostatOperatingState,thermostatFanMode,currentThermostatMode,currentSwitch,\
-                       currentAcceleration, currentBattery, currentPresence, currentCarbonMonoxideValue,\
-                       color, hue, saturation
+# Alarms
+#variables=currentAlarm
+# Locks
+#variables=currentLock
+# Thermostats
+#variables=currentHeatingSetpoint,thermostatSetpoint,currentCoolingSetpoint,thermostatOperatingState,thermostatFanMode,currentThermostatMode
+# Switches
+#variables=currentSwitch
+# Lights
+variables=colorChanged,currentHue,currentSaturation,currentLevel,currentSwitch,colorTemperature
+# Speeches
+#variables=level,oneUser
+# Music players
+#variables=status,level,trackDescription,trackData,mute
+# Relay switch
+#variables=currentSwitch
                        
 # Potentially conflicting apps (we default to App1 and App2 for now)
 apps=App1,App2
@@ -16,4 +27,10 @@ apps=App1,App2
 # Tracking the location.mode variable conflict
 #track_location_var_conflict=true
 
+# Timeout in minutes (default is 0 which means no timeout)
+timeout=30
+
+#search.class = gov.nasa.jpf.search.heuristic.RandomHeuristic
 #search.class = gov.nasa.jpf.search.heuristic.UserHeuristic
+#search.class = gov.nasa.jpf.search.heuristic.BFSHeuristic
+#search.class = gov.nasa.jpf.search.heuristic.DFSHeuristic