str() and repr() of DecisionEvent and Action added; notebook output u…

maro/simulator/scenarios/cim/common.py

@@ -100,7 +100,7 @@ def __repr__(self):
         return self.__str__()
 
     def __str__(self):
-        return f'Action {{quantity: {self.quantity}, port: {self.port_idx}, vessel: {self.vessel_idx} }}'
+        return f'Action(port_idx={self.port_idx}, vessel_idx={self.vessel_idx}, quantity={self.quantity})'
 
 
 class ActionScope:
@@ -115,7 +115,7 @@ def __repr__(self):
         return self.__str__()
 
     def __str__(self):
-        return f'ActionScope {{load: {self.load}, discharge: {self.discharge} }}'
+        return f'ActionScope(load={self.load}, discharge={self.discharge})'
 
 
 class DecisionEvent:

maro/simulator/scenarios/citi_bike/common.py

@@ -51,7 +51,7 @@ def __getstate__(self):
             "action_scope": self.action_scope}
 
     def __repr__(self):
-        return f"decision event {self.__getstate__()}"
+        return self.__str__()
 
     def __str__(self):
         return f'DecisionEvent(tick={self.tick}, station_idx={self.station_idx}, type={self.type}, action_scope={self.action_scope})'
@@ -63,6 +63,12 @@ def __init__(self, from_station_idx: int, to_station_idx: int, number: int):
         self.to_station_idx = to_station_idx
         self.number = number
 
+    def __repr__(self):
+        return self.__str__()
+
+    def __str__(self):
+        return f'Action(from_station_idx={self.from_station_idx}, to_station_idx={self.to_station_idx}, number={self.number})'
+
 
 class ExtraCostMode(Enum):
     Source = "source"

maro/simulator/utils/common.py

@@ -36,10 +36,12 @@ def get_scenarios()->List[str]:
     """
     try:
         _, scenarios, _ = next(os.walk(scenarios_root_folder))
+        scenarios = sorted([s for s in scenarios if not s.startswith("__")])
+
     except StopIteration:
         return []
 
-    return [s for s in scenarios if not s.startswith("__")]
+    return scenarios
 
 def get_topologies(scenario: str)-> List[str]:
     """Get topology list of built-in scenario
@@ -57,6 +59,8 @@ def get_topologies(scenario: str)-> List[str]:
 
     try:
         _, topologies, _ = next(os.walk(scenario_topology_root))
+        topologies = sorted(topologies)
+
     except StopIteration:
         return []
 

notebooks/container_inventory_management/implement_rl_agent.ipynb

@@ -90,7 +90,7 @@
    ]
   },
   {
-   "cell_type": "raw",
+   "cell_type": "markdown",
    "metadata": {},
    "source": [
     "# Experience Shaper\n",