Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed issue with a duplicate renaming of lex tokens if fmu and instan… #429

Merged
merged 1 commit into from
Jan 16, 2025
Merged

fixed issue with a duplicate renaming of lex tokens if fmu and instan… #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 0 additions & 145 deletions frameworks/fmi2/src/main/java/org/intocps/maestro/framework/fmi2/LegacyMMSupport.java
View file
Open in desktop

This file was deleted.

15 changes: 4 additions & 11 deletions maestro-webapi/src/main/java/org/intocps/maestro/webapi/maestro2/Maestro2Broker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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;
import org.intocps.maestro.Mabl;
import org.intocps.maestro.ast.LexIdentifier;
Expand All @@ -19,7 +18,6 @@
import org.intocps.maestro.framework.fmi2.ComponentInfo;
import org.intocps.maestro.framework.fmi2.Fmi2SimulationEnvironment;
import org.intocps.maestro.framework.fmi2.Fmi2SimulationEnvironmentConfiguration;
import org.intocps.maestro.framework.fmi2.LegacyMMSupport;
import org.intocps.maestro.interpreter.MableInterpreter;
import org.intocps.maestro.interpreter.api.IValueLifecycleHandler;
import org.intocps.maestro.interpreter.extensions.SimulationControlDefaultLifecycleHandler;
Expand Down Expand Up @@ -74,7 +72,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 {
SigverSimulateRequestBody body, File csvOutputFile) throws Exception {
MasterModel masterModel = ScenarioLoaderFMI2.load(new ByteArrayInputStream(body.getMasterModel().getBytes()));
Fmi2SimulationEnvironmentConfiguration simulationConfiguration =
new Fmi2SimulationEnvironmentConfiguration(MasterModelMapper.Companion.masterModelConnectionsToMultiModelConnections(masterModel),
Expand Down Expand Up @@ -116,7 +114,7 @@ public <T extends MultiModel> void buildAndRunMasterModel(Map<String, List<Strin
}

public void buildAndRun(InitializationData initializeRequest, SimulateRequestBody body, WebSocketSession socket,
File csvOutputFile) throws Exception {
File csvOutputFile) throws Exception {

//Initially resolve any FMUs to the local folder in case they are uploaded
ImportCmd.resolveFmuPaths(Collections.singletonList(workingDirectory), initializeRequest.getFmus());
Expand All @@ -132,16 +130,11 @@ public void buildAndRun(InitializationData initializeRequest, SimulateRequestBod
simulationConfiguration.faultInjectInstances = initializeRequest.faultInjectInstances;
simulationConfiguration.faultInjectConfigurationPath = initializeRequest.faultInjectConfigurationPath;

Map<String, String> instanceRemapping = LegacyMMSupport.adjustFmi2SimulationEnvironmentConfiguration(simulationConfiguration);

Map<String, Object> initialize = new HashMap<>();
Map<String, Object> parameters = initializeRequest.getParameters();

if (parameters != null) {
initialize.put("parameters", parameters);
if (instanceRemapping != null && instanceRemapping.size() > 0) {
LegacyMMSupport.fixVariableToXMap(instanceRemapping, parameters);
}
}

if (initializeRequest.getEnvironmentParameters() != null) {
Expand Down Expand Up @@ -251,8 +244,8 @@ private String postGenerate(Map<String, Object> parameters) throws Exception {
}

public void executeInterpreter(WebSocketSession webSocket, List<String> csvFilter, List<String> webSocketFilter, double interval,
File csvOutputFile,
InputStream config) throws IOException, AnalysisException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
File csvOutputFile,
InputStream config) throws IOException, AnalysisException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
WebApiInterpreterFactory factory;
if (webSocket != null) {
factory = new WebApiInterpreterFactory(workingDirectory, webSocket, interval, webSocketFilter, new File(workingDirectory, "outputs.csv"),
Expand Down
Loading