-
-
Notifications
You must be signed in to change notification settings - Fork 428
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.
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: Riemann Sums #4461
base: main
Are you sure you want to change the base?
Conversation
cbf98c2
to
5c76129
Compare
Tests run fine locally. I am trying to figure out why they do not work in the PR. |
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
8516df7
to
39a0bbe
Compare
I put in some extra test logging to try to analyze where the difference is between my succeeding local tests and the failing online tests. |
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
All test are passing now and extra logging has been removed. This is ready for review. |
@@ -74,6 +76,13 @@ public class PersistenceExtensions { | |||
private static @Nullable PersistenceServiceRegistry registry; | |||
private static @Nullable TimeZoneProvider timeZoneProvider; | |||
|
|||
public static enum RiemannType { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't these enums be in ALL_CAPS ??
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, they should be. I will change it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't these enums be in ALL_CAPS ??
Changed
Signed-off-by: Mark Herwege <[email protected]>
This class is getting very cumbersome with all the parameter permutations! |
Totally agree. Do you have any suggestions? As it is all about static methods in one class, it is not easy to split without introducing a lot of breaking changes. The private methods could move to one or more utility classes, but I am not sure this will make maintaining it any easier. |
} | ||
|
||
private static @Nullable State internalVarianceBetween(Item item, @Nullable ZonedDateTime begin, | ||
@Nullable ZonedDateTime end, @Nullable String serviceId) { | ||
@Nullable ZonedDateTime end, RiemannType type, @Nullable String serviceId) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment applies to all the other similar methods.
Whilst implementing this into the jruby helper library, I came across one particular issue.
Could you please make the type
parameter @Nullable
, and provide the default (i.e. RiemannType.LEFT
) inside the internalXxxxXxxx
methods, and pass null
by the callers? This would:
- DRY and collect all the defaults into one place (in the internalXxxx method) rather than in the callers
- Make it easy for the helper libraries to also call it with
null
to indicate "default", and therefore letting core decides what the default is.
As it is now, I'd either have to also hard-code this default in the helper library, thus maintaining a duplicate default, or conditionally call one of the overloaded methods that doesn't take the type
argument in order to use the "default" type.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I will do that. Makes sense.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Signed-off-by: Mark Herwege <[email protected]>
@florian-h05 I was looking into making these new methods available in JS. I don’t know how to properly handle the RiemannType enum arguments. Does a Java enum work properly in GraalVM JS scripting? Or should I be using string arguments in this PR? That may make it harder as well as the serviceId argument is also a string and will make it impossible to distinguish in varargs. |
I would expose the RiemannType enum as a static member of the ItemPersistence class, I think that should work (even though enums do not natively exist in JS). |
Closes #4439
At the moment, it is not possible to easily calculate the integral value of the curve represented by persisted values. This is useful for calculating e.g. total energy consumed (in kWh) from instantaneous power meter readings (in W).
The current
sum
persistence actions calculate a sum without considering the time dimension, and therefore are only useful when we have a guaranteed constant interval between persisted values for this.The
average
actions do use a time weighting in their calculation. Multiplying the average with the total duration considered would give an approximation. However, theaverage
calculations assume a constant value over the bucket and take the value at the start of the bucket. Using this average to calculate an integration would also mean an extra calculation (already divided in the action code and multiplied again in the rule).An alternative approach to get an integral value is by setting up an integrated item and a rule that adds value * duration since previous change/upate, triggered on base item change. This works and is flexible in its calculation (value can be approximated based on previous and new item state). It suffers from things like unexpected shutdowns, where the base item and its aggretation may run out of sync.
This PR proposes to create a group of new actions,
riemannSum
, that will calculate the RiemannSum as an approximation for the integral value. Analoguous to the other actions, there are variants taking (or not)startDate
,endDate
andserviceId
as input.There is one extra key parameter, the Riemann type, representing the type of approximation used. Valid values are:
RiemannType.left
: takes the persisted value at the start of the bucket to represent the value for the whole bucket. This is most useful when there is apersistOnChange
strategy and the values represent a step function. An example would be dynamic electricity rates, as they will effectively be constant inside the bucket.RiemannType.right
: takes the persisted value at the end of the bucket.RiemannType.trapezoidal
: takes the average of the persisted value at the start end the end of the bucket, effectively making a linear interpolation to fit the curve. This type is most useful when the real values change continuously. It can be used for any persistence strategy and any interval.RiemannType.midpoint
: uses 3 persisted values and uses the middle of the values as an approximation for the value halfway in the interval between the middle of point 1 and 2 and the middle of point 2 and 3. This is the best approximation when the real values change continuously, the persistence intervals are short and the bucket sizes between persisted values are relatively constant.The existing
average
,variance
anddeviation
actions have been enhanced to use the results of the Riemann sum calculations. They now have variants with an extra parameter where this type can be selected.For backward compatibility and consistency between defaults of the different actions, the action versions for
riemannSum
,average
,variance
anddeviation
without a Riemann type parameter all useRiemannType.left
as a default.Tests have been enhanced end confirmed the existing actions with the existing parameters still behave as before.
If this PR is accepted the scripting libraries should be enhanced to cover these new actions and the new parameters in the existing actions.
For testing, a compiled jar can be downloaded from here.