simplified subsystem ports + commented out all schedulelists for now

Author: RemDelaporteMathurin

src/python/custom_pathsim_blocks.py

@@ -1,5 +1,6 @@
 from pathsim.blocks import Block, ODE
 import pathsim.blocks
+import pathsim.events
 from pathsim import Subsystem, Interface, Connection
 import numpy as np
 
@@ -102,6 +103,8 @@ def create_reset_events(self):
             pathsim.blocks.Schedule(t_start=t, t_end=t, func_act=self.reset)
             for t in reset_times
         ]
+        # need https://github.com/milanofthe/pathsim/pull/66
+        # return pathsim.events.ScheduleList(times_evt=reset_times, func_act=self.reset)
 
 
 # BUBBLER SYSTEM
@@ -163,7 +166,11 @@ def __init__(
         add1 = pathsim.blocks.Adder()
         add2 = pathsim.blocks.Adder()
 
+        # can be simplified when https://github.com/milanofthe/pathsim/pull/65 is merged
         interface = Interface()
+        interface._port_map_in = self._port_map_out
+        interface._port_map_out = self._port_map_in
+        interface.__init__()  # reinitialize to rebuild registers
 
         self.vials = [vial_1, vial_2, vial_3, vial_4]
 
@@ -182,28 +189,24 @@ def __init__(
             interface,
         ]
         connections = [
-            Connection(
-                interface[self._port_map_in["sample_in_soluble"]], col_eff1
-            ),
+            Connection(interface["sample_in_soluble"], col_eff1),
             Connection(col_eff1[0], vial_1),
             Connection(col_eff1[1], col_eff2),
             Connection(col_eff2[0], vial_2),
             Connection(col_eff2[1], conversion_eff),
             Connection(conversion_eff[0], add1[0]),
             Connection(conversion_eff[1], add2[0]),
-            Connection(
-                interface[self._port_map_in["sample_in_insoluble"]], add1[1]
-            ),
+            Connection(interface["sample_in_insoluble"], add1[1]),
             Connection(add1, col_eff3),
             Connection(col_eff3[0], vial_3),
             Connection(col_eff3[1], col_eff4),
             Connection(col_eff4[0], vial_4),
             Connection(col_eff4[1], add2[1]),
-            Connection(vial_1, interface[self._port_map_out["vial1"]]),
-            Connection(vial_2, interface[self._port_map_out["vial2"]]),
-            Connection(vial_3, interface[self._port_map_out["vial3"]]),
-            Connection(vial_4, interface[self._port_map_out["vial4"]]),
-            Connection(add2, interface[self._port_map_out["sample_out"]]),
+            Connection(vial_1, interface["vial1"]),
+            Connection(vial_2, interface["vial2"]),
+            Connection(vial_3, interface["vial3"]),
+            Connection(vial_4, interface["vial4"]),
+            Connection(add2, interface["sample_out"]),
         ]
         super().__init__(blocks, connections)
 
@@ -221,7 +224,13 @@ def reset_itg(_):
             )
         return events
 
-    def create_reset_events(self) -> list[pathsim.blocks.Schedule]:
+        # need https://github.com/milanofthe/pathsim/pull/66
+        # events = pathsim.events.ScheduleList(
+        #     times_evt=reset_times, func_act=reset_itg
+        # )
+        # return events
+
+    def create_reset_events(self) -> list[pathsim.events.Schedule]:
         """Create reset events for all vials based on the replacement times.
 
         Raises:

src/python/pathsim_utils.py

@@ -348,14 +348,10 @@ def get_input_index(block: Block, edge: dict, block_to_input_index: dict) -> int
     Returns:
         The input index for the block.
     """
-    
+
     if edge["targetHandle"] is not None:
         if block._port_map_in:
-            # aliases are not yet supported for subsystems
-            if isinstance(block, pathsim.Subsystem):
-                return block._port_map_in[edge["targetHandle"]]
-            else:
-                return edge["targetHandle"]
+            return edge["targetHandle"]
 
     if isinstance(block, Function):
         return int(edge["targetHandle"].replace("target-", ""))
@@ -382,11 +378,7 @@ def get_output_index(block: Block, edge: dict) -> int:
     """
     if edge["sourceHandle"] is not None:
         if block._port_map_out:
-            # aliases are not yet supported for subsystems
-            if isinstance(block, pathsim.Subsystem):
-                return block._port_map_out[edge["sourceHandle"]]
-            else:
-                return edge["sourceHandle"]
+            return edge["sourceHandle"]
 
     if isinstance(block, Splitter):
         # Splitter outputs are always in order, so we can use the handle directly