X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=blobdiff_plain;f=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2904%2FTestableAm2904.json;h=811bcad3cc1120f797ee19931f7481d562a53bcc;hp=06aa591efb14d34140f18545f49d10a68ab8d3de;hb=5c03a4fa605a1c3946eddece3b566b5aa0677759;hpb=9e8e8ae5414f52ec87f9247b10a525f41768c7dc

diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
index 06aa591e..811bcad3 100644
--- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
+++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
@@ -76,38 +76,38 @@
     },
     {
       "location": {
-        "x": -87.66482568016058,
-        "y": 58.834004835619645
+        "x": -85.0,
+        "y": 100.0
       },
-      "name": "I_10",
-      "logicWidth": 1,
+      "name": "I_5_0",
+      "logicWidth": 6,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": -80.0,
-        "y": 40.0
+        "x": -84.26853373181032,
+        "y": 78.72500503091884
       },
-      "name": "I_11_12",
-      "logicWidth": 2,
+      "name": "I_6_9",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": -85.0,
-        "y": 100.0
+        "x": -87.66482568016058,
+        "y": 58.834004835619645
       },
-      "name": "I_5_0",
-      "logicWidth": 6,
+      "name": "I_10",
+      "logicWidth": 1,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": -84.26853373181032,
-        "y": 78.72500503091884
+        "x": -80.0,
+        "y": 40.0
       },
-      "name": "I_6_9",
-      "logicWidth": 4,
+      "name": "I_11_12",
+      "logicWidth": 2,
       "usage": "INPUT"
     },
     {
@@ -277,7 +277,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Merger#0",
+        "name": "Splitter#0",
         "pos": {
           "x": -30.0,
           "y": 70.0
@@ -289,7 +289,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#0",
+        "name": "Splitter#1",
         "pos": {
           "x": -45.0,
           "y": 140.0
@@ -301,7 +301,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#1",
+        "name": "Splitter#2",
         "pos": {
           "x": -45.0,
           "y": 100.0
@@ -313,7 +313,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#2",
+        "name": "Splitter#3",
         "pos": {
           "x": -45.0,
           "y": 70.0
@@ -349,6 +349,102 @@
         "name": "unnamedWire#1",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IC"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "IC"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "IN"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "IN"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IOVR"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "IOVR"
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_CEM"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_CEM"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_CEmu"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_CEmu"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EC"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EC"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_EN"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_EN"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EOVR"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EOVR"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -367,7 +463,7 @@
           "pinName": "I_5_0"
         },
         "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "I"
         },
         "name": "unnamedWire#11",
@@ -375,11 +471,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O0"
         },
         "name": "unnamedWire#12",
@@ -387,11 +483,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O1"
         },
         "name": "unnamedWire#13",
@@ -399,11 +495,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O2"
         },
         "name": "unnamedWire#14",
@@ -411,11 +507,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O3"
         },
         "name": "unnamedWire#15",
@@ -423,11 +519,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O4"
         },
         "name": "unnamedWire#16",
@@ -435,11 +531,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O5"
         },
         "name": "unnamedWire#17",
@@ -447,11 +543,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O6"
         },
         "name": "unnamedWire#18",
@@ -459,11 +555,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "O1"
         },
         "name": "unnamedWire#19",
@@ -471,23 +567,11 @@
       },
       {
         "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "IC"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "IC"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O8"
         },
         "name": "unnamedWire#20",
@@ -495,11 +579,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "O3"
         },
         "name": "unnamedWire#21",
@@ -507,11 +591,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O11"
         },
         "name": "unnamedWire#22",
@@ -519,11 +603,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
           "pinName": "O1"
         },
         "name": "unnamedWire#23",
@@ -535,7 +619,7 @@
           "pinName": "I_6_9"
         },
         "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "I"
         },
         "name": "unnamedWire#24",
@@ -543,7 +627,7 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "I"
         },
         "pin2": {
@@ -559,7 +643,7 @@
           "pinName": "I_10"
         },
         "pin2": {
-          "compName": "Merger#0",
+          "compName": "Splitter#0",
           "pinName": "O10"
         },
         "name": "unnamedWire#26",
@@ -571,7 +655,7 @@
           "pinName": "I_11_12"
         },
         "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
           "pinName": "I"
         },
         "name": "unnamedWire#27",
@@ -601,18 +685,6 @@
         "name": "unnamedWire#29",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "IN"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "IN"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -733,18 +805,6 @@
         "name": "unnamedWire#39",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "IOVR"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "IOVR"
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -768,66 +828,6 @@
         },
         "name": "unnamedWire#41",
         "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_CEM"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_CEM"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_CEmu"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_CEmu"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EC"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EC"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_EN"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_EN"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EOVR"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EOVR"
-        },
-        "name": "unnamedWire#9",
-        "path": []
       }
     ],
     "version": "0.1.1"