From 5df0bd1f28ca0523da1fc3a07f25939b3f9a613d Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Tue, 4 Oct 2016 21:56:56 +0200
Subject: [PATCH] Fixed issue 33 where confidence index was throwing off the
 average calculations

---
 hal-default.db                                | Bin 16384 -> 16384 bytes
 .../deamon/SensorDataAggregatorDaemon.java    |  14 ++++++++++----
 .../hal/util/AggregateDataListSqlResult.java  |   5 ++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/hal-default.db b/hal-default.db
index ded32664b7aa4d2cbece6a541af0db69930f04c9..e79705dfd462b169fc00c48d63ed4e7f747c0bd8 100755
GIT binary patch
delta 140
zcmZo@U~Fh$oFL7(e4>mq>v9I&k2^M|v<a(maq==taulcL73UXmFfxnsmlmfM8SpYN
zFt9K`VPJm3{FC_;^Xtt5BDa~@Sh-jkI5;PN6c=TA&%peCvmnb;W<h>NW<|l2r1-Mb
qqT<Z_JVS#`GAsf-V9l?9+J7;B*({**n3;`*m6?%|Yx7Tib^!n&jwj>*

delta 139
zcmZo@U~Fh$oFL7(Y@&=a>oNx2m#;Rav<a)RbMi7vaulcL73UXmFfxnsmlmfM8SpZ{
zW?*K1!od85`6u%y=DV8(L~b*)F)%Q&b8t-lC@#wKfr0tMW<i!`%mRFj%!>ReN%3W=
oMa7x<d6t`GSOj>$dS3x`|6+c!SwQD8GaDB(Gf?~HpZe?q09g|#m;e9(

diff --git a/src/se/hal/deamon/SensorDataAggregatorDaemon.java b/src/se/hal/deamon/SensorDataAggregatorDaemon.java
index 90bfad1b..6143b933 100755
--- a/src/se/hal/deamon/SensorDataAggregatorDaemon.java
+++ b/src/se/hal/deamon/SensorDataAggregatorDaemon.java
@@ -205,13 +205,19 @@ public class SensorDataAggregatorDaemon implements HalDaemon {
 		}
 		
 		private void saveData(PreparedStatement preparedInsertStmt, float confidenceSum, float sum, int samples, UTCTimePeriod currentPeriod, long sequenceId) throws SQLException{
-			float aggrConfidence = confidenceSum / (float)this.expectedSampleCount;
+			float aggrConfidence = -1;
 			float data = -1;
 			switch(aggrMethod){
-				case SUM: data = sum; break;
-				case AVERAGE: data = sum/samples; break;
+				case SUM:
+					data = sum;
+					aggrConfidence = confidenceSum / (float)this.expectedSampleCount;
+					break;
+				case AVERAGE:
+					data = sum/samples;
+					aggrConfidence = 1; // ignore confidence for average
+					break;
 			}
-			logger.finer("saved period: " + currentPeriod + ", data: " + sum + ", confidence: " + aggrConfidence + ", samples: " + samples + ", aggrMethod: " + aggrMethod);
+			logger.finer("saved period: " + currentPeriod + ", data: " + data + ", confidence: " + aggrConfidence + ", samples: " + samples + ", aggrMethod: " + aggrMethod);
 
 			preparedInsertStmt.setLong(1, sensorId);
 			preparedInsertStmt.setLong(2, sequenceId);
diff --git a/src/se/hal/util/AggregateDataListSqlResult.java b/src/se/hal/util/AggregateDataListSqlResult.java
index c6ff5b6b..69a7c1b0 100755
--- a/src/se/hal/util/AggregateDataListSqlResult.java
+++ b/src/se/hal/util/AggregateDataListSqlResult.java
@@ -2,6 +2,7 @@ package se.hal.util;
 
 import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength;
 import se.hal.struct.Sensor;
+import se.hal.struct.devicedata.PowerConsumptionSensorData;
 import zutil.db.DBConnection;
 import zutil.db.SQLResultHandler;
 
@@ -93,7 +94,9 @@ public class AggregateDataListSqlResult implements SQLResultHandler<ArrayList<Ag
 					 list.add(new AggregateData(id, previousTimestampEnd + 1, null /*Float.NaN*/, username));
 			}
 
-			list.add(new AggregateData(id, timestampEnd, (estimatedData/1000f), username));	//add this data point to list
+			if (sensor.getDeviceConfig().getSensorDataClass() == PowerConsumptionSensorData.class)
+				estimatedData = (estimatedData/1000f);
+			list.add(new AggregateData(id, timestampEnd, estimatedData, username));	//add this data point to list
 
 			// Update previous end timestamp
 			previousTimestampEnd = timestampEnd;