ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

bug fix when calculating confidence

Browse source 
Former-commit-id: 2b9c1e20655a3fc1959d0c8bcab96ab52b6a1063
This commit is contained in:
Daniel Collin 2015-12-09 14:25:49 +01:00
parent 3c763dbc2b
commit 6b272cd5a9
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/se/koc/hal/deamon/DataAggregatorDaemon.java
View file

@ -53,11 +53,12 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
Long maxDBTimestamp = DBConnection.exec(stmt, new SimpleSQLResult<Long>()); Long maxDBTimestamp = DBConnection.exec(stmt, new SimpleSQLResult<Long>());
if(maxDBTimestamp == null) if(maxDBTimestamp == null)
maxDBTimestamp = 0l; maxDBTimestamp = 0l;
// 5 minute aggregation // 5 minute aggregation
long minPeriodTimestamp = getTimestampMinutePeriodStart(5, System.currentTimeMillis()); long minPeriodTimestamp = getTimestampMinutePeriodStart(5, System.currentTimeMillis());
logger.fine("Calculating 5 min periods... (from:"+ maxDBTimestamp +", to:"+ minPeriodTimestamp +")"); logger.fine("Calculating 5 min periods... (from:"+ maxDBTimestamp +", to:"+ minPeriodTimestamp +")");
stmt = db.getPreparedStatement("SELECT * FROM sensor_data_raw" stmt = db.getPreparedStatement("SELECT * FROM sensor_data_raw"
+" WHERE sensor_id == ? AND timestamp > ? AND timestamp < ? " +" WHERE sensor_id == ? AND ? < timestamp AND timestamp < ? "
+" ORDER BY timestamp ASC"); +" ORDER BY timestamp ASC");
stmt.setLong(1, sensorId); stmt.setLong(1, sensorId);
stmt.setLong(2, maxDBTimestamp); stmt.setLong(2, maxDBTimestamp);
@ -135,12 +136,13 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
long currentPeriodTimestamp = 0; long currentPeriodTimestamp = 0;
int sum = 0; int sum = 0;
int count = 0; int count = 0;
int samples = 0;
while(result.next()){ while(result.next()){
long timestamp = result.getLong("timestamp"); long timestamp = result.getLong("timestamp");
long periodTimestamp = getTimestampMinutePeriodStart(5, timestamp); long periodTimestamp = getTimestampMinutePeriodStart(5, timestamp);
if(currentPeriodTimestamp != 0 && periodTimestamp != currentPeriodTimestamp){ if(currentPeriodTimestamp != 0 && periodTimestamp != currentPeriodTimestamp){
float confidence = count / 5f; float confidence = count / 5f;
logger.finer("Calculated minute period: "+ currentPeriodTimestamp +" sum: "+ sum +" confidence: "+ confidence); logger.finer("Calculated minute period: "+ currentPeriodTimestamp +" sum: "+ sum +" confidence: "+ confidence+ " samples: " + samples);
PreparedStatement prepStmt = HalContext.getDB().getPreparedStatement("INSERT INTO sensor_data_aggr(sensor_id, sequence_id, timestamp_start, timestamp_end, data, confidence) VALUES(?, ?, ?, ?, ?, ?)"); PreparedStatement prepStmt = HalContext.getDB().getPreparedStatement("INSERT INTO sensor_data_aggr(sensor_id, sequence_id, timestamp_start, timestamp_end, data, confidence) VALUES(?, ?, ?, ?, ?, ?)");
prepStmt.setInt(1, result.getInt("sensor_id")); prepStmt.setInt(1, result.getInt("sensor_id"));
prepStmt.setLong(2, Sensor.getHighestSequenceId(result.getInt("sensor_id")) + 1); prepStmt.setLong(2, Sensor.getHighestSequenceId(result.getInt("sensor_id")) + 1);
@ -152,11 +154,12 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
// Reset variables // Reset variables
currentPeriodTimestamp = periodTimestamp; currentPeriodTimestamp = periodTimestamp;
confidence = sum = 0; sum = count = samples = 0;
} }
if(currentPeriodTimestamp == 0) currentPeriodTimestamp = periodTimestamp; if(currentPeriodTimestamp == 0) currentPeriodTimestamp = periodTimestamp;
sum += result.getInt("data"); sum += result.getInt("data");
++count; ++count;
++samples;
} }
return null; return null;
} }
@ -168,12 +171,13 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
long currentPeriodTimestamp = 0; long currentPeriodTimestamp = 0;
int sum = 0; int sum = 0;
float confidenceSum = 0; float confidenceSum = 0;
int samples = 0;
while(result.next()){ while(result.next()){
long timestamp = result.getLong("timestamp_start"); long timestamp = result.getLong("timestamp_start");
long periodTimestamp = getTimestampMinutePeriodStart(60, timestamp); long periodTimestamp = getTimestampMinutePeriodStart(60, timestamp);
if(currentPeriodTimestamp != 0 && periodTimestamp != currentPeriodTimestamp){ if(currentPeriodTimestamp != 0 && periodTimestamp != currentPeriodTimestamp){
float aggrConfidence = confidenceSum / 12f; float aggrConfidence = confidenceSum / 12f;
logger.finer("Calculated hour period: "+ currentPeriodTimestamp +" sum: "+ sum +" confidence: "+ aggrConfidence); logger.finer("Calculated hour period: "+ currentPeriodTimestamp +" sum: "+ sum +" confidence: "+ aggrConfidence+ " samples: " + samples);
PreparedStatement prepStmt = HalContext.getDB().getPreparedStatement("INSERT INTO sensor_data_aggr(sensor_id, sequence_id, timestamp_start, timestamp_end, data, confidence) VALUES(?, ?, ?, ?, ?, ?)"); PreparedStatement prepStmt = HalContext.getDB().getPreparedStatement("INSERT INTO sensor_data_aggr(sensor_id, sequence_id, timestamp_start, timestamp_end, data, confidence) VALUES(?, ?, ?, ?, ?, ?)");
prepStmt.setInt(1, result.getInt("sensor_id")); prepStmt.setInt(1, result.getInt("sensor_id"));
prepStmt.setLong(2, Sensor.getHighestSequenceId(result.getInt("sensor_id")) + 1); prepStmt.setLong(2, Sensor.getHighestSequenceId(result.getInt("sensor_id")) + 1);
@ -185,11 +189,12 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
// Reset variables // Reset variables
currentPeriodTimestamp = periodTimestamp; currentPeriodTimestamp = periodTimestamp;
confidenceSum = sum = 0; confidenceSum = sum = samples = 0;
} }
if(currentPeriodTimestamp == 0) currentPeriodTimestamp = periodTimestamp; if(currentPeriodTimestamp == 0) currentPeriodTimestamp = periodTimestamp;
sum += result.getInt("data"); sum += result.getInt("data");
confidenceSum += result.getFloat("confidence"); confidenceSum += result.getFloat("confidence");
samples++;
//TODO: SHould not be here! //TODO: SHould not be here!
PreparedStatement prepStmt = HalContext.getDB().getPreparedStatement("DELETE FROM sensor_data_aggr WHERE sensor_id == ? AND sequence_id == ?"); PreparedStatement prepStmt = HalContext.getDB().getPreparedStatement("DELETE FROM sensor_data_aggr WHERE sensor_id == ? AND sequence_id == ?");