Renamed fixedstepbuilder to jacobianstepbuilder

INTO-CPS-Association · Mar 31, 2021 · 5091e89 · 5091e89
1 parent 91c73c3
commit 5091e89
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/plugins/fixedstepbuilder/readme.md b/plugins/fixedstepbuilder/readme.md
diff --git a/plugins/fixedstepbuilder/pom.xml → plugins/jacobianstepbuilder/pom.xml b/plugins/fixedstepbuilder/pom.xml → plugins/jacobianstepbuilder/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <groupId>org.into-cps.maestro.plugins</groupId>
-    <artifactId>fixedstepbuilder</artifactId>
+    <artifactId>jacobianstepbuilder</artifactId>
 
     <dependencies>
         <dependency>

diff --git a/plugins/jacobianstepbuilder/readme.md b/plugins/jacobianstepbuilder/readme.md
@@ -0,0 +1,2 @@
+# Jacobian Step Plugin
+
diff --git a/...s/maestro/plugin/JacobianStepBuilder.java → ...s/maestro/plugin/JacobianStepBuilder.java b/...s/maestro/plugin/JacobianStepBuilder.java → ...s/maestro/plugin/JacobianStepBuilder.java
@@ -100,6 +100,7 @@ public List<PStm> expand(AFunctionDeclaration declaredFunction, List<PExp> forma
             DynamicActiveBuilderScope dynamicScope = builder.getDynamicScope();
             MathBuilderFmi2Api math = builder.getMathBuilder();
             BooleanBuilderFmi2Api booleanLogic = builder.getBooleanBuilder();
+            RealTime realTime = builder.getRealTime();
 
             // Convert raw MaBL to API
             DoubleVariableFmi2Api externalStepSize = builder.getDoubleVariableFrom(stepSizeVar);
@@ -209,6 +210,11 @@ public List<PStm> expand(AFunctionDeclaration declaredFunction, List<PExp> forma
                 convergenceReached = dynamicScope.store("has_converged", false);
             }
 
+
+
+            DoubleVariableFmi2Api realStartTime = dynamicScope.store("real_start_time", 0.0);
+            realStartTime.setValue(realTime.getRealTime());
+
             ScopeFmi2Api scopeFmi2Api = dynamicScope.enterWhile(loopPredicate);
             {
 
@@ -353,15 +359,26 @@ public List<PStm> expand(AFunctionDeclaration declaredFunction, List<PExp> forma
 
                 discardScope.enterElse();
                 {
-
-
                     // Update currentCommunicationTime
                     currentCommunicationTime.setValue(currentCommunicationTime.toMath().addition(currentStepSize));
                     currentStepSize.setValue(stepSize);
 
                     // Call log
                     dataWriterInstance.log(currentCommunicationTime);
 
+                    DoubleVariableFmi2Api realStepTime = dynamicScope.store("real_step_time", 0.0);
+                    realStepTime.setValue(new DoubleExpressionValue(realTime.getRealTime().toMath().subtraction(realStartTime.toMath()).getExp()));
+                    if(jacobianStepConfig.simulationProgramDelay){
+                        dynamicScope.enterIf(realStepTime.toMath().lessThan(currentCommunicationTime));
+                        {
+                            DoubleVariableFmi2Api sleepTime = dynamicScope.store("sleep_time", 0.0);
+                            sleepTime.setValue(new DoubleExpressionValue(currentCommunicationTime.toMath().subtraction(realStepTime).getExp()));
+                            builder.getLogger().debug("## Simulation is ahead of real time. Sleeping for: %f MS", sleepTime);
+                            realTime.sleep(sleepTime);
+                            dynamicScope.leave();
+                        }
+                    }
+
                     dynamicScope.leave();
                 }
 
@@ -424,11 +441,6 @@ public String getName() {
     public String getVersion() {
         return "0.0.1";
     }
-
-    private enum algorithmEnum {
-        variableStep,
-        fixedStep
-    }
 }
 
 

diff --git a/...ps/maestro/plugin/JacobianStepConfig.java → ...ps/maestro/plugin/JacobianStepConfig.java b/...ps/maestro/plugin/JacobianStepConfig.java → ...ps/maestro/plugin/JacobianStepConfig.java
@@ -1,7 +1,6 @@
 package org.intocps.maestro.plugin;
-import java.util.ArrayList;
+
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public class JacobianStepConfig implements IPluginConfiguration {
@@ -10,4 +9,5 @@ public class JacobianStepConfig implements IPluginConfiguration {
     public double absoluteTolerance;
     public double relativeTolerance;
     public int stabilisationLoopMaxIterations;
+    public boolean simulationProgramDelay;
 }
diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -19,7 +19,7 @@
         <module>api</module>
         <module>typeconverter</module>
         <module>fixedstep</module>
-        <module>fixedstepbuilder</module>
+        <module>jacobianstepbuilder</module>
         <module>demo</module>
         <module>topologicalsorting</module>
         <module>verificationsuite</module>