Actually fixing state determination

Signed-off-by: Sebastian Peter <sebastian.peter@tu-dortmund.de>
ie3-institute · Feb 25, 2025 · d05a128 · d05a128
1 parent 7fe7ec1
commit d05a128
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/scala/edu/ie3/simona/model/participant2/ParticipantModelShell.scala b/src/main/scala/edu/ie3/simona/model/participant2/ParticipantModelShell.scala
@@ -430,18 +430,22 @@ final case class ParticipantModelShell[
   private def determineCurrentState(tick: Long): S = {
     // new state is only calculated if there's an old state and an operating point
     val state = _state
-      .zip(_operatingPoint)
-      .map { case (st, op) =>
-        if (st.tick < tick)
+      .map { st =>
+        if (st.tick < tick) {
+          // If the state is old, an operating point needs
+          // to be present to determine the curren state
           model.determineState(
             st,
-            op,
+            operatingPoint,
             tick,
             tick.toDateTime(simulationStartDate),
           )
-        else
+        } else {
+          // The state is up-to-date, no need to update
           st
+        }
       }
+      // No state present, create an initial one
       .getOrElse(model.initialState(tick, tick.toDateTime(simulationStartDate)))
 
     if (state.tick != tick)