Improved tests and commented out wire listeners for more performance

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java
index a5b6b8a..34154e6 100644 (file)
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/Am2901Testbench.java
@@ -84,7 +84,7 @@ public class Am2901Testbench
                        sw.moveTo(x, y + 7.5);
                        wcp.moveTo(160, y);
                        d_ff.moveTo(170, y);
-                       label.moveTo(x - 25, y + 15);
+                       label.moveTo(x - 48, y + 8);
                }
 
                for (int i = 0; i < outputPinNames.size(); i++)
@@ -96,7 +96,7 @@ public class Am2901Testbench
                        tool.connect(bd.getInputPin(), comp, outputPinNames.get(i));
 
                        TextComponent label = new TextComponent(model, outputPinNames.get(i));
-                       label.moveTo(x + 50, y + 8);
+                       label.moveTo(x + 25, y);
                }
        }
 }
\ No newline at end of file

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/TestableAm2901Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/TestableAm2901Impl.java
index 2b27ae6..7d44f8b 100644 (file)
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/TestableAm2901Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/TestableAm2901Impl.java
@@ -153,13 +153,14 @@ public class TestableAm2901Impl implements TestableAm2901
                                if (comp instanceof SubmodelComponent)
                                        modelsToIterate.offer(((SubmodelComponent) comp).submodel);
                }
-               viewModel.setRedrawHandler(() -> wiresIncludingSubmodels.forEach(w ->
-               {
-                       if (debugWires)
-                       {
-                               wireDebugChangeSet.add(w.toString());
-                       }
-               }));
+               System.out.println(wiresIncludingSubmodels.size());
+//             viewModel.setRedrawHandler(() -> wiresIncludingSubmodels.forEach(w ->
+//             {
+//                     if (debugWires)
+//                     {
+//                             wireDebugChangeSet.add(w.toString());
+//                     }
+//             }));
                timeline.addEventAddedListener(te -> eventCounter++);
        }