Add new type of NodeCalc to compute Min/Max between timeseries #2820
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
geofjamg
reviewed
Dec 12, 2023
| assertEquals(Sets.newHashSet(1), tsCalc.getVersions()); | ||
|
|
||
| List<DoubleTimeSeries> tsLs = Arrays.asList(ts, tsCalc); | ||
| List<DoubleTimeSeries> tsLs = Arrays.asList(ts, tsCalc, tsCalcMin, tsCalcMax); | ||
| String json = TimeSeries.toJson(tsLs); | ||
| String jsonRef = String.join(System.lineSeparator(), |
There was a problem hiding this comment.
Now that we have text blocks in Java 17, we can do it much simpler and cleaner.
Maybe should be done in another PR.
geofjamg
requested changes
Dec 13, 2023
| @@ -52,4 +48,8 @@ public interface NodeCalcVisitor<R, A> { | |||
| R visit(TimeSeriesNameNodeCalc nodeCalc, A arg); | |||
|
|
|||
| R visit(TimeSeriesNumNodeCalc nodeCalc, A arg); | |||
|
|
|||
| R visit(AbstractBinaryNodeCal nodeCalc, A arg, R left, R right); | |||
There was a problem hiding this comment.
You should continue with same design that previous by having in the visitor only child node and not abstracts. As you can see, as doing that you need to lot of instanceof check in all implementations.
| @@ -8,6 +8,7 @@ package com.powsybl.timeseries.dsl | |||
|
|
|||
| import com.powsybl.commons.PowsyblException | |||
| import com.powsybl.timeseries.ast.BigDecimalNodeCalc | |||
| import com.powsybl.timeseries.ast.BinaryMinCalc | |||
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
geofjamg
approved these changes
Dec 14, 2023
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements
Does this PR already have an issue describing the problem?
No
What kind of change does this PR introduce?
Feature
What is the current behavior?
Using NodeCalc, it is only possible to get
timeseries["foo"].min(comparedValue)the minimum betweencomparedValueand the values of the timeseries.What is the new behavior (if this is a feature change)?
It is now possible to get the minimal value(s) between two timeseries using
min(timeseries["foo"], timeseries["bar"])in a groovy scriptDoes this PR introduce a breaking change or deprecate an API?
If yes, please check if the following requirements are fulfilled
What changes might users need to make in their application due to this PR? (migration steps)
Other information: