Solving the conflicts
authoramiraj <amiraj.95@uci.edu>
Thu, 1 Aug 2019 19:18:26 +0000 (12:18 -0700)
committeramiraj <amiraj.95@uci.edu>
Thu, 1 Aug 2019 19:18:26 +0000 (12:18 -0700)
SmokeDetector/SmokeDetectors.groovy
Thermostat/Thermostats.groovy

index e7aec2f..768f53a 100644 (file)
@@ -53,7 +53,7 @@ public class SmokeDetectors {
                        this.carbonMonoxideLatestValue = "tested"               
                }
                }*/
-               smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue))
+               smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue, this.carbonMonoxide, this.carbonMonoxideLatestValue, this.battery))
        }
 
        //By Model Checker
index 42a8728..73a2148 100644 (file)
@@ -227,6 +227,8 @@ public class Thermostats{
                        this.coolingSetpoint = coolingSetpoint
                        this.currentHeatingSetpoint = heatingSetpoint
                        this.heatingSetpoint = heatingSetpoint
+                       this.latestCoolingSetPoint = coolingSetpoint
+                       this.latestHeatingSetpoint = heatingSetpoint
                        thermostats[0].setHold(info1, coolingSetpoint, heatingSetpoint, info2, info3)
                }
        }