Generator postprocessing fix (#198)

Signed-off-by: marifunf <[email protected]>
(cherry picked from commit 922fedb)

Author: marifunf

metrix-integration/src/main/java/com/powsybl/metrix/integration/MetrixGeneratorPostProcessingTimeSeries.java

@@ -173,8 +173,8 @@ private void createRedispatchingPostProcessingTimeSeries(String generatorId,
         postProcessingTimeSeries.put(genDownTimeSeriesName, genDownTimeSeries);
 
         // Generator up and down redispatching cost
-        NodeCalc genUpCostTimeSeries = BinaryOperation.multiply(genUpTimeSeries, UnaryOperation.abs(upCostsTimeSeries));
-        NodeCalc genDownCostTimeSeries = BinaryOperation.multiply(genDownTimeSeries, UnaryOperation.abs(downCostsTimeSeries));
+        NodeCalc genUpCostTimeSeries = UnaryOperation.abs(BinaryOperation.multiply(genUpTimeSeries, upCostsTimeSeries));
+        NodeCalc genDownCostTimeSeries = UnaryOperation.abs(BinaryOperation.multiply(genDownTimeSeries, downCostsTimeSeries));
         String genUpCostTimeSeriesName = MetrixDataName.getNameWithSchema(prefixContainer.redispatchingUpCostPrefix() + "_" + generatorId, nullableSchemaName);
         String genDownCostTimeSeriesName = MetrixDataName.getNameWithSchema(prefixContainer.redispatchingDownCostPrefix() + "_" + generatorId, nullableSchemaName);
         postProcessingTimeSeries.put(genUpCostTimeSeriesName, genUpCostTimeSeries);

metrix-integration/src/test/java/com/powsybl/metrix/integration/MetrixGeneratorPostProcessingTimeSeriesTest.java

@@ -91,10 +91,10 @@ private void verifyGeneratorPostProcessing(String generatorName,
         NodeCalc expectedRedispatchingDown = BinaryOperation.multiply(metrixOutputNode, BinaryOperation.lessThan(metrixOutputNode, new IntegerNodeCalc(0)));
         verifyRedispatching(generatorName, expectedRedispatchingDown, postProcessingPrefixContainer.redispatchingDownPrefix());
 
-        NodeCalc expectedRedispatchingUpCost = BinaryOperation.multiply(expectedRedispatchingUp, UnaryOperation.abs(tsRedispatchingUpCosts));
+        NodeCalc expectedRedispatchingUpCost = UnaryOperation.abs(BinaryOperation.multiply(expectedRedispatchingUp, tsRedispatchingUpCosts));
         verifyRedispatchingCost(generatorName, expectedRedispatchingUpCost, postProcessingPrefixContainer.redispatchingUpCostPrefix());
 
-        NodeCalc expectedRedispatchingDownCost = BinaryOperation.multiply(expectedRedispatchingDown, UnaryOperation.abs(tsRedispatchingDownCosts));
+        NodeCalc expectedRedispatchingDownCost = UnaryOperation.abs(BinaryOperation.multiply(expectedRedispatchingDown, tsRedispatchingDownCosts));
         verifyRedispatchingCost(generatorName, expectedRedispatchingDownCost, postProcessingPrefixContainer.redispatchingDownCostPrefix());
 
         NodeCalc expectedRedispatchingCost = BinaryOperation.plus(expectedRedispatchingUpCost, expectedRedispatchingDownCost);