[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/sense/monitor DataSet.java, 1.1, 1.2 TargetMonitor.java, 1.2, 1.3 SensorMonitor.java, 1.2, 1.3 DataItem.java, 1.1, 1.2 MonitorManager.java, 1.2, 1.3 SensorHistory.java, 1.2, 1.3

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

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

Modified Files:
	DataSet.java TargetMonitor.java SensorMonitor.java 
	DataItem.java MonitorManager.java SensorHistory.java 
Log Message:


Index: TargetMonitor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/monitor/TargetMonitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TargetMonitor.java	26 Nov 2010 14:20:31 -0000	1.2
--- TargetMonitor.java	17 Dec 2010 12:16:46 -0000	1.3
***************
*** 10,16 ****
  import net.sourceforge.bprocessor.model.Parametric;
  import net.sourceforge.bprocessor.model.Project;
! import net.sourceforge.bprocessor.model.sense.core.Measurement;
! import net.sourceforge.bprocessor.model.sense.core.Sensor;
! import net.sourceforge.bprocessor.model.sense.core.Target;
  
  public class TargetMonitor extends Entity implements Parametric {
--- 10,16 ----
  import net.sourceforge.bprocessor.model.Parametric;
  import net.sourceforge.bprocessor.model.Project;
! import net.sourceforge.bprocessor.sensobyg.Measurement;
! import net.sourceforge.bprocessor.sensobyg.Sensor;
! import net.sourceforge.bprocessor.sensobyg.Target;
  
  public class TargetMonitor extends Entity implements Parametric {
***************
*** 164,168 ****
      t = t / temps.size();
      target.average = t;
!     target.limit = Project.moldtable.get(t);
      boolean alarm = true;
      for (Measurement current : hums) {
--- 164,168 ----
      t = t / temps.size();
      target.average = t;
!     //target.limit = Project.moldtable.get(t);
      boolean alarm = true;
      for (Measurement current : hums) {

Index: SensorMonitor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/monitor/SensorMonitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SensorMonitor.java	26 Nov 2010 14:20:31 -0000	1.2
--- SensorMonitor.java	17 Dec 2010 12:16:46 -0000	1.3
***************
*** 7,12 ****
  import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.model.sense.core.Sensor;
! import net.sourceforge.bprocessor.model.sense.core.Target;
  
  public class SensorMonitor extends Entity implements Parametric {
--- 7,12 ----
  import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.sensobyg.Sensor;
! import net.sourceforge.bprocessor.sensobyg.Target;
  
  public class SensorMonitor extends Entity implements Parametric {

Index: MonitorManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/monitor/MonitorManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MonitorManager.java	26 Nov 2010 14:20:31 -0000	1.2
--- MonitorManager.java	17 Dec 2010 12:16:46 -0000	1.3
***************
*** 4,8 ****
  import java.util.Map;
  
! import net.sourceforge.bprocessor.model.sense.core.Target;
  
  public class MonitorManager {
--- 4,8 ----
  import java.util.Map;
  
! import net.sourceforge.bprocessor.sensobyg.Target;
  
  public class MonitorManager {

Index: DataItem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/monitor/DataItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DataItem.java	31 Aug 2010 13:48:03 -0000	1.1
--- DataItem.java	17 Dec 2010 12:16:46 -0000	1.2
***************
*** 7,12 ****
  import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.model.sense.core.Measurement;
! import net.sourceforge.bprocessor.model.sense.core.Sensor;
  
  public class DataItem extends Entity implements Parametric {
--- 7,12 ----
  import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.sensobyg.Measurement;
! import net.sourceforge.bprocessor.sensobyg.Sensor;
  
  public class DataItem extends Entity implements Parametric {

Index: SensorHistory.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/monitor/SensorHistory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SensorHistory.java	26 Nov 2010 14:20:31 -0000	1.2
--- SensorHistory.java	17 Dec 2010 12:16:46 -0000	1.3
***************
*** 13,20 ****
  import net.sourceforge.bprocessor.model.Parametric;
  import net.sourceforge.bprocessor.model.sense.brunata.TargetManager;
! import net.sourceforge.bprocessor.model.sense.core.History;
! import net.sourceforge.bprocessor.model.sense.core.Measurement;
! import net.sourceforge.bprocessor.model.sense.core.Sensor;
! import net.sourceforge.bprocessor.model.sense.core.Target;
  
  public class SensorHistory extends Entity implements Parametric {
--- 13,20 ----
  import net.sourceforge.bprocessor.model.Parametric;
  import net.sourceforge.bprocessor.model.sense.brunata.TargetManager;
! import net.sourceforge.bprocessor.sensobyg.History;
! import net.sourceforge.bprocessor.sensobyg.Measurement;
! import net.sourceforge.bprocessor.sensobyg.Sensor;
! import net.sourceforge.bprocessor.sensobyg.Target;
  
  public class SensorHistory extends Entity implements Parametric {

Index: DataSet.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/monitor/DataSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DataSet.java	31 Aug 2010 13:48:03 -0000	1.1
--- DataSet.java	17 Dec 2010 12:16:46 -0000	1.2
***************
*** 7,12 ****
  import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.model.sense.core.Measurement;
! import net.sourceforge.bprocessor.model.sense.core.Sensor;
  
  public class DataSet extends Entity implements Parametric {
--- 7,12 ----
  import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Parametric;
! import net.sourceforge.bprocessor.sensobyg.Measurement;
! import net.sourceforge.bprocessor.sensobyg.Sensor;
  
  public class DataSet extends Entity implements Parametric {