X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2FAm2901Testbench.java;h=a5b6b8a754396c7e11ddb69232ffccfa67f13f67;hb=e8e95e2e345f4d9c5927aa78f5c0fb607d352a97;hp=d6057f80108c9eb64484d3f57eead85cf7667a07;hpb=db4075ec14984a406b863c153c873c17adc23dab;p=Mograsim.git 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 d6057f80..a5b6b8a7 100644 --- 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 @@ -1,6 +1,7 @@ package net.mograsim.logic.model.am2900; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import net.mograsim.logic.model.SimpleLogicUIStandalone; @@ -51,7 +52,7 @@ public class Am2901Testbench Pin last = and.getPin("Y"); // guess which pins are outputs and which are inputs - // TODO this code exists three times... but it seems too "hacky" to put it in a helper class + // TODO this code exists four times... but it seems too "hacky" to put it in a helper class List inputPinNames = new ArrayList<>(); List outputPinNames = new ArrayList<>(); for (Pin p : comp.getPins().values()) @@ -60,6 +61,9 @@ public class Am2901Testbench else outputPinNames.add(p.name); + inputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY))); + outputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY))); + for (int i = 0; i < inputPinNames.size(); i++) { double x = 55 + 70 * (i % 2);