replaced by correct mapping

Author: RemDelaporteMathurin

src/python/custom_pathsim_blocks.py

@@ -5,7 +5,6 @@
 
 
 class Process(ODE):
-    name_to_output_port = {"inv": 0, "mass_flow_rate": 1}
     _port_map_out = {"inv": 0, "mass_flow_rate": 1}
 
     def __init__(self, residence_time=0, initial_value=0, source_term=0):
@@ -48,7 +47,6 @@ def update(self, t):
 
 
 class Splitter2(Splitter):
-    name_to_output_port = {"source1": 0, "source2": 1}
     _port_map_out = {"source1": 0, "source2": 1}
 
     def __init__(self, f1=0.5, f2=0.5):
@@ -59,7 +57,6 @@ def __init__(self, f1=0.5, f2=0.5):
 
 
 class Splitter3(Splitter):
-    name_to_output_port = {"source1": 0, "source2": 1, "source3": 2}
     _port_map_out = {"source1": 0, "source2": 1, "source3": 2}
 
     def __init__(self, f1=1 / 3, f2=1 / 3, f3=1 / 3):
@@ -118,17 +115,6 @@ class Bubbler(Subsystem):
     n_soluble_vials: float
     n_insoluble_vials: float
 
-    name_to_input_port = {
-        "sample_in_soluble": 0,
-        "sample_in_insoluble": 1,
-    }
-    name_to_output_port = {
-        "vial1": 0,
-        "vial2": 1,
-        "vial3": 2,
-        "vial4": 3,
-        "sample_out": 4,
-    }
     _port_map_out = {
         "vial1": 0,
         "vial2": 1,
@@ -273,9 +259,6 @@ def create_reset_events(self) -> list[pathsim.blocks.Schedule]:
 
 
 class FestimWall(Block):
-    name_to_output_port = {"flux_0": 0, "flux_L": 1}
-    name_to_input_port = {"c_0": 0, "c_L": 1}
-
     _port_map_out = {"flux_0": 0, "flux_L": 1}
     _port_map_in = {"c_0": 0, "c_L": 1}
 

src/python/pathsim_utils.py

@@ -347,9 +347,12 @@ def get_input_index(block: Block, edge: dict, block_to_input_index: dict) -> int
     Returns:
         The input index for the block.
     """
-    if hasattr(block, "name_to_input_port"):
-        return block.name_to_input_port[edge["targetHandle"]]
-    elif isinstance(block, Function):
+    
+    if edge["targetHandle"] is not None:
+        if block._port_map_in:
+            return block._port_map_in[edge["targetHandle"]]
+
+    if isinstance(block, Function):
         return int(edge["targetHandle"].replace("target-", ""))
     else:
         # make sure that the target block has only one input port (ie. that targetHandle is None)
@@ -372,9 +375,11 @@ def get_output_index(block: Block, edge: dict) -> int:
     Returns:
         The output index for the block.
     """
-    if hasattr(block, "name_to_output_port"):
-        return block.name_to_output_port[edge["sourceHandle"]]
-    elif isinstance(block, Splitter):
+    if edge["sourceHandle"] is not None:
+        if block._port_map_out:
+            return block._port_map_out[edge["sourceHandle"]]
+
+    if isinstance(block, Splitter):
         # Splitter outputs are always in order, so we can use the handle directly
         assert edge["sourceHandle"], edge
         output_index = int(edge["sourceHandle"].replace("source", "")) - 1
@@ -428,7 +433,7 @@ def make_connections(nodes, edges, blocks) -> list[Connection]:
                     if edge["sourceHandle"]:
                         label += f" ({edge['sourceHandle']})"
                     target_block.labels.append(label)
-
+            print(f"Connecting {source_block.id} output {output_index} to {target_block.id} input {input_index}")
             connection = Connection(
                 source_block[output_index],
                 target_block[input_index],