projects
/
iot2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjusting back into the original lengthy version of IrrigationController; for testing...
[iot2.git]
/
benchmarks
/
drivers
/
Java
/
BlossomSprinkler
/
BlossomSprinkler.java
diff --git
a/benchmarks/drivers/Java/BlossomSprinkler/BlossomSprinkler.java
b/benchmarks/drivers/Java/BlossomSprinkler/BlossomSprinkler.java
index dc05c0d5c762932e59fdc7ee58adfde1c5a56f15..209b2fe581ea2ee864714ef51f5d81790da6b76f 100644
(file)
--- a/
benchmarks/drivers/Java/BlossomSprinkler/BlossomSprinkler.java
+++ b/
benchmarks/drivers/Java/BlossomSprinkler/BlossomSprinkler.java
@@
-90,7
+90,6
@@
public class BlossomSprinkler implements Sprinkler {
// create the correct number of zones for this controller
for (int i = 0; i < NUMBER_OF_ZONES; i++) {
// create the correct number of zones for this controller
for (int i = 0; i < NUMBER_OF_ZONES; i++) {
- //zoneStates.add(new ZoneState(i, false, 0));
ZoneState zTmp = new ZoneState();
zTmp.zoneNumber = i;
zTmp.onOffState = false;
ZoneState zTmp = new ZoneState();
zTmp.zoneNumber = i;
zTmp.onOffState = false;
@@
-123,7
+122,6
@@
public class BlossomSprinkler implements Sprinkler {
{
// We replaced methods with fields
//z.zoneNumber, z.onOffState z.duration
{
// We replaced methods with fields
//z.zoneNumber, z.onOffState z.duration
- //if (z.getZoneNumber() == _zone) {
if (z.zoneNumber == _zone) {
// turn on or off the valve
if (z.zoneNumber == _zone) {
// turn on or off the valve
@@
-206,10
+204,7
@@
public class BlossomSprinkler implements Sprinkler {
try {
zoneStateMutex.acquire();
for (ZoneState z : zoneStates) {
try {
zoneStateMutex.acquire();
for (ZoneState z : zoneStates) {
- //System.out.println("Iterating on zone: " + z.zoneNumber);
if (z.onOffState) {
if (z.onOffState) {
- //System.out.println("Turning on zone: " + z.zoneNumber);
- //System.out.println("Duration: " + z.duration);
// if on and time has expired then turn off
if (z.duration == 0) {
// if on and time has expired then turn off
if (z.duration == 0) {