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

In case of oscillations almost all effected components are shown.

Browse Source
This commit is contained in:
hneemann 2017-06-15 13:56:52 +02:00
parent e52baade92
commit 29090d3b2c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/ReleaseNotes.txt
View File

@ -1,7 +1,7 @@
Release Notes Release Notes
planned as v0.13 planned as v0.13
- unbuffered circular dependencies are detected during circuit analysis - In case of oscillations almost all effected components are shown.
v0.12.1, released on 05. Jun 2016 v0.12.1, released on 05. Jun 2016
- added a fuse to simulate a PROM or PAL. - added a fuse to simulate a PROM or PAL.

12
src/main/java/de/neemann/digital/core/Model.java
View File

@ -42,6 +42,7 @@ public class Model implements Iterable<Node> {
* Maximal number of calculation loops before oscillating behaviour is detected * Maximal number of calculation loops before oscillating behaviour is detected
*/ */
public static final int MAX_LOOP_COUNTER = 1000; public static final int MAX_LOOP_COUNTER = 1000;
private static final int COLLECTING_LOOP_COUNTER = MAX_LOOP_COUNTER + 100;
private final ArrayList<Clock> clocks; private final ArrayList<Clock> clocks;
private final ArrayList<Break> breaks; private final ArrayList<Break> breaks;
@ -58,6 +59,7 @@ public class Model implements Iterable<Node> {
private int version; private int version;
private boolean isInitialized = false; private boolean isInitialized = false;
private WindowPosManager windowPosManager; private WindowPosManager windowPosManager;
private HashSet<Node> oscillatingNodes;
/** /**
* Creates a new model * Creates a new model
@ -192,7 +194,15 @@ public class Model implements Iterable<Node> {
if (needsUpdate()) { if (needsUpdate()) {
while (needsUpdate()) { while (needsUpdate()) {
if (counter++ > MAX_LOOP_COUNTER) { if (counter++ > MAX_LOOP_COUNTER) {
throw new NodeException(Lang.get("err_seemsToOscillate")).addNodes(nodesToUpdateNext); if (oscillatingNodes == null)
oscillatingNodes = new HashSet<>();
if (counter > COLLECTING_LOOP_COUNTER) {
NodeException seemsToOscillate = new NodeException(Lang.get("err_seemsToOscillate")).addNodes(oscillatingNodes);
oscillatingNodes = null;
throw seemsToOscillate;
} else {
oscillatingNodes.addAll(nodesToUpdateNext);
}
} }
doMicroStep(noise); doMicroStep(noise);
} }