diff --git a/src/main/dig/combinatorial/Comp7485.dig b/src/main/dig/combinatorial/Comp7485.dig new file mode 100644 index 000000000..109b88e83 --- /dev/null +++ b/src/main/dig/combinatorial/Comp7485.dig @@ -0,0 +1,380 @@ + + + 1 + + + Width + 5 + + + + + CompRC.dig + + + 0 + + + In + + + Label + P_0 + + + + 0 + + + In + + + Label + P_1 + + + + 0 + + + In + + + Label + P_2 + + + + 0 + + + In + + + Label + P_3 + + + + 0 + + + In + + + Label + P<Q_i + + + + 0 + + + In + + + Label + P=Q_i + + + + 0 + + + In + + + Label + P>Q_i + + + + 0 + + + In + + + Label + Q_0 + + + + 0 + + + In + + + Label + Q_1 + + + + 0 + + + In + + + Label + Q_2 + + + + 0 + + + In + + + Label + Q_3 + + + + 0 + + + Multiplexer + + + 0 + + + Multiplexer + + + 0 + + + Multiplexer + + + 0 + + + Out + + + Label + P<Q + + + + 0 + + + Out + + + Label + P=Q + + + + 0 + + + Out + + + Label + P>Q + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/dig/combinatorial/Comp7485Parall.dig b/src/main/dig/combinatorial/Comp7485Parall.dig new file mode 100644 index 000000000..b0066a047 --- /dev/null +++ b/src/main/dig/combinatorial/Comp7485Parall.dig @@ -0,0 +1,853 @@ + + + 1 + + + Comp7485.dig + + + 0 + + + Comp7485.dig + + + 0 + + + Comp7485.dig + + + 0 + + + Comp7485.dig + + + 0 + + + Const + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + In + + + Label + A_0 + + + + 0 + + + In + + + Label + A_1 + + + + 0 + + + In + + + Label + A_2 + + + + 0 + + + In + + + Label + A_3 + + + + 0 + + + In + + + Label + B_0 + + + + 0 + + + In + + + Label + B_1 + + + + 0 + + + In + + + Label + B_2 + + + + 0 + + + In + + + Label + B_3 + + + + 0 + + + Const + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + In + + + Label + A_4 + + + + 0 + + + In + + + Label + A_5 + + + + 0 + + + In + + + Label + A_6 + + + + 0 + + + In + + + Label + A_7 + + + + 0 + + + In + + + Label + B_4 + + + + 0 + + + In + + + Label + B_5 + + + + 0 + + + In + + + Label + B_6 + + + + 0 + + + In + + + Label + B_7 + + + + 0 + + + Const + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + Const + + + Value + 0 + + + + 0 + + + In + + + Label + A_8 + + + + 0 + + + In + + + Label + A_9 + + + + 0 + + + In + + + Label + A_10 + + + + 0 + + + In + + + Label + A_11 + + + + 0 + + + In + + + Label + B_8 + + + + 0 + + + In + + + Label + B_9 + + + + 0 + + + In + + + Label + B_10 + + + + 0 + + + In + + + Label + B_11 + + + + 0 + + + Out + + + Label + P=Q + + + + 0 + + + Out + + + Label + P<Q + + + + 0 + + + Out + + + Label + P>Q + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/dig/combinatorial/CompRC.dig b/src/main/dig/combinatorial/CompRC.dig index a9d2b9a25..60aab849d 100644 --- a/src/main/dig/combinatorial/CompRC.dig +++ b/src/main/dig/combinatorial/CompRC.dig @@ -1,6 +1,12 @@ 1 + + + Width + 4 + + CompEN.dig diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index df301be48..630c192e1 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -18,7 +18,7 @@ public class TestExamples extends TestCase { private static final File examples=new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig"); public void testCombinatorial() throws Exception { - assertEquals(26, scan(new File(examples, "combinatorial"))); + assertEquals(28, scan(new File(examples, "combinatorial"))); } public void testSequential() throws Exception {