improves the circuit creation; the inputs now are more separated

This commit is contained in:
hneemann 2020-05-30 07:35:05 +02:00
parent 3652749ee9
commit 2cef95c51e

View File

@ -52,10 +52,10 @@ public class CircuitBuilder implements BuilderInterface<CircuitBuilder> {
private final ArrayList<Variable> sequentialVars;
private final ArrayList<FragmentVisualElement> flipflops;
private final ArrayList<Variable> desiredVarOrdering;
private final HashSet<String> varsToNet;
private int pos;
private boolean useLUT;
private boolean useJKff;
private HashSet<String> varsToNet;
private ModelAnalyserInfo mai;
private int lutNumber;
@ -326,7 +326,7 @@ public class CircuitBuilder implements BuilderInterface<CircuitBuilder> {
private void createInputBus(Collection<Variable> inputs, Circuit circuit) {
HashMap<String, Integer> 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<CircuitBuilder> {
}
varPos.put(v.getIdentifier(), dx);
dx += SIZE * 2;
dx += SIZE * 3;
}
for (FragmentVariable f : fragmentVariables) {