From b6eae0d99cbdaea29ae2fe7f852c6248fb90fd0f Mon Sep 17 00:00:00 2001 From: hneemann Date: Thu, 25 Jul 2019 08:33:21 +0200 Subject: [PATCH] fixed overlooked test cases --- .../gui/components/table/ExpressionListenerJK.java | 6 ++++-- .../expression/format/FormatToExpressionTest.java | 4 ++-- .../analyse/format/TruthTableFormatterLaTeXTest.java | 2 +- .../digital/fsm/TransitionTableCreatorTest.java | 12 ++++++------ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java b/src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java index d92f7caca..04784ffdf 100644 --- a/src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java +++ b/src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java @@ -31,9 +31,11 @@ public class ExpressionListenerJK implements ExpressionListener { public void resultFound(String name, Expression expression) throws FormatterException, ExpressionException { parent.resultFound(name, expression); - if (name.endsWith("^n+1")) { - String detName = name.substring(0, name.length() - 4); + if (name.endsWith("n+1")) { + String detName = name.substring(0, name.length() - 2); DetermineJKStateMachine jk = new DetermineJKStateMachine(detName, expression); + if (detName.endsWith("^n")) + detName = detName.substring(0, detName.length() - 1); Expression j = jk.getJ(); parent.resultFound("J_" + detName, j); Expression s = jk.getSimplifiedJ(); diff --git a/src/test/java/de/neemann/digital/analyse/expression/format/FormatToExpressionTest.java b/src/test/java/de/neemann/digital/analyse/expression/format/FormatToExpressionTest.java index 3f916820a..129743ad1 100644 --- a/src/test/java/de/neemann/digital/analyse/expression/format/FormatToExpressionTest.java +++ b/src/test/java/de/neemann/digital/analyse/expression/format/FormatToExpressionTest.java @@ -75,8 +75,8 @@ public class FormatToExpressionTest extends TestCase { public void testFormatExpLaTeX() throws Exception { Variable a = new Variable("A_n"); Variable b = new Variable("B_n"); - Expression e = new NamedExpression("Y_n+1", and(a, not(b))); - assertEquals("Y_{n+1} = A_{n} \\und \\nicht{B_{n}}", FormatToExpression.FORMATTER_LATEX.format(e)); + Expression e = new NamedExpression("Y^n+1", and(a, not(b))); + assertEquals("Y^{n+1} = A_n \\und \\nicht{B_n}", FormatToExpression.FORMATTER_LATEX.format(e)); } public void testFormatTable() throws Exception { diff --git a/src/test/java/de/neemann/digital/analyse/format/TruthTableFormatterLaTeXTest.java b/src/test/java/de/neemann/digital/analyse/format/TruthTableFormatterLaTeXTest.java index 305065487..51a9bfcf9 100644 --- a/src/test/java/de/neemann/digital/analyse/format/TruthTableFormatterLaTeXTest.java +++ b/src/test/java/de/neemann/digital/analyse/format/TruthTableFormatterLaTeXTest.java @@ -19,7 +19,7 @@ public class TruthTableFormatterLaTeXTest extends TestCase { assertEquals("\\begin{center}\n" + "\\begin{tabular}{ccc|cc}\n" + - "$A$&$B$&$C$&$Y_{0}$&$Y_{1}$\\\\\n" + + "$A$&$B$&$C$&$Y_0$&$Y_1$\\\\\n" + "\\hline\n" + "$0$&$0$&$0$&$0$&$0$\\\\\n" + "$0$&$0$&$1$&$0$&$0$\\\\\n" + diff --git a/src/test/java/de/neemann/digital/fsm/TransitionTableCreatorTest.java b/src/test/java/de/neemann/digital/fsm/TransitionTableCreatorTest.java index 62b77c237..b611da075 100644 --- a/src/test/java/de/neemann/digital/fsm/TransitionTableCreatorTest.java +++ b/src/test/java/de/neemann/digital/fsm/TransitionTableCreatorTest.java @@ -28,7 +28,7 @@ public class TransitionTableCreatorTest extends TestCase { new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el); assertEquals(1, el.getResults().size()); - assertEquals("not(Z^0_n)", el.getFirst().toString()); + assertEquals("not(Z_0^n)", el.getFirst().toString()); } public void testBlinkOnOff() throws ExpressionException, FiniteStateMachineException, FormatterException { @@ -45,7 +45,7 @@ public class TransitionTableCreatorTest extends TestCase { new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el); assertEquals(1, el.getResults().size()); - assertEquals("or(and(Run,not(Z^0_n)),and(not(Run),Z^0_n))", el.getFirst().toString()); + assertEquals("or(and(Run,not(Z_0^n)),and(not(Run),Z_0^n))", el.getFirst().toString()); } public void testBlinkResult() throws ExpressionException, FiniteStateMachineException, FormatterException { @@ -62,13 +62,13 @@ public class TransitionTableCreatorTest extends TestCase { new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el); assertEquals(1, el.getResults().size()); - assertEquals("not(Z^0_n)", el.getFirst().toString()); + assertEquals("not(Z_0^n)", el.getFirst().toString()); el = new ExpressionListenerStore(null); new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(1), "Y", el); assertEquals(1, el.getResults().size()); - assertEquals("Z^0_n", el.getFirst().toString()); + assertEquals("Z_0^n", el.getFirst().toString()); } public void testBlinkNotDeterministic() throws ExpressionException { @@ -148,13 +148,13 @@ public class TransitionTableCreatorTest extends TestCase { new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el); assertEquals(1, el.getResults().size()); - assertEquals("and(R,not(Z^0_n))", el.getFirst().toString()); + assertEquals("and(R,not(Z_0^n))", el.getFirst().toString()); el = new ExpressionListenerStore(null); new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(1), "Y", el); assertEquals(1, el.getResults().size()); - assertEquals("and(R,not(Z^0_n))", el.getFirst().toString()); + assertEquals("and(R,not(Z_0^n))", el.getFirst().toString()); }