Changed GUIram2/4's cell order for high level state ID "q"
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 17 Jul 2019 12:05:16 +0000 (14:05 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 17 Jul 2019 12:05:16 +0000 (14:05 +0200)
net.mograsim.logic.model.am2900/components/GUIram2.json
net.mograsim.logic.model.am2900/components/GUIram4.json
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram2.java
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram4.java
net.mograsim.logic.model.editor/components/GUIram2.json
net.mograsim.logic.model.editor/components/GUIram4.json

index 325e2a6..31a01fb 100644 (file)
@@ -2993,10 +2993,10 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler",
         "params": {
           "vectorPartTargets": [
-            "c00.q",
-            "c01.q",
+            "c11.q",
             "c10.q",
-            "c11.q"
+            "c01.q",
+            "c00.q"
           ],
           "vectorPartLengthes": [
             4,
index d2774ae..05bfe9d 100644 (file)
@@ -3485,10 +3485,10 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler",
         "params": {
           "vectorPartTargets": [
-            "c00.q",
-            "c01.q",
+            "c11.q",
             "c10.q",
-            "c11.q"
+            "c01.q",
+            "c00.q"
           ],
           "vectorPartLengthes": [
             16,
index afd42ae..2f45cb7 100644 (file)
@@ -289,7 +289,7 @@ public class GUIram2 extends SimpleRectangularSubmodelComponent
                highLevelStateHandler.addSubcomponentHighLevelState("c10", DelegatingSubcomponentHighLevelStateHandler::new).set(cell10, null);
                highLevelStateHandler.addSubcomponentHighLevelState("c11", DelegatingSubcomponentHighLevelStateHandler::new).set(cell11, null);
                highLevelStateHandler.addAtomicHighLevelState("q", BitVectorSplittingAtomicHighLevelStateHandler::new)
-                               .set(Arrays.asList("c00.q", "c01.q", "c10.q", "c11.q"), Arrays.asList(4, 4, 4, 4));
+                               .set(Arrays.asList("c11.q", "c10.q", "c01.q", "c00.q"), Arrays.asList(4, 4, 4, 4));
                setHighLevelStateHandler(highLevelStateHandler);
        }
 
index a792f5b..da1314b 100644 (file)
@@ -315,7 +315,7 @@ public class GUIram4 extends SimpleRectangularSubmodelComponent
                highLevelStateHandler.addSubcomponentHighLevelState("c1111", DelegatingSubcomponentHighLevelStateHandler::new).set(cell11, "c11");
 
                highLevelStateHandler.addAtomicHighLevelState("q", BitVectorSplittingAtomicHighLevelStateHandler::new)
-                               .set(Arrays.asList("c00.q", "c01.q", "c10.q", "c11.q"), Arrays.asList(16, 16, 16, 16));
+                               .set(Arrays.asList("c11.q", "c10.q", "c01.q", "c00.q"), Arrays.asList(16, 16, 16, 16));
                setHighLevelStateHandler(highLevelStateHandler);
        }
 
index 325e2a6..31a01fb 100644 (file)
@@ -2993,10 +2993,10 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler",
         "params": {
           "vectorPartTargets": [
-            "c00.q",
-            "c01.q",
+            "c11.q",
             "c10.q",
-            "c11.q"
+            "c01.q",
+            "c00.q"
           ],
           "vectorPartLengthes": [
             4,
index d2774ae..05bfe9d 100644 (file)
@@ -3485,10 +3485,10 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler",
         "params": {
           "vectorPartTargets": [
-            "c00.q",
-            "c01.q",
+            "c11.q",
             "c10.q",
-            "c11.q"
+            "c01.q",
+            "c00.q"
           ],
           "vectorPartLengthes": [
             16,