[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/sense/core MoldEntry.java, NONE, 1.1 MoldTable.java, NONE, 1.1 Producer.java, 1.1, 1.2 Target.java, 1.1, 1.2 Consumer.java, 1.1, 1.2

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/core
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26351/src/net/sourceforge/bprocessor/model/sense/core

Modified Files:
	Producer.java Target.java Consumer.java 
Added Files:
	MoldEntry.java MoldTable.java 
Log Message:


Index: Producer.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/core/Producer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Producer.java	31 Aug 2010 13:48:02 -0000	1.1
--- Producer.java	26 Nov 2010 14:20:31 -0000	1.2
***************
*** 18,22 ****
    }
    
!   public void consume(Measurement value) {
      for (Consumer current : consumers) {
        current.consume(value);
--- 18,22 ----
    }
    
!   public void consume(Object value) {
      for (Consumer current : consumers) {
        current.consume(value);

Index: Target.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/core/Target.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Target.java	31 Aug 2010 13:48:02 -0000	1.1
--- Target.java	26 Nov 2010 14:20:31 -0000	1.2
***************
*** 4,12 ****
--- 4,29 ----
  import java.util.List;
  
+ import net.sourceforge.bprocessor.model.Project;
+ 
  public class Target {
    private String id;
    List<Sensor> sensors;
+   double temperature;
+   double humidity;
+   
+   public double average;
+   public double limit;
+   
+   
+   public boolean temperatureAlarm;
+   public boolean humidityAlarm;
+   public boolean skimmelAlarm;
+   
+   
+   public List<Measurement> temperatures;
+   public List<Measurement> humidities;
    
    public Target() {
+     
    }
    
***************
*** 14,17 ****
--- 31,38 ----
      this.id = id;
      sensors = new LinkedList<Sensor>();
+     temperatures = new LinkedList<Measurement>();
+     humidities = new LinkedList<Measurement>();
+     temperature = 20;
+     humidity = 50;
    }
    
***************
*** 29,31 ****
--- 50,97 ----
      return sensors;
    }
+   
+   public void newTemperature(Measurement value) {
+     temperatures.add(value);
+     temperature = Double.valueOf(value.getValue());
+   }
+   public void newHumidity(Measurement value) {
+     humidities.add(value);
+     humidity = Double.valueOf(value.getValue());
+   }
+   
+   public double getTemperature() {
+     return temperature;
+   }
+   
+   public double getHumidity() {
+     return humidity;
+   }
+   
+   public List<Measurement> getTemperatures() {
+     return temperatures;
+   }
+   
+   public List<Measurement> getHumdiities() {
+     return humidities;
+   }
+   
+   public void check() {
+     System.out.println("check target");
+     if (temperature > Project.temperatureThreshold) {
+       System.out.println("temperature alarm");
+       temperatureAlarm = true;
+     }
+     if (humidity > Project.humidityThreshold) {
+       humidityAlarm = true;
+     }
+   }
+ 
+   public Sensor find(String string) {
+     for (Sensor current : sensors) {
+       if (current.getType().equals(string)) {
+         return current;
+       }
+     }
+     return null;
+   }
  }

--- NEW FILE: MoldEntry.java ---
package net.sourceforge.bprocessor.model.sense.core;

public class MoldEntry {
  
  public double temperature;
  public double humidity;
  
  public MoldEntry(double t, double h) {
    temperature = t;
    humidity = h;
  }
}

--- NEW FILE: MoldTable.java ---
package net.sourceforge.bprocessor.model.sense.core;

import java.io.BufferedReader;
import java.io.FileReader;
import java.util.LinkedList;
import java.util.List;

public class MoldTable {
  public List<MoldEntry> entries;
  
  public MoldTable(String name) {
    entries = new LinkedList<MoldEntry>();
    try {
      BufferedReader reader = new BufferedReader(new FileReader(name));
      String line = reader.readLine();
      while (line != null) {
        String[] s = line.split(";");
        double t = Double.valueOf(s[0]);
        double h = Double.valueOf(s[1]);
        entries.add(new MoldEntry(t, h));
        line = reader.readLine();
      }
    } catch(Exception error) {
      
    }
  }
  
  public double get(double t) {
    MoldEntry previous = null;
    for (MoldEntry current : entries) {
      if (previous != null) {
        if (t > previous.temperature && t <= current.temperature) {
          return previous.humidity;
        }
      }
      previous = current;
    }
    return 100.0;
  }
}

Index: Consumer.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/core/Consumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Consumer.java	31 Aug 2010 13:48:02 -0000	1.1
--- Consumer.java	26 Nov 2010 14:20:31 -0000	1.2
***************
*** 2,5 ****
  
  public abstract class Consumer {
!   public abstract void consume(Measurement value);
  }
--- 2,5 ----
  
  public abstract class Consumer {
!   public abstract void consume(Object value);
  }