Fixed solver issues in movement tracking for vehicles

seb-eis · Dec 1, 2020 · 48a8d51 · 48a8d51
1 parent 6f7aa48
commit 48a8d51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/McSolver/Libraries/Simulator/Logic/Routines/MainRoutines.c b/src/McSolver/Libraries/Simulator/Logic/Routines/MainRoutines.c
@@ -389,7 +389,8 @@ error_t RunOneKmcAutoOptimizationExecutionBlock(SCONTEXT_PARAMETER)
 {
     var counters = getMainCycleCounters(simContext);
     let countPerLoop = counters->PrerunGoalMcs / CYCLE_BLOCKCOUNT;
-    for (;counters->McsCount < counters->PrerunGoalMcs;)
+    let stepGoalMcs = counters->McsCount + counters->McsCountPerExecutionPhase;
+    for (;(counters->McsCount < counters->PrerunGoalMcs) && (counters->McsCount < stepGoalMcs);)
     {
         for (int64_t i = 0; i < countPerLoop; ++i)
         {

diff --git a/src/McSolver/Libraries/Simulator/Logic/Routines/TransitionTrackingRoutines.c b/src/McSolver/Libraries/Simulator/Logic/Routines/TransitionTrackingRoutines.c
@@ -156,9 +156,9 @@ void AddCurrentKmcTransitionDataToHistograms(SCONTEXT_PARAMETER)
         case 4:
             if (JUMPPATH[3]->IsMobile && JUMPPATH[3]->IsStable) UpdatePathEnvironmentJumpStatistics(simContext, 3);
         case 3:
-            UpdatePathEnvironmentJumpStatistics(simContext, 2);
+            if (JUMPPATH[2]->IsMobile && JUMPPATH[2]->IsStable) UpdatePathEnvironmentJumpStatistics(simContext, 2);
             if (JUMPPATH[1]->IsMobile && JUMPPATH[1]->IsStable) UpdatePathEnvironmentJumpStatistics(simContext, 1);
-            UpdatePathEnvironmentJumpStatistics(simContext, 0);
+            if (JUMPPATH[0]->IsMobile && JUMPPATH[0]->IsStable) UpdatePathEnvironmentJumpStatistics(simContext, 0);
         default:
             break;
     }