Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Persistence extensions, calculate QuantityType sums in absolute values #4575

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Persistence extensions, calculate QuantityType sums in absolute values #4575

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21d2177
make persistence sum calculations absolute
mherwege Jan 23, 2025
a6bbbdd
correct units for variance and deviation quantity type calculations
mherwege Jan 24, 2025
5ae8abb
review feedback
mherwege Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions ...sistence/src/main/java/org/openhab/core/persistence/extensions/PersistenceExtensions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,13 +1242,20 @@ private static void internalPersist(Item item, TimeSeries timeSeries, @Nullable
State averageState = internalAverageBetween(item, begin, end, effectiveServiceId);

if (averageState != null) {
DecimalType dt = averageState.as(DecimalType.class);
Item baseItem = item instanceof GroupItem groupItem ? groupItem.getBaseItem() : item;
Unit<?> baseUnit = baseItem instanceof NumberItem numberItem ? numberItem.getUnit() : null;
Unit<?> unit = baseUnit != null ? baseUnit.getSystemUnit() : null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto


DecimalType dt;
if (unit != null && averageState instanceof QuantityType<?> averageQuantity) {
averageQuantity = averageQuantity.toUnit(unit);
dt = averageQuantity != null ? averageQuantity.as(DecimalType.class) : null;
} else {
dt = averageState.as(DecimalType.class);
}
BigDecimal average = dt != null ? dt.toBigDecimal() : BigDecimal.ZERO, sum = BigDecimal.ZERO;
int count = 0;

Item baseItem = item instanceof GroupItem groupItem ? groupItem.getBaseItem() : item;
Unit<?> unit = baseItem instanceof NumberItem numberItem ? numberItem.getUnit() : null;

Iterator<HistoricItem> it = result.iterator();
while (it.hasNext()) {
HistoricItem historicItem = it.next();
Expand Down Expand Up @@ -1402,7 +1409,8 @@ private static void internalPersist(Item item, TimeSeries timeSeries, @Nullable
BigDecimal deviation = dt.toBigDecimal().sqrt(MathContext.DECIMAL64);
Item baseItem = item instanceof GroupItem groupItem ? groupItem.getBaseItem() : item;
if (baseItem instanceof NumberItem numberItem) {
Unit<?> unit = numberItem.getUnit();
Unit<?> baseUnit = numberItem.getUnit();
Unit<?> unit = baseUnit != null ? baseUnit.getSystemUnit() : null;
Copy link
Contributor

@andrewfg andrewfg Jan 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above..

if (unit != null) {
return new QuantityType<>(deviation, unit);
}
Expand Down Expand Up @@ -1799,7 +1807,8 @@ private static void internalPersist(Item item, TimeSeries timeSeries, @Nullable
Iterator<HistoricItem> it = result.iterator();

Item baseItem = item instanceof GroupItem groupItem ? groupItem.getBaseItem() : item;
Unit<?> unit = baseItem instanceof NumberItem numberItem ? numberItem.getUnit() : null;
Unit<?> baseUnit = baseItem instanceof NumberItem numberItem ? numberItem.getUnit() : null;
Unit<?> unit = baseUnit != null ? baseUnit.getSystemUnit() : null;

BigDecimal sum = BigDecimal.ZERO;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could do this in one line :)

Unit<?> unit = (baseItem instanceof NumberItem numberItem) && (numberItem.getUnit() instanceof Unit<?> numberItemUnit) ?  numberItemUnit.getSystemUnit() : null;

while (it.hasNext()) {
Expand Down
Loading