Merge pull request #123 from TUDelft-CITG/CP-scope-3-get-cp

Cp scope 3 get cp
TUDelft-CITG · Mar 7, 2023 · 70bb925 · 70bb925
2 parents 19dd8b2 + 9a17436
commit 70bb925
Show file tree

Hide file tree

Showing 4 changed files with 593 additions and 21 deletions.
diff --git a/src/openclsim/critical_path/base_cp.py b/src/openclsim/critical_path/base_cp.py
@@ -78,7 +78,11 @@ def _make_recorded_activities_df(self):
         recorded_activities_df = self.reshape_log(all_recorded_events)
 
         # add unique identifier for activities (could be shared by multiple objects)
-        self.recorded_activities_df = self.add_unique_activity(recorded_activities_df)
+        recorded_activities_df = self.add_unique_activity(recorded_activities_df)
+
+        self.recorded_activities_df = recorded_activities_df.sort_values(
+            by=["start_time", "Activity", "SimulationObject"]
+        ).reset_index(drop=True)
 
     def combine_logs(self):
         """