From 2cef95c51eaf1cda01af7444be423badea6af535 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sat, 30 May 2020 07:35:05 +0200 Subject: [PATCH] improves the circuit creation; the inputs now are more separated --- .../de/neemann/digital/builder/circuit/CircuitBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/neemann/digital/builder/circuit/CircuitBuilder.java b/src/main/java/de/neemann/digital/builder/circuit/CircuitBuilder.java index e6dffbe42..12757d07c 100644 --- a/src/main/java/de/neemann/digital/builder/circuit/CircuitBuilder.java +++ b/src/main/java/de/neemann/digital/builder/circuit/CircuitBuilder.java @@ -52,10 +52,10 @@ public class CircuitBuilder implements BuilderInterface { private final ArrayList sequentialVars; private final ArrayList flipflops; private final ArrayList desiredVarOrdering; + private final HashSet varsToNet; private int pos; private boolean useLUT; private boolean useJKff; - private HashSet varsToNet; private ModelAnalyserInfo mai; private int lutNumber; @@ -326,7 +326,7 @@ public class CircuitBuilder implements BuilderInterface { private void createInputBus(Collection inputs, Circuit circuit) { HashMap varPos = new HashMap<>(); - int dx = -inputs.size() * SIZE * 2; + int dx = -(inputs.size() * 3 - 1) * SIZE; pos -= SIZE; for (Variable v : inputs) { VisualElement visualElement; @@ -360,7 +360,7 @@ public class CircuitBuilder implements BuilderInterface { } varPos.put(v.getIdentifier(), dx); - dx += SIZE * 2; + dx += SIZE * 3; } for (FragmentVariable f : fragmentVariables) {