Updated references to scenario verifier

INTO-CPS-Association · Dec 18, 2023 · afe524b · afe524b
1 parent ffae50e
commit afe524b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/maestro-webapi/src/main/java/org/intocps/maestro/webapi/maestro2/Maestro2Broker.java b/maestro-webapi/src/main/java/org/intocps/maestro/webapi/maestro2/Maestro2Broker.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.spencerwi.either.Either;
+import org.intocps.verification.scenarioverifier.core.ScenarioLoaderFMI2;
 import org.intocps.verification.scenarioverifier.core.masterModel.MasterModel;
 import org.intocps.verification.scenarioverifier.core.ScenarioLoader;
 import org.apache.commons.lang3.tuple.Pair;
@@ -70,7 +71,7 @@ public Maestro2Broker(File workingDirectory, ErrorReporter reporter, Supplier<Bo
 
     public <T extends MultiModel> void buildAndRunMasterModel(Map<String, List<String>> livestreamVariables, WebSocketSession socket, T multiModel,
             SigverSimulateRequestBody body, File csvOutputFile) throws Exception {
-        MasterModel masterModel = ScenarioLoader.load(new ByteArrayInputStream(body.getMasterModel().getBytes()));
+        MasterModel masterModel = ScenarioLoaderFMI2.load(new ByteArrayInputStream(body.getMasterModel().getBytes()));
         Fmi2SimulationEnvironmentConfiguration simulationConfiguration =
                 new Fmi2SimulationEnvironmentConfiguration(MasterModelMapper.Companion.masterModelConnectionsToMultiModelConnections(masterModel),
                         multiModel.getFmus());

diff --git a/maestro/src/test/java/org/intocps/maestro/TemplateGeneratorFromScenarioTest.java b/maestro/src/test/java/org/intocps/maestro/TemplateGeneratorFromScenarioTest.java
@@ -89,7 +89,7 @@
 //                 jsonMapper.readValue(jsonMapper.treeAsTokens(executableMM.get("executionParameters").get("stepSize")), new TypeReference<>() {
 //                 });
 
-//         MasterModel masterModel = ScenarioLoader.load(new ByteArrayInputStream(executableMM.get("masterModel").textValue().getBytes()));
+//         MasterModel masterModel = ScenarioLoaderFMI2.load(new ByteArrayInputStream(executableMM.get("masterModel").textValue().getBytes()));
 
 //         // Setup scenarioConfiguration
 //         Fmi2SimulationEnvironment simulationEnvironment = Fmi2SimulationEnvironment.of(simulationConfiguration, errorReporter);