From: rtrimana <rtrimana@uci.edu>
Date: Mon, 29 Jul 2019 17:35:53 +0000 (-0700)
Subject: Updating conflict variables list in main.jpf.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=jpf-core.git;a=commitdiff_plain;h=cbd5e2d4681e5579fbacb76b4f5d6c759836143d

Updating conflict variables list in main.jpf.
---

diff --git a/main.jpf b/main.jpf
index 85af65a..d394ec3 100644
--- a/main.jpf
+++ b/main.jpf
@@ -4,11 +4,16 @@ 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=color,hue,saturation
 			
 # Potentially conflicting apps (we default to App1 and App2 for now)
 apps=App1,App2