Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

Fix averageSince calculation #2405

Merged
merged 7 commits into from Dec 17, 2016
Merged

Fix averageSince calculation #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01e9ba1
Fix averageSince calculation
J-N-K Nov 3, 2016
07b4465
next try to fix averageSince. This includes the new function averageS…
J-N-K Nov 18, 2016
4969e2a
remove unwanted functions
J-N-K Dec 14, 2016
5244ba8
fix persistence test compiling still does not work
J-N-K Dec 14, 2016
5ddb15f
finally fix tests
J-N-K Dec 16, 2016
86adc24
add missing import
J-N-K Dec 17, 2016
cd18c70
include reviewer requests
J-N-K Dec 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...st/java/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensionsTest.java
View file
Open in desktop
Expand Up @@ -21,13 +21,15 @@
import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.model.persistence.tests.TestPersistenceService;
import org.joda.time.DateMidnight;
import org.joda.time.DateTime;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

/**
* @author Kai Kreuzer - Initial contribution and API
* @author Chris Jackson
* @author Jan N. Klug
*/
@SuppressWarnings("deprecation")
public class PersistenceExtensionsTest {
Expand Down Expand Up @@ -124,8 +126,13 @@ public void testMaximumSince() {
@Test
public void testAverageSince() {
item.setState(new DecimalType(3025));
DecimalType average = PersistenceExtensions.averageSince(item, new DateMidnight(2003, 1, 1), "test");
assertEquals("2100", average.toString());
DateMidnight startStored = new DateMidnight(2003, 1, 1);
DateMidnight endStored = new DateMidnight(2012, 1, 1);
long storedInterval = endStored.getMillis() - startStored.getMillis();
long recentInterval = DateTime.now().getMillis() - endStored.getMillis();
double expected = (2007.4994 * storedInterval + 2518.5 * recentInterval) / (storedInterval + recentInterval);
DecimalType average = PersistenceExtensions.averageSince(item, startStored, "test");
assertEquals(expected, average.doubleValue(), 0.01);
}

@Test
Expand Down
53 changes: 40 additions & 13 deletions ...istence/src/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensions.java
View file
Open in desktop
Expand Up @@ -77,7 +77,8 @@ private static String getDefaultServiceId() {
.warn("There is no default persistence service configured!");
}
} else {
LoggerFactory.getLogger(PersistenceExtensions.class).warn("PersistenceServiceRegistryImpl is not available!");
LoggerFactory.getLogger(PersistenceExtensions.class)
.warn("PersistenceServiceRegistryImpl is not available!");
}
return null;
}
Expand Down Expand Up @@ -400,24 +401,50 @@ public static DecimalType averageSince(Item item, AbstractInstant timestamp, Str
Iterable<HistoricItem> result = getAllStatesSince(item, timestamp, serviceId);
Iterator<HistoricItem> it = result.iterator();

DecimalType value = (DecimalType) item.getStateAs(DecimalType.class);
if (value == null) {
value = DecimalType.ZERO;
}
BigDecimal total = BigDecimal.ZERO;

BigDecimal avgValue, timeSpan;
DecimalType lastState = null, thisState = null;
BigDecimal lastTimestamp = null, thisTimestamp = null;
BigDecimal firstTimestamp = null;

BigDecimal total = value.toBigDecimal();
int quantity = 1;
while (it.hasNext()) {
State state = it.next().getState();
HistoricItem thisItem = it.next();
State state = thisItem.getState();

if (state instanceof DecimalType) {
value = (DecimalType) state;
total = total.add(value.toBigDecimal());
quantity++;
thisState = (DecimalType) state;
thisTimestamp = BigDecimal.valueOf(thisItem.getTimestamp().getTime());
if (firstTimestamp == null) {
firstTimestamp = thisTimestamp;
} else {
avgValue = (thisState.toBigDecimal().add(lastState.toBigDecimal())).divide(BigDecimal.valueOf(2),
MathContext.DECIMAL64);
timeSpan = thisTimestamp.subtract(lastTimestamp);
total = total.add(avgValue.multiply(timeSpan, MathContext.DECIMAL64));
}
lastTimestamp = thisTimestamp;
lastState = thisState;
}
}
BigDecimal average = total.divide(BigDecimal.valueOf(quantity), MathContext.DECIMAL64);

return new DecimalType(average);
if (lastState != null) {
thisState = (DecimalType) item.getStateAs(DecimalType.class);
thisTimestamp = BigDecimal.valueOf((new DateTime()).getMillis());
avgValue = (thisState.toBigDecimal().add(lastState.toBigDecimal())).divide(BigDecimal.valueOf(2),
MathContext.DECIMAL64);
timeSpan = thisTimestamp.subtract(lastTimestamp);
total = total.add(avgValue.multiply(timeSpan, MathContext.DECIMAL64));
}

if (thisTimestamp != null) {
timeSpan = thisTimestamp.subtract(firstTimestamp, MathContext.DECIMAL64);

BigDecimal average = total.divide(timeSpan, MathContext.DECIMAL64);
return new DecimalType(average);
} else {
return null;
}
}

/**
Expand Down