From d4dd6cbb34c22d8b4230c37d8a8bd3f493092ea9 Mon Sep 17 00:00:00 2001 From: lisrte Date: Fri, 24 May 2024 15:57:22 +0200 Subject: [PATCH] Fix conflict Signed-off-by: lisrte --- .../java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java index 9548ccca0..79a8a07ab 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java +++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java @@ -12,6 +12,8 @@ import com.powsybl.commons.test.AbstractSerDeTest; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; import com.powsybl.dynamicsimulation.json.JsonDynamicSimulationParameters; +import com.powsybl.dynawaltz.DynaWaltzParameters.ExportMode; +import com.powsybl.dynawaltz.DynaWaltzParameters.LogLevel; import com.powsybl.dynawaltz.DynaWaltzParameters.SolverType; import com.powsybl.dynawaltz.parameters.Parameter; import com.powsybl.dynawaltz.parameters.ParameterType; @@ -60,7 +62,7 @@ void checkParameters() throws IOException { boolean useModelSimplifiers = true; double precision = 1e-8; ExportMode timelinExportMode = ExportMode.XML; - DynaWaltzParameters.LogLevel logLevel = DynaWaltzParameters.LogLevel.WARN; + LogLevel logLevel = LogLevel.WARN; initPlatformConfig(networkParametersId, solverType, solverParametersId, mergeLoads, useModelSimplifiers, precision, timelinExportMode, logLevel); DynaWaltzParameters parameters = DynaWaltzParameters.load(platformConfig, fileSystem); @@ -117,7 +119,7 @@ void roundTripParametersSerializing() throws IOException { SolverType solverType = SolverType.IDA; String solverParametersId = "solverParametersId"; boolean mergeLoads = false; - initPlatformConfig(networkParametersId, solverType, solverParametersId, mergeLoads, false, 1e-7, ExportMode.TXT, DynaWaltzParameters.LogLevel.INFO); + initPlatformConfig(networkParametersId, solverType, solverParametersId, mergeLoads, false, 1e-7, ExportMode.TXT, LogLevel.INFO); DynamicSimulationParameters dynamicSimulationParameters = new DynamicSimulationParameters() .setStartTime(0)