completed OptimizableProvider

PalladioSimulator · Jan 10, 2025 · a68221d · a68221d
1 parent df0ddc7
commit a68221d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/bundles/org.palladiosimulator.simexp.dsl.ea.launch/META-INF/MANIFEST.MF b/bundles/org.palladiosimulator.simexp.dsl.ea.launch/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.apache.log4j;bundle-version="1.2.19",
  org.palladiosimulator.simexp.pcm.modelled;bundle-version="1.0.0",
  org.palladiosimulator.simexp.dsl.ea.api;bundle-version="0.1.0",
  org.palladiosimulator.simexp.dsl.ea.optimizer;bundle-version="0.1.0",
- org.palladiosimulator.simexp.dsl.smodel.api;bundle-version="0.1.0"
+ org.palladiosimulator.simexp.dsl.smodel.api;bundle-version="0.1.0",
+ org.palladiosimulator.simexp.dsl.smodel.interpreter;bundle-version="0.1.0"
 Bundle-SymbolicName: org.palladiosimulator.simexp.dsl.ea.launch;singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/....launch/src/main/java/org/palladiosimulator/simexp/dsl/ea/launch/OptimizableProvider.java b/....launch/src/main/java/org/palladiosimulator/simexp/dsl/ea/launch/OptimizableProvider.java
@@ -5,14 +5,19 @@
 
 import org.palladiosimulator.simexp.dsl.ea.api.IOptimizableProvider;
 import org.palladiosimulator.simexp.dsl.smodel.api.IExpressionCalculator;
+import org.palladiosimulator.simexp.dsl.smodel.interpreter.DefaultSmodelConfig;
+import org.palladiosimulator.simexp.dsl.smodel.interpreter.value.ConstantValueProvider;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Optimizable;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Smodel;
 
 public class OptimizableProvider implements IOptimizableProvider {
     private final Smodel smodel;
+    private final IExpressionCalculator expressionCalculator;
 
     public OptimizableProvider(Smodel smodel) {
         this.smodel = smodel;
+        ConstantValueProvider constantValueProvider = new ConstantValueProvider(new DefaultSmodelConfig());
+        this.expressionCalculator = constantValueProvider.getConstantExpressionCalculator();
     }
 
     @Override
@@ -22,8 +27,6 @@ public Collection<Optimizable> getOptimizables() {
 
     @Override
     public IExpressionCalculator getExpressionCalculator() {
-        // TODO Auto-generated method stub
-        return null;
+        return expressionCalculator;
     }
-
 }
diff --git a/...erpreter/src/org/palladiosimulator/simexp/dsl/smodel/interpreter/DefaultSmodelConfig.java b/...erpreter/src/org/palladiosimulator/simexp/dsl/smodel/interpreter/DefaultSmodelConfig.java
@@ -0,0 +1,8 @@
+package org.palladiosimulator.simexp.dsl.smodel.interpreter;
+
+public class DefaultSmodelConfig implements ISmodelConfig {
+    @Override
+    public double getEpsilon() {
+        return 0.0001;
+    }
+}
diff --git a/...nterpreter/src/org/palladiosimulator/simexp/dsl/smodel/interpreter/SmodelInterpreter.java b/...nterpreter/src/org/palladiosimulator/simexp/dsl/smodel/interpreter/SmodelInterpreter.java
@@ -28,13 +28,7 @@ public class SmodelInterpreter implements Analyzer, Planner, IResettable {
     public SmodelInterpreter(Smodel model, IFieldValueProvider probeValueProvider,
             IFieldValueProvider envVariableValueProvider) {
         IFieldValueProvider optimizableValueProvider = new OptimizableValueProvider();
-        ISmodelConfig smodelConfig = new ISmodelConfig() {
-
-            @Override
-            public double getEpsilon() {
-                return 0.0001;
-            }
-        };
+        ISmodelConfig smodelConfig = new DefaultSmodelConfig();
         IFieldValueProvider constantValueProvider = new ConstantValueProvider(smodelConfig);
         variableValueProvider = new VariableValueProvider(smodelConfig, constantValueProvider, probeValueProvider,
                 optimizableValueProvider, envVariableValueProvider);

diff --git a/.../src/org/palladiosimulator/simexp/dsl/smodel/interpreter/value/ConstantValueProvider.java b/.../src/org/palladiosimulator/simexp/dsl/smodel/interpreter/value/ConstantValueProvider.java
@@ -15,6 +15,10 @@ public ConstantValueProvider(ISmodelConfig smodelConfig) {
         this.expressionCalculator = new ExpressionCalculator(smodelConfig, this);
     }
 
+    public IExpressionCalculator getConstantExpressionCalculator() {
+        return expressionCalculator;
+    }
+
     @Override
     public Boolean getBoolValue(Field field) {
         Constant constant = (Constant) field;