From 05ba2abf42d990e9d7598f4d4835bda11fe838e8 Mon Sep 17 00:00:00 2001 From: hneemann Date: Mon, 3 Apr 2017 20:37:28 +0200 Subject: [PATCH] added a counter example --- src/main/dig/sequential/Counter-D.dig | 775 ++++++++++++++++++ .../digital/integration/TestExamples.java | 2 +- 2 files changed, 776 insertions(+), 1 deletion(-) create mode 100644 src/main/dig/sequential/Counter-D.dig diff --git a/src/main/dig/sequential/Counter-D.dig b/src/main/dig/sequential/Counter-D.dig new file mode 100644 index 000000000..035d2bf3c --- /dev/null +++ b/src/main/dig/sequential/Counter-D.dig @@ -0,0 +1,775 @@ + + + 1 + + + Tunnel + + + Inputs + 1 + + + NetName + q_3n + + + + + + D_FF + + + valueIsProbe + true + + + Label + q_3n + + + Inputs + 1 + + + Default + 1 + + + + + + Or + + + Inputs + 4 + + + + + + And + + + Inputs + 4 + + + + + + And + + + + + And + + + + + And + + + + + Tunnel + + + Inputs + 1 + + + NetName + q_2n + + + + + + D_FF + + + valueIsProbe + true + + + Label + q_2n + + + Inputs + 1 + + + Default + 1 + + + + + + Or + + + Inputs + 3 + + + + + + And + + + Inputs + 3 + + + + + + And + + + + + And + + + + + Tunnel + + + Inputs + 1 + + + NetName + q_1n + + + + + + D_FF + + + valueIsProbe + true + + + Label + q_1n + + + Inputs + 1 + + + Default + 1 + + + + + + Or + + + + + And + + + + + And + + + + + Tunnel + + + Inputs + 1 + + + NetName + q_0n + + + + + + D_FF + + + valueIsProbe + true + + + Label + q_0n + + + Inputs + 1 + + + + + + Tunnel + + + rotation + + + + NetName + q_0n + + + + + + Not + + + rotation + + + + + + + Tunnel + + + rotation + + + + NetName + q_1n + + + + + + Not + + + rotation + + + + + + + Tunnel + + + rotation + + + + NetName + q_2n + + + + + + Not + + + rotation + + + + + + + Tunnel + + + rotation + + + + NetName + q_3n + + + + + + Not + + + rotation + + + + + + + Clock + + + rotation + + + + Label + C + + + + + + Data + + + microStep + true + + + Label + Data + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + C + q_0n + q_1n + q_2n + q_3n + + \ No newline at end of file diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index a7bab72cf..fbf39c0ba 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -28,7 +28,7 @@ public class TestExamples extends TestCase { */ public void testDistExamples() throws Exception { File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig"); - assertEquals(107, new FileScanner(this::check).scan(examples)); + assertEquals(108, new FileScanner(this::check).scan(examples)); assertEquals(55, testCasesInFiles); }