diff --git a/src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java b/src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java index 39101b32..9bd92710 100644 --- a/src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java +++ b/src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java @@ -54,13 +54,9 @@ public class ShortCircuitService extends AbstractComputationService CEI909_VOLTAGE_PROFILE = List.of( - new VoltageRange(10.0, 29.999, 1.1, 20), - new VoltageRange(30.0, 53.999, 1.1, 45), - new VoltageRange(54.0, 76.999, 1.1, 63), - new VoltageRange(77.0, 119.999, 1.1, 90), - new VoltageRange(120.0, 179.999, 1.1, 150), - new VoltageRange(180.0, 299.999, 1.09, 225), - new VoltageRange(300.0, 500.0, 1.105, 380) + new VoltageRange(0, 199.999, 1.1), + new VoltageRange(200.0, 299.999, 1, 245), + new VoltageRange(300.0, 450.0, 1, 420) ); private final ParametersRepository parametersRepository; diff --git a/src/test/resources/org/gridsuite/shortcircuit/server/ShortCircuitParametersControllerTest.json b/src/test/resources/org/gridsuite/shortcircuit/server/ShortCircuitParametersControllerTest.json index 63b976f2..8706e74d 100644 --- a/src/test/resources/org/gridsuite/shortcircuit/server/ShortCircuitParametersControllerTest.json +++ b/src/test/resources/org/gridsuite/shortcircuit/server/ShortCircuitParametersControllerTest.json @@ -5,86 +5,38 @@ { "range": { "comparator": "INSTANCE", - "maximum": 29.999, - "minimum": 10.0, + "maximum": 199.999, + "minimum": 0.0, "naturalOrdering": true }, "rangeCoefficient": 1.1, - "voltage": 20.0, - "minimumNominalVoltage": 10.0, - "maximumNominalVoltage": 29.999 - }, - { - "range": { - "comparator": "INSTANCE", - "maximum": 53.999, - "minimum": 30.0, - "naturalOrdering": true - }, - "rangeCoefficient": 1.1, - "voltage": 45.0, - "minimumNominalVoltage": 30.0, - "maximumNominalVoltage": 53.999 - }, - { - "range": { - "comparator": "INSTANCE", - "maximum": 76.999, - "minimum": 54.0, - "naturalOrdering": true - }, - "rangeCoefficient": 1.1, - "voltage": 63.0, - "minimumNominalVoltage": 54.0, - "maximumNominalVoltage": 76.999 - }, - { - "range": { - "comparator": "INSTANCE", - "maximum": 119.999, - "minimum": 77.0, - "naturalOrdering": true - }, - "rangeCoefficient": 1.1, - "voltage": 90.0, - "minimumNominalVoltage": 77.0, - "maximumNominalVoltage": 119.999 - }, - { - "range": { - "comparator": "INSTANCE", - "maximum": 179.999, - "minimum": 120.0, - "naturalOrdering": true - }, - "rangeCoefficient": 1.1, - "voltage": 150.0, - "minimumNominalVoltage": 120.0, - "maximumNominalVoltage": 179.999 + "voltage": "NaN", + "minimumNominalVoltage": 0.0, + "maximumNominalVoltage": 199.999 }, { "range": { "comparator": "INSTANCE", "maximum": 299.999, - "minimum": 180.0, + "minimum": 200.0, "naturalOrdering": true }, - "rangeCoefficient": 1.09, - "voltage": 225.0, - "minimumNominalVoltage": 180.0, + "rangeCoefficient": 1.0, + "voltage": 245.0, + "minimumNominalVoltage": 200.0, "maximumNominalVoltage": 299.999 }, { "range": { "comparator": "INSTANCE", - "maximum": 500.0, + "maximum": 450.0, "minimum": 300.0, "naturalOrdering": true }, - "rangeCoefficient": 1.105, - "voltage": 380.0, + "rangeCoefficient": 1.0, + "voltage": 420.0, "minimumNominalVoltage": 300.0, - "maximumNominalVoltage": 500.0 + "maximumNominalVoltage": 450.0 } ] }