From 76e28c849f038cf26c0d3a5f2a3508fe9b40e6dd Mon Sep 17 00:00:00 2001
From: eidekrist <kristoei@gmail.com>
Date: Thu, 18 Jul 2019 09:52:49 +0200
Subject: [PATCH] #86 Moved call to wrapper.initializeSlave from setup() to
 exitInitializationMode()

---
 .../fmi4j/importer/fmi1/AbstractModelInstance.kt  |  6 ------
 .../ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt  |  9 +++++++--
 .../fmi4j/importer/fmi1/ModelExchangeInstance.kt  | 15 +++++++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt
index 49a87d96..77e07e5d 100644
--- a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt
+++ b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt
@@ -76,12 +76,6 @@ abstract class AbstractModelInstance<out E : CommonModelDescription, out T : Fmi
         }
     }
 
-    override fun exitInitializationMode(): Boolean {
-        return true.also {
-            wrapper.lastStatus = FmiStatus.OK
-        }
-    }
-
     override fun terminate(): Boolean {
         return terminate(true)
     }
diff --git a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt
index bf62a4ff..b4abbdf6 100644
--- a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt
+++ b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt
@@ -61,10 +61,15 @@ class CoSimulationSlave internal constructor(
             stopTime = stop
         }
 
+        simulationTime = start
+
+        return true
+    }
+
+    override fun exitInitializationMode(): Boolean {
         return (wrapper.initializeSlave(startTime, stopTime).isOK()).also {
-            simulationTime = start
+            wrapper.lastStatus = FmiStatus.OK
         }
-
     }
 
     override fun doStep(stepSize: Double): Boolean {
diff --git a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt
index 7523af75..70a7bd1a 100644
--- a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt
+++ b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt
@@ -44,6 +44,7 @@ open class ModelExchangeInstance internal constructor(
 
 
     internal val eventInfo = EventInfo()
+    private var relativeTolerance: Double = 0.0
 
     override fun setup(start: Double, stop: Double, tolerance: Double): Boolean {
 
@@ -60,13 +61,19 @@ open class ModelExchangeInstance internal constructor(
 
         setTime(start)
 
-        val toleranceControlled = tolerance > 0
-        return (wrapper.initialize(toleranceControlled, tolerance).isOK()).also {
-            simulationTime = start
-        }
+        relativeTolerance = tolerance
+
+        return true
 
     }
 
+    override fun exitInitializationMode(): Boolean {
+        val toleranceControlled = relativeTolerance > 0
+        return (wrapper.initialize(toleranceControlled, relativeTolerance).isOK()).also {
+            wrapper.lastStatus = FmiStatus.OK
+        }
+    }
+
     override fun reset(): Boolean {
         throw IllegalStateException("Reset not supported by FMI 1.0 for Model Exchange")
     }