TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-15 15:58:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed overlooked test cases

Browse Source
This commit is contained in:
hneemann 2019-07-25 08:33:21 +02:00
parent bb0122eac1
commit b6eae0d99c
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java
View File

@ -31,9 +31,11 @@ public class ExpressionListenerJK implements ExpressionListener {
public void resultFound(String name, Expression expression) throws FormatterException, ExpressionException { public void resultFound(String name, Expression expression) throws FormatterException, ExpressionException {
parent.resultFound(name, expression); parent.resultFound(name, expression);
if (name.endsWith("^n+1")) { if (name.endsWith("n+1")) {
String detName = name.substring(0, name.length() - 4); String detName = name.substring(0, name.length() - 2);
DetermineJKStateMachine jk = new DetermineJKStateMachine(detName, expression); DetermineJKStateMachine jk = new DetermineJKStateMachine(detName, expression);
if (detName.endsWith("^n"))
detName = detName.substring(0, detName.length() - 1);
Expression j = jk.getJ(); Expression j = jk.getJ();
parent.resultFound("J_" + detName, j); parent.resultFound("J_" + detName, j);
Expression s = jk.getSimplifiedJ(); Expression s = jk.getSimplifiedJ();

4
src/test/java/de/neemann/digital/analyse/expression/format/FormatToExpressionTest.java
View File

@ -75,8 +75,8 @@ public class FormatToExpressionTest extends TestCase {
public void testFormatExpLaTeX() throws Exception { public void testFormatExpLaTeX() throws Exception {
Variable a = new Variable("A_n"); Variable a = new Variable("A_n");
Variable b = new Variable("B_n"); Variable b = new Variable("B_n");
Expression e = new NamedExpression("Y_n+1", and(a, not(b))); 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)); assertEquals("Y^{n+1} = A_n \\und \\nicht{B_n}", FormatToExpression.FORMATTER_LATEX.format(e));
} }
public void testFormatTable() throws Exception { public void testFormatTable() throws Exception {

2
src/test/java/de/neemann/digital/analyse/format/TruthTableFormatterLaTeXTest.java
View File

@ -19,7 +19,7 @@ public class TruthTableFormatterLaTeXTest extends TestCase {
assertEquals("\\begin{center}\n" + assertEquals("\\begin{center}\n" +
"\\begin{tabular}{ccc|cc}\n" + "\\begin{tabular}{ccc|cc}\n" +
"$A$&$B$&$C$&$Y_{0}$&$Y_{1}$\\\\\n" + "$A$&$B$&$C$&$Y_0$&$Y_1$\\\\\n" +
"\\hline\n" + "\\hline\n" +
"$0$&$0$&$0$&$0$&$0$\\\\\n" + "$0$&$0$&$0$&$0$&$0$\\\\\n" +
"$0$&$0$&$1$&$0$&$0$\\\\\n" + "$0$&$0$&$1$&$0$&$0$\\\\\n" +

12
src/test/java/de/neemann/digital/fsm/TransitionTableCreatorTest.java
View File

@ -28,7 +28,7 @@ public class TransitionTableCreatorTest extends TestCase {
new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el); new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el);
assertEquals(1, el.getResults().size()); 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 { 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); new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el);
assertEquals(1, el.getResults().size()); 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 { 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); new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el);
assertEquals(1, el.getResults().size()); 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); el = new ExpressionListenerStore(null);
new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(1), "Y", el); new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(1), "Y", el);
assertEquals(1, el.getResults().size()); assertEquals(1, el.getResults().size());
assertEquals("Z^0_n", el.getFirst().toString()); assertEquals("Z_0^n", el.getFirst().toString());
} }
public void testBlinkNotDeterministic() throws ExpressionException { public void testBlinkNotDeterministic() throws ExpressionException {
@ -148,13 +148,13 @@ public class TransitionTableCreatorTest extends TestCase {
new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el); new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el);
assertEquals(1, el.getResults().size()); 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); el = new ExpressionListenerStore(null);
new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(1), "Y", el); new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(1), "Y", el);
assertEquals(1, el.getResults().size()); 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());
} }