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

added some test cases

Browse Source
This commit is contained in:
hneemann 2018-11-22 21:52:27 +01:00
parent 2cbaeb7348
commit f79cb42c44
5 changed files with 150 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/neemann/digital/fsm/FSM.java
View File

@ -121,12 +121,11 @@ public class FSM {
*
* @return this for chained calls
*/
public FSM calculateForces() {
private void calculateForces() {
for (State s : states)
s.calcExpansionForce(states);
for (Transition t : transitions)
t.calcForce(states, transitions);
return this;
}
/**
@ -195,7 +194,7 @@ public class FSM {
* @throws FinitStateMachineException FinitStateMachineException
*/
public TruthTable createTruthTable() throws ExpressionException, FinitStateMachineException {
return new TransitionTableCreator(states, transitions).create();
return new TransitionTableCreator(this).create();
}
/**
@ -223,4 +222,11 @@ public class FSM {
for (State s : states)
s.toRaster();
}
/**
* @return the transitions
*/
public List<Transition> getTransitions() {
return transitions;
}
}

18
src/main/java/de/neemann/digital/fsm/TransitionTableCreator.java
View File

@ -14,14 +14,15 @@ import de.neemann.digital.lang.Lang;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.TreeSet;
/**
* Creates a transition table from given states and transitions
*/
public class TransitionTableCreator {
private final ArrayList<State> states;
private final ArrayList<Transition> transitions;
private final List<State> states;
private final List<Transition> transitions;
private TruthTable truthTable;
private int rowsPerState;
private ArrayList<Variable> inVars;
@ -31,12 +32,11 @@ public class TransitionTableCreator {
/**
* Creates a new instance
*
* @param states the states
* @param transitions the transitions
* @param fsm the fsm
*/
public TransitionTableCreator(ArrayList<State> states, ArrayList<Transition> transitions) {
this.states = states;
this.transitions = transitions;
public TransitionTableCreator(FSM fsm) {
this.states = fsm.getStates();
this.transitions = fsm.getTransitions();
}
/**
@ -52,13 +52,13 @@ public class TransitionTableCreator {
// create state variables
ArrayList<Variable> vars = new ArrayList<>();
for (int i = stateBits - 1; i >= 0; i--)
vars.add(new Variable("Q^" + i + "_n"));
vars.add(new Variable("Q" + i + "_n"));
truthTable = new TruthTable(vars);
// create the next state result variables
for (int i = stateBits - 1; i >= 0; i--)
truthTable.addResult("Q^" + i + "_n+1");
truthTable.addResult("Q" + i + "_n+1");
// add the output variables
TreeSet<String> results = new TreeSet<>();

16
src/main/java/de/neemann/digital/fsm/gui/FSMDialog.java
View File

@ -31,6 +31,22 @@ public class FSMDialog extends JDialog {
private final ElementLibrary library;
private boolean moveStates = false;
/**
* Use only for tests!
*
* @param givenFsm the fsm to visualize
*/
public FSMDialog(FSM givenFsm) {
this(null, givenFsm, createLibrary());
}
private static ElementLibrary createLibrary() {
ElementLibrary library = new ElementLibrary();
new ShapeFactory(library);
return library;
}
/**
* Creates a new instance
*

22
src/test/java/de/neemann/digital/fsm/FSMTest.java
View File

@ -1,22 +0,0 @@
package de.neemann.digital.fsm;
import de.neemann.digital.draw.graphics.VectorFloat;
import junit.framework.TestCase;
public class FSMTest extends TestCase {
public void testSimple() throws FinitStateMachineException {
FSM fsm = new FSM()
.add(new State("0").setPosition(new VectorFloat(-1,0)))
.add(new State("1").setPosition(new VectorFloat(0,1)))
.add(new State("2").setPosition(new VectorFloat(1,0)))
.add(new State("3").setPosition(new VectorFloat(0,-1)))
.transition("0", "1", null)
.transition("1", "2", null)
.transition("2", "3", null)
.transition("3", "0", null);
fsm.calculateForces();
}
}

116
src/test/java/de/neemann/digital/fsm/TransitionTableCreatorTest.java Normal file
View File

@ -0,0 +1,116 @@
package de.neemann.digital.fsm;
import de.neemann.digital.analyse.MinimizerQuineMcCluskey;
import de.neemann.digital.analyse.TruthTable;
import de.neemann.digital.analyse.expression.ExpressionException;
import de.neemann.digital.analyse.expression.format.FormatterException;
import de.neemann.digital.gui.components.table.ExpressionListenerStore;
import junit.framework.TestCase;
import static de.neemann.digital.analyse.expression.Variable.v;
public class TransitionTableCreatorTest extends TestCase {
public void testBlink() throws ExpressionException, FinitStateMachineException, FormatterException {
State a = new State("a");
State b = new State("b");
FSM fsm = new FSM(a, b)
.transition(a, b, null)
.transition(b, a, null);
TruthTable tt = new TransitionTableCreator(fsm).create();
assertEquals(2, tt.getRows());
assertEquals(1, tt.getResultCount());
final ExpressionListenerStore el = new ExpressionListenerStore(null);
new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el);
assertEquals(1, el.getResults().size());
assertEquals("not(Q0_n)", el.getFirst().toString());
}
public void testBlinkOnOff() throws ExpressionException, FinitStateMachineException, FormatterException {
State a = new State("a");
State b = new State("b");
FSM fsm = new FSM(a, b)
.transition(a, b, v("Run"))
.transition(b, a, v("Run"));
TruthTable tt = new TransitionTableCreator(fsm).create();
assertEquals(4, tt.getRows());
assertEquals(1, tt.getResultCount());
final ExpressionListenerStore el = new ExpressionListenerStore(null);
new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el);
assertEquals(1, el.getResults().size());
assertEquals("or(and(not(Q0_n),Run),and(Q0_n,not(Run)))", el.getFirst().toString());
}
public void testBlinkResult() throws ExpressionException, FinitStateMachineException, FormatterException {
State a = new State("a").val("y",0);
State b = new State("b").val("y",1);
FSM fsm = new FSM(a, b)
.transition(a, b, null)
.transition(b, a, null);
TruthTable tt = new TransitionTableCreator(fsm).create();
assertEquals(2, tt.getRows());
assertEquals(2, tt.getResultCount());
ExpressionListenerStore el = new ExpressionListenerStore(null);
new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(0), "Y", el);
assertEquals(1, el.getResults().size());
assertEquals("not(Q0_n)", el.getFirst().toString());
el = new ExpressionListenerStore(null);
new MinimizerQuineMcCluskey().minimize(tt.getVars(), tt.getResult(1), "Y", el);
assertEquals(1, el.getResults().size());
assertEquals("Q0_n", el.getFirst().toString());
}
public void testBlinkNotDeterministic() throws ExpressionException {
State a = new State("a");
State b = new State("b");
State c = new State("c");
FSM fsm = new FSM(a, b, c)
.transition(a, b, v("Run"))
.transition(a, c, v("Run"));
try {
new TransitionTableCreator(fsm).create();
fail();
} catch (FinitStateMachineException e) {
assertTrue(true);
}
}
public void testBlinkNotUnique() throws ExpressionException {
State a = new State("a");
State b = new State("b").setNumber(1);
State c = new State("c").setNumber(1);
FSM fsm = new FSM(a, b, c)
.transition(a, b, v("Run"))
.transition(b, c, v("Run"));
try {
new TransitionTableCreator(fsm).create();
fail();
} catch (FinitStateMachineException e) {
assertTrue(true);
}
}
public void testBlinkNoInitialState() throws ExpressionException {
State a = new State("a").setNumber(1);
State b = new State("b").setNumber(2);
State c = new State("c").setNumber(3);
FSM fsm = new FSM(a, b, c)
.transition(a, b, v("Run"))
.transition(b, c, v("Run"));
try {
new TransitionTableCreator(fsm).create();
fail();
} catch (FinitStateMachineException e) {
assertTrue(true);
}
}
}