Renaming path input constants

Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
powsybl · Apr 21, 2023 · 313f559 · 313f559
1 parent 6daa261
commit 313f559
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzParameters.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzParameters.java
@@ -30,9 +30,9 @@ public class DynaWaltzParameters extends AbstractExtension<DynamicSimulationPara
     public static final String DEFAULT_NETWORK_PAR_ID = "1";
     public static final String DEFAULT_SOLVER_PAR_ID = "1";
     public static final boolean DEFAULT_MERGE_LOADS = true;
-    public static final String DEFAULT_PARAMETERS_FILE = "models.par";
-    public static final String DEFAULT_NETWORK_PARAMETERS_FILE = "network.par";
-    public static final String DEFAULT_SOLVER_PARAMETERS_FILE = "solvers.par";
+    public static final String DEFAULT_INPUT_PARAMETERS_FILE = "models.par";
+    public static final String DEFAULT_INPUT_NETWORK_PARAMETERS_FILE = "network.par";
+    public static final String DEFAULT_INPUT_SOLVER_PARAMETERS_FILE = "solvers.par";
     public static final String MODELS_OUTPUT_PARAMETERS_FILE = "models.par";
     public static final String NETWORK_OUTPUT_PARAMETERS_FILE = "network.par";
     public static final String SOLVER_OUTPUT_PARAMETERS_FILE = "solvers.par";
@@ -66,12 +66,12 @@ public static DynaWaltzParameters load(PlatformConfig platformConfig, FileSystem
         Optional<ModuleConfig> config = platformConfig.getOptionalModuleConfig("dynawaltz-default-parameters");
 
         // File with all the dynamic models' parameters for the simulation
-        String parametersFile = config.map(c -> c.getStringProperty("parametersFile")).orElse(DEFAULT_PARAMETERS_FILE);
+        String parametersFile = config.map(c -> c.getStringProperty("parametersFile")).orElse(DEFAULT_INPUT_PARAMETERS_FILE);
         Path parametersPath = platformConfig.getConfigDir().map(configDir -> configDir.resolve(parametersFile))
                 .orElse(fileSystem.getPath(parametersFile));
 
         // File with all the network's parameters for the simulation
-        String networkParametersFile = config.map(c -> c.getStringProperty("network.parametersFile")).orElse(DEFAULT_NETWORK_PARAMETERS_FILE);
+        String networkParametersFile = config.map(c -> c.getStringProperty("network.parametersFile")).orElse(DEFAULT_INPUT_NETWORK_PARAMETERS_FILE);
         Path networkParametersPath = platformConfig.getConfigDir().map(configDir -> configDir.resolve(networkParametersFile))
                 .orElse(fileSystem.getPath(networkParametersFile));
 
@@ -84,7 +84,7 @@ public static DynaWaltzParameters load(PlatformConfig platformConfig, FileSystem
         SolverType solverType = config.flatMap(c -> c.getOptionalEnumProperty("solver.type", SolverType.class)).orElse(DEFAULT_SOLVER_TYPE);
 
         // File with all the solvers' parameters for the simulation
-        String solverParametersFile = config.flatMap(c -> c.getOptionalStringProperty("solver.parametersFile")).orElse(DEFAULT_SOLVER_PARAMETERS_FILE);
+        String solverParametersFile = config.flatMap(c -> c.getOptionalStringProperty("solver.parametersFile")).orElse(DEFAULT_INPUT_SOLVER_PARAMETERS_FILE);
         Path solverParametersPath = platformConfig.getConfigDir().map(configDir -> configDir.resolve(solverParametersFile))
                 .orElse(fileSystem.getPath(solverParametersFile));
 

diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java
@@ -127,9 +127,9 @@ private void initPlatformConfig(String networkParametersId, SolverType solverTyp
     @Test
     void checkDefaultParameters() throws IOException {
         Files.createDirectories(fileSystem.getPath(USER_HOME));
-        copyFile("/parametersSet/models.par", DynaWaltzParameters.DEFAULT_PARAMETERS_FILE);
-        copyFile("/parametersSet/network.par", DynaWaltzParameters.DEFAULT_NETWORK_PARAMETERS_FILE);
-        copyFile("/parametersSet/solvers.par", DynaWaltzParameters.DEFAULT_SOLVER_PARAMETERS_FILE);
+        copyFile("/parametersSet/models.par", DynaWaltzParameters.DEFAULT_INPUT_PARAMETERS_FILE);
+        copyFile("/parametersSet/network.par", DynaWaltzParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE);
+        copyFile("/parametersSet/solvers.par", DynaWaltzParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE);
 
         DynaWaltzParameters parameters = DynaWaltzParameters.load(platformConfig, fileSystem);
         checModelParameters(parameters);