From 2ce92e0a26dac22a02bf90d8ce6c6271a3dd8731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rocheteau?= <jerome.rocheteau@free.fr>
Date: Tue, 9 Oct 2018 04:53:41 +0200
Subject: [PATCH 1/3] Update MeasureMetadata.xml

---
 EmitPowerMeasure/metadata/MeasureMetadata.xml | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/EmitPowerMeasure/metadata/MeasureMetadata.xml b/EmitPowerMeasure/metadata/MeasureMetadata.xml
index 47fa0abb..f21978e3 100644
--- a/EmitPowerMeasure/metadata/MeasureMetadata.xml
+++ b/EmitPowerMeasure/metadata/MeasureMetadata.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Measure name="EmitPowerMeasure" type="DIRECT" category="Emit" provider="Measure.org">
     <description>Power in watt provided by EMIT powermeters.</description>
-    <scopeProperties name="hostname" type="STRING" defaultValue="app.icam.fr">
-        <description>Hostname</description>
-    </scopeProperties>
-    <scopeProperties name="port" type="INTEGER" defaultValue="80">
-        <description>Port</description>
-    </scopeProperties>
-    <scopeProperties name="protocol" type="STRING" defaultValue="http">
-        <description>Protocol</description>
-    </scopeProperties>
-    <scopeProperties name="toolname" type="STRING" defaultValue="emit">
-        <description>Toolname</description>
-    </scopeProperties>
-    <scopeProperties name="username" type="STRING" defaultValue="measure@emit.icam.fr">
-        <description>Username</description>
-    </scopeProperties>
-    <scopeProperties name="password" type="STRING" defaultValue="m3@suR">
-        <description>Password</description>
-    </scopeProperties>
-    <scopeProperties name="topic" type="STRING" defaultValue="peaktech/power">
-        <description>Topic</description>
-    </scopeProperties>
+    <scopeProperties name="hostname" type="STRING" defaultValue="app.icam.fr"></scopeProperties>
+    <scopeProperties name="port" type="INTEGER" defaultValue="80"></scopeProperties>
+    <scopeProperties name="protocol" type="STRING" defaultValue="http"></scopeProperties>
+    <scopeProperties name="toolname" type="STRING" defaultValue="emit"></scopeProperties>
+    <scopeProperties name="username" type="STRING" defaultValue="measure@emit.icam.fr"></scopeProperties>
+    <scopeProperties name="password" type="STRING" defaultValue="m3@suR"></scopeProperties>
+    <scopeProperties name="topic" type="STRING" defaultValue="peaktech/power"></scopeProperties>
     <unit name="EmitPowerMeasurement">
         <fields fieldName="topic" fieldType="u_text"/>
         <fields fieldName="issued" fieldType="u_long"/>
         <fields fieldName="value" fieldType="u_float"/>
     </unit>
-</Measure>
\ No newline at end of file
+</Measure>

From 6ddb4b1d0d4a25cf07782479f7b8e44fd4d00a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rocheteau?= <jerome.rocheteau@free.fr>
Date: Tue, 9 Oct 2018 05:13:05 +0200
Subject: [PATCH 2/3] Update EmitEnergyMeasure.java

---
 .../org/measure/impl/EmitEnergyMeasure.java   | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/EmitEnergyMeasure/src/main/java/org/measure/impl/EmitEnergyMeasure.java b/EmitEnergyMeasure/src/main/java/org/measure/impl/EmitEnergyMeasure.java
index 5d60fdfc..e44a10f6 100644
--- a/EmitEnergyMeasure/src/main/java/org/measure/impl/EmitEnergyMeasure.java
+++ b/EmitEnergyMeasure/src/main/java/org/measure/impl/EmitEnergyMeasure.java
@@ -21,21 +21,18 @@ public List<IMeasurement> calculateMeasurement() throws Exception {
 	}
 
 	private Float doCompute(String topic, Long started, Long stopped) {
-		Float value = 0.0f;
-		Float f_a = null;
-        Long a = null;
-        List<IMeasurement> measurements = this.getMeasureInputByRole("inputs");
-        List<IMeasurement> inputs = this.doFilter(topic, started, stopped, measurements);
-        for (IMeasurement input : inputs) {
-        	if (f_a == null) {
-        		f_a = (Float) input.getValues().get("value");
-        		a = (Long) input.getValues().get("issued");
-        	} else {
-        		Float f_b = (Float) input.getValues().get("value");
-        		Long b = (Long) input.getValues().get("issued");
-        		value += (b - a) * ((f_a + f_b) / 2); 
+		Float value = 0.0f; Float f_a = null; Long a = null;
+        	List<IMeasurement> inputs = this.getMeasureInputByRole("inputs");
+        	for (IMeasurement input : inputs) {
+        		if (f_a == null) {
+        			f_a = (Float) input.getValues().get("value");
+        			a = (Long) input.getValues().get("issued");
+        		} else {
+        			Float f_b = (Float) input.getValues().get("value");
+        			Long b = (Long) input.getValues().get("issued");
+        			value += (b - a) * ((f_a + f_b) / 2); 
+        		}
         	}
-        }
 		return value;
 	}
 

From c42f16e36e194d4a85bd835e185dc39788613708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rocheteau=20J=C3=A9r=C3=B4me?= <jerome.rocheteau@free.fr>
Date: Mon, 26 Nov 2018 12:30:30 +0100
Subject: [PATCH 3/3] Update MeasureMetadata.xml

---
 EmitPowerMeasure/metadata/MeasureMetadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EmitPowerMeasure/metadata/MeasureMetadata.xml b/EmitPowerMeasure/metadata/MeasureMetadata.xml
index f21978e3..a04447d9 100644
--- a/EmitPowerMeasure/metadata/MeasureMetadata.xml
+++ b/EmitPowerMeasure/metadata/MeasureMetadata.xml
@@ -6,7 +6,7 @@
     <scopeProperties name="protocol" type="STRING" defaultValue="http"></scopeProperties>
     <scopeProperties name="toolname" type="STRING" defaultValue="emit"></scopeProperties>
     <scopeProperties name="username" type="STRING" defaultValue="measure@emit.icam.fr"></scopeProperties>
-    <scopeProperties name="password" type="STRING" defaultValue="m3@suR"></scopeProperties>
+    <scopeProperties name="password" type="STRING" defaultValue="**********"></scopeProperties>
     <scopeProperties name="topic" type="STRING" defaultValue="peaktech/power"></scopeProperties>
     <unit name="EmitPowerMeasurement">
         <fields fieldName="topic" fieldType="u_text"/>