diff --git a/frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java b/frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java index 5fe95acc..c641ffa7 100644 --- a/frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java +++ b/frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java @@ -242,7 +242,6 @@ interface Scope extends Scoping { IntVariable store(int value); UIntVariable storeUInt(long value); - LongVariable store(long value); /** * Store a given value with a prefix name * @@ -259,7 +258,6 @@ interface Scope extends Scoping { IntVariable store(String name, int value); UIntVariable storeUInt(String name, long value); - LongVariable store(String name, long value); ArrayVariable store(String name, CV[] value); ArrayVariable createArray(String name,Class type, IntVariable...sizes ) throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException; diff --git a/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/scoping/DynamicActiveBuilderScope.java b/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/scoping/DynamicActiveBuilderScope.java index 4a56701d..45b0a60a 100644 --- a/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/scoping/DynamicActiveBuilderScope.java +++ b/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/scoping/DynamicActiveBuilderScope.java @@ -158,10 +158,6 @@ public UIntVariableFmi2Api storeUInt(long value) { } - @Override - public FmiBuilder.LongVariable store(long value) { - return activeScope.store(value); - } @Override public DoubleVariableFmi2Api store(String name, double value) { @@ -195,10 +191,7 @@ public UIntVariableFmi2Api storeUInt(String name, long value) { return activeScope.storeUInt(name, value); } - @Override - public FmiBuilder.LongVariable store(String name, long value) { - return activeScope.store(name,value); - } + /* @Override public , Var extends Fmi2Builder.Variable> Var store(String name, Var value) { diff --git a/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/scoping/ScopeFmi2Api.java b/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/scoping/ScopeFmi2Api.java index 3a2283a7..bd133776 100644 --- a/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/scoping/ScopeFmi2Api.java +++ b/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/scoping/ScopeFmi2Api.java @@ -216,10 +216,7 @@ public UIntVariableFmi2Api storeUInt(long value) { } - @Override - public LongVariableFmi2Api store(long value) { - return store(() -> builder.getNameGenerator().getName(), value); - } + @Override public DoubleVariableFmi2Api store(String prefix, double value) { @@ -314,14 +311,7 @@ public UIntVariableFmi2Api storeUInt(Supplier nameProvider, long value) newAIdentifierExp(name)); } - public LongVariableFmi2Api store(Supplier nameProvider, long value) { - String name = nameProvider.get(); - ALongLiteralExp initial = newALongLiteralExp(value); - PStm var = newVariable(name, newALongNumericPrimitiveType(), initial); - add(var); - return new LongVariableFmi2Api(var, this, builder.getDynamicScope(), newAIdentifierStateDesignator(newAIdentifier(name)), - newAIdentifierExp(name)); - } + public StringVariableFmi2Api store(Supplier nameProvider, String value) { String name = nameProvider.get();