fix: comply with breaking API changes. (flatland-association#23)

* fix: comply with breaking API changes.

Signed-off-by: chenkins <chenkins44@gmail.com>

* fix: comply with breaking API changes.

Signed-off-by: chenkins <chenkins44@gmail.com>

* fix: comply with breaking API changes.

Signed-off-by: chenkins <chenkins44@gmail.com>

---------

Signed-off-by: chenkins <chenkins44@gmail.com>

Author: chenkins

ai4realnet_orchestrators/railway/playground/test_runner_playground_interactive.py

@@ -27,7 +27,7 @@ def run_scenario(self, scenario_id: str, submission_id: str):
         with (data_dir / "position_to_latlon.pkl").resolve().open("rb") as file_in:
             position_to_latlon_olten = pickle.loads(file_in.read())
 
-        trajectory = Trajectory(data_dir=data_dir, ep_id=scenario)
+        trajectory = Trajectory.load_existing(data_dir=data_dir, ep_id=scenario)
 
         # see above for configuration options, use collect_only=False for live POSTing
         cb = FlatlandInteractiveAICallbacks(position_to_latlon_olten, collect_only=False,

ai4realnet_orchestrators/railway/test_runner_kpi_nf_045_railway.py

@@ -2,6 +2,7 @@
 import logging
 import os
 from collections import defaultdict
+from pathlib import Path
 
 import numpy as np
 from flatland.envs.step_utils.states import TrainState
@@ -64,8 +65,7 @@ def run_scenario(self, scenario_id: str, submission_id: str):
     self.exec(generate_policy_args_one_malfunction, scenario_id, submission_id, f"{submission_id}/{self.test_id}/{scenario_id}/with_malfunction")
 
     # no malfunction
-    trajectory_no_malfunction = Trajectory(data_dir=data_dir_no_malfunction, ep_id=scenario_id)
-    trajectory_no_malfunction.load()
+    trajectory_no_malfunction = Trajectory.load_existing(data_dir=Path(data_dir_no_malfunction), ep_id=scenario_id)
     num_agents = trajectory_no_malfunction.trains_rewards_dones_infos["agent_id"].max() + 1
     for _, r in trajectory_no_malfunction.trains_rewards_dones_infos.iterrows():
       assert r["info"]["malfunction"] == 0
@@ -79,8 +79,7 @@ def run_scenario(self, scenario_id: str, submission_id: str):
     num_betroffen1 = np.sum(betroffen1)
     logger.info(f"num_betroffen1 {num_betroffen1}")
 
-    trajectory_with_malfunction = Trajectory(data_dir=data_dir_with_malfunction, ep_id=scenario_id)
-    trajectory_with_malfunction.load()
+    trajectory_with_malfunction = Trajectory.load_existing(data_dir=Path(data_dir_with_malfunction), ep_id=scenario_id)
     malfunction_agents = defaultdict(list)
     for _, r in trajectory_with_malfunction.trains_rewards_dones_infos.iterrows():
       if r["info"]["malfunction"] > 0:

ai4realnet_orchestrators/railway/test_runner_kpi_pf_026_railway.py

@@ -1,5 +1,6 @@
 import logging
 import os
+from pathlib import Path
 
 import numpy as np
 from flatland.trajectories.trajectories import Trajectory
@@ -33,8 +34,7 @@ def run_scenario(self, scenario_id: str, submission_id: str):
     ]
     self.exec(generate_policy_args, scenario_id, submission_id, f"{submission_id}/{self.test_id}/{scenario_id}")
 
-    trajectory = Trajectory(data_dir=data_dir, ep_id=scenario_id)
-    trajectory.load()
+    trajectory = Trajectory.load_existing(data_dir=Path(data_dir), ep_id=scenario_id)
 
     df_trains_arrived = trajectory.trains_arrived
     logger.info(f"trains arrived: {df_trains_arrived}")