Fixed and added a lot of tests

[Mograsim.git] / net.mograsim.logic.ui.am2900 / test / net / mograsim / logic / ui / am2900 / TestableAm2901Impl.java

diff --git a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
index 6c7be71..a4dd04a 100644 (file)
--- a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
+++ b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/TestableAm2901Impl.java
@@ -5,7 +5,9 @@ import static org.junit.jupiter.api.Assertions.fail;
 import java.lang.reflect.Field;\r
 import java.util.HashMap;\r
 import java.util.HashSet;\r
+import java.util.LinkedList;\r
 import java.util.Objects;\r
+import java.util.Queue;\r
 import java.util.Set;\r
 import java.util.TreeSet;\r
 \r
@@ -15,18 +17,14 @@ import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.core.types.Bit;\r
 import net.mograsim.logic.core.types.BitVector;\r
 import net.mograsim.logic.core.types.BitVector.BitVectorMutator;\r
-import net.mograsim.logic.ui.model.ModelVisitor;\r
 import net.mograsim.logic.ui.model.ViewModel;\r
 import net.mograsim.logic.ui.model.ViewModelModifiable;\r
 import net.mograsim.logic.ui.model.components.GUIBitDisplay;\r
 import net.mograsim.logic.ui.model.components.GUIComponent;\r
 import net.mograsim.logic.ui.model.components.GUIManualSwitch;\r
-import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate;\r
-import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;\r
-import net.mograsim.logic.ui.model.components.SubmodelInterface;\r
+import net.mograsim.logic.ui.model.components.SubmodelComponent;\r
 import net.mograsim.logic.ui.model.components.mi.nandbased.am2901.GUIAm2901;\r
 import net.mograsim.logic.ui.model.wires.GUIWire;\r
-import net.mograsim.logic.ui.model.wires.WireCrossPoint;\r
 import net.mograsim.logic.ui.modeladapter.LogicModelParameters;\r
 import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;\r
 \r
@@ -45,9 +43,6 @@ public class TestableAm2901Impl implements TestableAm2901
        private BitDisplay F_0, Cn_4, OVR, F3;\r
        private BitDisplay ORAMn, ORAMn_3, OQn, OQn_3;\r
 \r
-       private Set<GUIWire> allWires;\r
-       private Set<GUIComponent> allComponents;\r
-\r
        private Set<String> wireDebugChangeSet;\r
        private boolean debugWires = false;\r
        public int debugEventThreshold = 10_000;\r
@@ -119,6 +114,7 @@ public class TestableAm2901Impl implements TestableAm2901
                for (String id : am2901.getOutputPinNames())\r
                {\r
                        GUIBitDisplay bd = new GUIBitDisplay(viewModel);\r
+//                     bd.addRedrawListener(() -> System.out.println(id + " " + bd.getBitDisplay().getDisplayedValue()));\r
                        new GUIWire(viewModel, am2901.getPin(id), bd.getInputPin());\r
                        idDisplayMap.put(id, bd);\r
                }\r
@@ -132,19 +128,23 @@ public class TestableAm2901Impl implements TestableAm2901
                        setField(entry.getKey().replaceAll("\\+|=", "_"), entry.getValue().getManualSwitch());\r
                for (var entry : idDisplayMap.entrySet())\r
                        setField(entry.getKey().replaceAll("\\+|=", "_"), entry.getValue().getBitDisplay());\r
-               // Switch Clock off first\r
-               C.switchOff();\r
 \r
                // Debug code\r
-               allWires = new HashSet<>();\r
-               allComponents = new HashSet<>();\r
-               ModelAccumulator accumulator = new ModelAccumulator();\r
-               accumulator.visit(viewModel);\r
-               allWires.forEach(w -> w.addRedrawListener(() ->\r
+               HashSet<GUIWire> wiresIncludingSubmodels = new HashSet<>();\r
+               Queue<ViewModel> modelsToIterate = new LinkedList<>();\r
+               modelsToIterate.add(viewModel);\r
+               while (modelsToIterate.size() > 0)\r
+               {\r
+                       ViewModel model = modelsToIterate.poll();\r
+                       wiresIncludingSubmodels.addAll(model.getWires());\r
+                       for (GUIComponent comp : model.getComponents())\r
+                               if (comp instanceof SubmodelComponent)\r
+                                       modelsToIterate.offer(((SubmodelComponent) comp).submodel);\r
+               }\r
+               wiresIncludingSubmodels.forEach(w -> w.addRedrawListener(() ->\r
                {\r
                        if (debugWires)\r
                        {\r
-                               System.out.println(w);\r
                                wireDebugChangeSet.add(w.toString());\r
                        }\r
                }));\r
@@ -245,9 +245,9 @@ public class TestableAm2901Impl implements TestableAm2901
        }\r
 \r
        @Override\r
-       public void toogleClock()\r
+       public void clockOn(boolean isClockOn)\r
        {\r
-               C.toggle();\r
+               C.setState(isClockOn);\r
        }\r
 \r
        @Override\r
@@ -346,57 +346,22 @@ public class TestableAm2901Impl implements TestableAm2901
                return mutator.toBitVector();\r
        }\r
 \r
-       class ModelAccumulator implements ModelVisitor\r
+       @Override\r
+       public void setDirectly(Register r, String val_4_bit)\r
        {\r
-               @Override\r
-               public void visit(GUIWire w)\r
-               {\r
-                       allWires.add(w);\r
-               }\r
-\r
-               @Override\r
-               public void visit(SimpleRectangularGUIGate simpleRectangularGUIGate)\r
-               {\r
-                       allComponents.add(simpleRectangularGUIGate);\r
-               }\r
-\r
-               @Override\r
-               public void visit(SimpleRectangularSubmodelComponent simpleRectangularSubmodelComponent)\r
-               {\r
-                       allComponents.add(simpleRectangularSubmodelComponent);\r
-                       simpleRectangularSubmodelComponent.getWires().forEach(w -> w.accept(this));\r
-                       simpleRectangularSubmodelComponent.getComponents().forEach(w -> w.accept(this));\r
-               }\r
-\r
-               @Override\r
-               public void visit(WireCrossPoint wireCrossPoint)\r
-               {\r
-                       // nothing\r
-               }\r
-\r
-               @Override\r
-               public void visit(GUIBitDisplay guiBitDisplay)\r
-               {\r
-                       allComponents.add(guiBitDisplay);\r
-               }\r
-\r
-               @Override\r
-               public void visit(GUIManualSwitch guiManualSwitch)\r
-               {\r
-                       allComponents.add(guiManualSwitch);\r
-               }\r
+               am2901.setHighLevelState(regToStateID(r), BitVector.parse(val_4_bit));\r
+       }\r
 \r
-               @Override\r
-               public void visit(SubmodelInterface submodelInterface)\r
-               {\r
-                       // nothing\r
-               }\r
+       @Override\r
+       public String getDirectly(Register r)\r
+       {\r
+               return am2901.getHighLevelState(regToStateID(r)).toString();\r
+       }\r
 \r
-               @Override\r
-               public void visit(ViewModel viewModel)\r
-               {\r
-                       viewModel.getWires().forEach(w -> w.accept(this));\r
-                       viewModel.getComponents().forEach(w -> w.accept(this));\r
-               }\r
+       private static String regToStateID(Register r)\r
+       {\r
+               if (r == Register.Q)\r
+                       return "qreg.q";\r
+               return "regs.c" + r.toBitString() + ".q";\r
        }\r
 }\r