moved ExpressionCalculatore to interpreter package

PalladioSimulator · Jan 10, 2025 · f88fe52 · f88fe52
1 parent a3c0704
commit f88fe52
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
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,10 @@
+package org.palladiosimulator.simexp.dsl.smodel.interpreter;
+
+public class DefaultSmodelConfig implements ISmodelConfig {
+
+    @Override
+    public double getEpsilon() {
+        return 0.0001;
+    }
+
+}
diff --git a/...nterpreter/impl/ExpressionCalculator.java → ...del/interpreter/ExpressionCalculator.java b/...nterpreter/impl/ExpressionCalculator.java → ...del/interpreter/ExpressionCalculator.java
@@ -1,9 +1,7 @@
-package org.palladiosimulator.simexp.dsl.smodel.interpreter.impl;
+package org.palladiosimulator.simexp.dsl.smodel.interpreter;
 
 import org.apache.commons.math3.util.Precision;
 import org.palladiosimulator.simexp.dsl.smodel.api.IExpressionCalculator;
-import org.palladiosimulator.simexp.dsl.smodel.interpreter.IFieldValueProvider;
-import org.palladiosimulator.simexp.dsl.smodel.interpreter.ISmodelConfig;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.BoolLiteral;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.DataType;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.DoubleLiteral;

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/...erpreter/src/org/palladiosimulator/simexp/dsl/smodel/interpreter/impl/SmodelAnalyzer.java b/...erpreter/src/org/palladiosimulator/simexp/dsl/smodel/interpreter/impl/SmodelAnalyzer.java
@@ -1,6 +1,7 @@
 package org.palladiosimulator.simexp.dsl.smodel.interpreter.impl;
 
 import org.palladiosimulator.simexp.dsl.smodel.api.IExpressionCalculator;
+import org.palladiosimulator.simexp.dsl.smodel.interpreter.ExpressionCalculator;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.IFieldValueProvider;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.ISmodelConfig;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.mape.Analyzer;

diff --git a/...nterpreter/src/org/palladiosimulator/simexp/dsl/smodel/interpreter/impl/SmodelPlaner.java b/...nterpreter/src/org/palladiosimulator/simexp/dsl/smodel/interpreter/impl/SmodelPlaner.java
@@ -7,6 +7,7 @@
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
 import org.palladiosimulator.simexp.dsl.smodel.api.IExpressionCalculator;
+import org.palladiosimulator.simexp.dsl.smodel.interpreter.ExpressionCalculator;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.IFieldValueProvider;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.ISmodelConfig;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.IVariableAssigner;

diff --git a/.../src/org/palladiosimulator/simexp/dsl/smodel/interpreter/value/ConstantValueProvider.java b/.../src/org/palladiosimulator/simexp/dsl/smodel/interpreter/value/ConstantValueProvider.java
@@ -1,9 +1,9 @@
 package org.palladiosimulator.simexp.dsl.smodel.interpreter.value;
 
 import org.palladiosimulator.simexp.dsl.smodel.api.IExpressionCalculator;
+import org.palladiosimulator.simexp.dsl.smodel.interpreter.ExpressionCalculator;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.IFieldValueProvider;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.ISmodelConfig;
-import org.palladiosimulator.simexp.dsl.smodel.interpreter.impl.ExpressionCalculator;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Constant;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Expression;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Field;

diff --git a/.../src/org/palladiosimulator/simexp/dsl/smodel/interpreter/value/VariableValueProvider.java b/.../src/org/palladiosimulator/simexp/dsl/smodel/interpreter/value/VariableValueProvider.java
@@ -7,11 +7,11 @@
 import java.util.TreeMap;
 
 import org.palladiosimulator.simexp.dsl.smodel.api.IExpressionCalculator;
+import org.palladiosimulator.simexp.dsl.smodel.interpreter.ExpressionCalculator;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.IFieldValueProvider;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.IResettable;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.ISmodelConfig;
 import org.palladiosimulator.simexp.dsl.smodel.interpreter.IVariableAssigner;
-import org.palladiosimulator.simexp.dsl.smodel.interpreter.impl.ExpressionCalculator;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.DataType;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Expression;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Field;

diff --git a/...preter/impl/ExpressionCalculatorTest.java → ...interpreter/ExpressionCalculatorTest.java b/...preter/impl/ExpressionCalculatorTest.java → ...interpreter/ExpressionCalculatorTest.java
@@ -1,4 +1,4 @@
-package org.palladiosimulator.simexp.dsl.smodel.interpreter.impl;
+package org.palladiosimulator.simexp.dsl.smodel.interpreter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -14,8 +14,6 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.palladiosimulator.simexp.dsl.smodel.SmodelStandaloneSetup;
-import org.palladiosimulator.simexp.dsl.smodel.interpreter.IFieldValueProvider;
-import org.palladiosimulator.simexp.dsl.smodel.interpreter.ISmodelConfig;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Constant;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.Smodel;
 import org.palladiosimulator.simexp.dsl.smodel.smodel.StringLiteral;