removed parameters from input class

Signed-off-by: CHEN Roxane <[email protected]>
powsybl · Dec 11, 2024 · 4a3ee38 · 4a3ee38
1 parent c784265
commit 4a3ee38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/InterTemporalRaoInput.java b/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/InterTemporalRaoInput.java
@@ -8,7 +8,6 @@
 package com.powsybl.openrao.raoapi;
 
 import com.powsybl.openrao.commons.TemporalData;
-import com.powsybl.openrao.raoapi.parameters.RaoParameters;
 
 import java.time.OffsetDateTime;
 import java.util.Set;
@@ -20,27 +19,21 @@
  */
 public class InterTemporalRaoInput {
     private final TemporalData<RaoInput> raoInputs;
-    private final RaoParameters parameters;
     private final Set<OffsetDateTime> timestampsToRun;
 
-    public InterTemporalRaoInput(TemporalData<RaoInput> raoInputs, RaoParameters parameters, Set<OffsetDateTime> timestampsToRun) {
+    public InterTemporalRaoInput(TemporalData<RaoInput> raoInputs, Set<OffsetDateTime> timestampsToRun) {
         this.raoInputs = raoInputs;
-        this.parameters = parameters;
         this.timestampsToRun = timestampsToRun;
     }
 
-    public InterTemporalRaoInput(TemporalData<RaoInput> raoInputs, RaoParameters parameters) {
-        this(raoInputs, parameters, raoInputs.getTimestamps().stream().collect(Collectors.toSet()));
+    public InterTemporalRaoInput(TemporalData<RaoInput> raoInputs) {
+        this(raoInputs, raoInputs.getTimestamps().stream().collect(Collectors.toSet()));
     }
 
     public TemporalData<RaoInput> getRaoInputs() {
         return raoInputs;
     }
 
-    public RaoParameters getParameters() {
-        return parameters;
-    }
-
     public Set<OffsetDateTime> getTimestampsToRun() {
         return timestampsToRun;
     }

diff --git a/...imisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/InterTemporalRaoInputTest.java b/...imisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/InterTemporalRaoInputTest.java
@@ -9,7 +9,6 @@
 
 import com.powsybl.openrao.commons.TemporalData;
 import com.powsybl.openrao.commons.TemporalDataImpl;
-import com.powsybl.openrao.raoapi.parameters.RaoParameters;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -27,15 +26,13 @@
  */
 class InterTemporalRaoInputTest {
 
-    private RaoParameters params;
     private OffsetDateTime timestamp1;
     private OffsetDateTime timestamp2;
     private OffsetDateTime timestamp3;
     private TemporalData<RaoInput> temporalData;
 
     @BeforeEach
     void setUp() {
-        params = new RaoParameters();
         RaoInput raoInput1 = Mockito.mock(RaoInput.class);
         RaoInput raoInput2 = Mockito.mock(RaoInput.class);
         RaoInput raoInput3 = Mockito.mock(RaoInput.class);
@@ -47,16 +44,14 @@ void setUp() {
 
     @Test
     void testInstantiateInterTemporalRaoInput() {
-        InterTemporalRaoInput input = new InterTemporalRaoInput(temporalData, params, Set.of(timestamp1, timestamp3));
-        assertEquals(params, input.getParameters());
+        InterTemporalRaoInput input = new InterTemporalRaoInput(temporalData, Set.of(timestamp1, timestamp3));
         assertEquals(temporalData, input.getRaoInputs());
         assertEquals(Set.of(timestamp1, timestamp3), input.getTimestampsToRun());
     }
 
     @Test
     void testInstantiateInterTemporalRaoInputAllTimestamps() {
-        InterTemporalRaoInput input = new InterTemporalRaoInput(temporalData, params);
-        assertEquals(params, input.getParameters());
+        InterTemporalRaoInput input = new InterTemporalRaoInput(temporalData);
         assertEquals(temporalData, input.getRaoInputs());
         assertEquals(Set.of(timestamp1, timestamp2, timestamp3), input.getTimestampsToRun());
     }