Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / mux1_16.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
index 65ce55c..e29bbbf 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
@@ -42,143 +42,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 115.0,
-          "y": 25.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 175.0,
-          "y": 45.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 115.0,
-          "y": 265.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 115.0,
-          "y": 325.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 175.0,
-          "y": 405.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 175.0,
-          "y": 345.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#14",
-        "pos": {
-          "x": 115.0,
-          "y": 385.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#15",
-        "pos": {
-          "x": 175.0,
-          "y": 465.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 115.0,
-          "y": 85.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#3",
-        "pos": {
-          "x": 175.0,
-          "y": 105.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#4",
-        "pos": {
-          "x": 175.0,
-          "y": 165.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#5",
-        "pos": {
-          "x": 115.0,
-          "y": 205.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 175.0,
-          "y": 225.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 115.0,
-          "y": 145.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 115.0,
-          "y": 445.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#9",
-        "pos": {
-          "x": 175.0,
-          "y": 285.0
-        }
-      },
-      {
-        "id": "Merger",
-        "name": "Merger#0",
-        "pos": {
-          "x": 260.0,
-          "y": 175.0
-        },
-        "params": 16
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
@@ -195,7 +58,10 @@
           "x": 5.0,
           "y": 50.0
         },
-        "params": 16
+        "params": {
+          "logicWidth": 16,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -204,7 +70,22 @@
           "x": 5.0,
           "y": 375.0
         },
-        "params": 16
+        "params": {
+          "logicWidth": 16,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#2",
+        "pos": {
+          "x": 260.0,
+          "y": 175.0
+        },
+        "params": {
+          "logicWidth": 16,
+          "orientation": "LEFT"
+        }
       },
       {
         "id": "WireCrossPoint",
@@ -493,6 +374,134 @@
           "y": 299.0
         },
         "params": 1
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#0",
+        "pos": {
+          "x": 115.0,
+          "y": 25.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#1",
+        "pos": {
+          "x": 175.0,
+          "y": 45.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#10",
+        "pos": {
+          "x": 115.0,
+          "y": 265.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#11",
+        "pos": {
+          "x": 115.0,
+          "y": 325.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#12",
+        "pos": {
+          "x": 175.0,
+          "y": 405.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#13",
+        "pos": {
+          "x": 175.0,
+          "y": 345.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#14",
+        "pos": {
+          "x": 115.0,
+          "y": 385.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#15",
+        "pos": {
+          "x": 175.0,
+          "y": 465.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#2",
+        "pos": {
+          "x": 115.0,
+          "y": 85.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#3",
+        "pos": {
+          "x": 175.0,
+          "y": 105.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#4",
+        "pos": {
+          "x": 175.0,
+          "y": 165.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#5",
+        "pos": {
+          "x": 115.0,
+          "y": 205.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#6",
+        "pos": {
+          "x": 175.0,
+          "y": 225.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#7",
+        "pos": {
+          "x": 115.0,
+          "y": 145.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#8",
+        "pos": {
+          "x": 115.0,
+          "y": 445.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#9",
+        "pos": {
+          "x": 175.0,
+          "y": 285.0
+        }
       }
     ],
     "wires": [
@@ -502,7 +511,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "S1"
         },
         "name": "unnamedWire#0",
@@ -514,7 +523,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "S2"
         },
         "name": "unnamedWire#1",
@@ -526,7 +535,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "S1"
         },
         "name": "unnamedWire#10",
@@ -534,11 +543,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I14"
+          "compName": "Splitter#2",
+          "pinName": "O14"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "Y"
         },
         "name": "unnamedWire#100",
@@ -555,12 +564,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I13"
+          "compName": "Splitter#2",
+          "pinName": "O13"
         },
         "name": "unnamedWire#101",
         "path": [
@@ -576,11 +585,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I12"
+          "compName": "Splitter#2",
+          "pinName": "O12"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "Y"
         },
         "name": "unnamedWire#102",
@@ -597,12 +606,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I11"
+          "compName": "Splitter#2",
+          "pinName": "O11"
         },
         "name": "unnamedWire#103",
         "path": [
@@ -618,12 +627,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I10"
+          "compName": "Splitter#2",
+          "pinName": "O10"
         },
         "name": "unnamedWire#104",
         "path": [
@@ -639,11 +648,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I9"
+          "compName": "Splitter#2",
+          "pinName": "O9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "Y"
         },
         "name": "unnamedWire#105",
@@ -660,12 +669,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I8"
+          "compName": "Splitter#2",
+          "pinName": "O8"
         },
         "name": "unnamedWire#106",
         "path": [
@@ -681,11 +690,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I7"
+          "compName": "Splitter#2",
+          "pinName": "O7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "Y"
         },
         "name": "unnamedWire#107",
@@ -702,12 +711,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I6"
+          "compName": "Splitter#2",
+          "pinName": "O6"
         },
         "name": "unnamedWire#108",
         "path": [
@@ -723,11 +732,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I5"
+          "compName": "Splitter#2",
+          "pinName": "O5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "Y"
         },
         "name": "unnamedWire#109",
@@ -748,7 +757,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "S2"
         },
         "name": "unnamedWire#11",
@@ -756,12 +765,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I4"
+          "compName": "Splitter#2",
+          "pinName": "O4"
         },
         "name": "unnamedWire#110",
         "path": [
@@ -777,11 +786,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I3"
+          "compName": "Splitter#2",
+          "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "Y"
         },
         "name": "unnamedWire#111",
@@ -798,12 +807,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I2"
+          "compName": "Splitter#2",
+          "pinName": "O2"
         },
         "name": "unnamedWire#112",
         "path": [
@@ -819,11 +828,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I1"
+          "compName": "Splitter#2",
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "Y"
         },
         "name": "unnamedWire#113",
@@ -840,12 +849,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I0"
+          "compName": "Splitter#2",
+          "pinName": "O0"
         },
         "name": "unnamedWire#114",
         "path": [
@@ -861,8 +870,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "O"
+          "compName": "Splitter#2",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "_submodelinterface",
@@ -890,7 +899,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "S1"
         },
         "pin2": {
@@ -906,7 +915,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "S2"
         },
         "name": "unnamedWire#13",
@@ -942,7 +951,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "S1"
         },
         "name": "unnamedWire#16",
@@ -967,7 +976,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "S2"
         },
         "pin2": {
@@ -983,7 +992,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "S1"
         },
         "name": "unnamedWire#19",
@@ -995,7 +1004,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "S1"
         },
         "name": "unnamedWire#2",
@@ -1003,7 +1012,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "S2"
         },
         "pin2": {
@@ -1019,7 +1028,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "S1"
         },
         "name": "unnamedWire#21",
@@ -1027,7 +1036,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "S2"
         },
         "pin2": {
@@ -1043,7 +1052,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "S1"
         },
         "name": "unnamedWire#23",
@@ -1051,7 +1060,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "S2"
         },
         "pin2": {
@@ -1063,7 +1072,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "S1"
         },
         "pin2": {
@@ -1075,7 +1084,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "S2"
         },
         "pin2": {
@@ -1091,7 +1100,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "S1"
         },
         "name": "unnamedWire#27",
@@ -1099,7 +1108,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "S2"
         },
         "pin2": {
@@ -1115,7 +1124,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "S1"
         },
         "name": "unnamedWire#29",
@@ -1127,7 +1136,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "S2"
         },
         "name": "unnamedWire#3",
@@ -1135,7 +1144,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "S2"
         },
         "pin2": {
@@ -1151,7 +1160,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#31",
@@ -1259,7 +1268,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "S1"
         },
         "name": "unnamedWire#4",
@@ -1307,7 +1316,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "S2"
         },
         "name": "unnamedWire#43",
@@ -1372,7 +1381,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "S1"
         },
         "name": "unnamedWire#48",
@@ -1389,7 +1398,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "S2"
         },
         "name": "unnamedWire#49",
@@ -1406,7 +1415,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "S2"
         },
         "name": "unnamedWire#5",
@@ -1548,7 +1557,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "S1"
         },
         "name": "unnamedWire#6",
@@ -1560,7 +1569,7 @@
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#60",
@@ -1572,7 +1581,7 @@
           "pinName": "O14"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "I1"
         },
         "name": "unnamedWire#61",
@@ -1593,7 +1602,7 @@
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "I1"
         },
         "name": "unnamedWire#62",
@@ -1614,7 +1623,7 @@
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "I1"
         },
         "name": "unnamedWire#63",
@@ -1635,7 +1644,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "I1"
         },
         "name": "unnamedWire#64",
@@ -1656,7 +1665,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "I1"
         },
         "name": "unnamedWire#65",
@@ -1677,7 +1686,7 @@
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "I1"
         },
         "name": "unnamedWire#66",
@@ -1698,7 +1707,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "I1"
         },
         "name": "unnamedWire#67",
@@ -1719,7 +1728,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "I1"
         },
         "name": "unnamedWire#68",
@@ -1740,7 +1749,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "I1"
         },
         "name": "unnamedWire#69",
@@ -1757,7 +1766,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "S2"
         },
         "pin2": {
@@ -1773,7 +1782,7 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "I1"
         },
         "name": "unnamedWire#70",
@@ -1794,7 +1803,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "I1"
         },
         "name": "unnamedWire#71",
@@ -1815,7 +1824,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "I1"
         },
         "name": "unnamedWire#72",
@@ -1836,7 +1845,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "I1"
         },
         "name": "unnamedWire#73",
@@ -1857,7 +1866,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "I1"
         },
         "name": "unnamedWire#74",
@@ -1878,7 +1887,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "I1"
         },
         "name": "unnamedWire#75",
@@ -1923,7 +1932,7 @@
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "I2"
         },
         "name": "unnamedWire#78",
@@ -1944,7 +1953,7 @@
           "pinName": "O14"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "I2"
         },
         "name": "unnamedWire#79",
@@ -1965,7 +1974,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "S1"
         },
         "name": "unnamedWire#8",
@@ -1977,7 +1986,7 @@
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "I2"
         },
         "name": "unnamedWire#80",
@@ -1998,7 +2007,7 @@
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "I2"
         },
         "name": "unnamedWire#81",
@@ -2019,7 +2028,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "I2"
         },
         "name": "unnamedWire#82",
@@ -2040,7 +2049,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "I2"
         },
         "name": "unnamedWire#83",
@@ -2061,7 +2070,7 @@
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "I2"
         },
         "name": "unnamedWire#84",
@@ -2082,7 +2091,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "I2"
         },
         "name": "unnamedWire#85",
@@ -2103,7 +2112,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "I2"
         },
         "name": "unnamedWire#86",
@@ -2124,7 +2133,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "I2"
         },
         "name": "unnamedWire#87",
@@ -2145,7 +2154,7 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "I2"
         },
         "name": "unnamedWire#88",
@@ -2166,7 +2175,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "I2"
         },
         "name": "unnamedWire#89",
@@ -2183,7 +2192,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "S2"
         },
         "pin2": {
@@ -2199,7 +2208,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "I2"
         },
         "name": "unnamedWire#90",
@@ -2220,7 +2229,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "I2"
         },
         "name": "unnamedWire#91",
@@ -2241,7 +2250,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "I2"
         },
         "name": "unnamedWire#92",
@@ -2262,7 +2271,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "I2"
         },
         "name": "unnamedWire#93",
@@ -2339,12 +2348,12 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I15"
+          "compName": "Splitter#2",
+          "pinName": "O15"
         },
         "name": "unnamedWire#99",
         "path": [