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

statistics counts also pull resistors, closes #805

Browse Source
This commit is contained in:
hneemann 2021-08-07 08:19:52 +02:00
parent 180fb7d6cb
commit 53842073f0
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/de/neemann/digital/core/stats/Statistics.java
View File

@ -7,11 +7,18 @@ package de.neemann.digital.core.stats;
import de.neemann.digital.core.Model; import de.neemann.digital.core.Model;
import de.neemann.digital.core.Node; import de.neemann.digital.core.Node;
import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer;
import de.neemann.digital.core.element.Element;
import de.neemann.digital.core.element.PinDescription;
import de.neemann.digital.core.wiring.bus.CommonBusValue;
import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import javax.swing.event.TableModelListener; import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel; import javax.swing.table.TableModel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.TreeMap; import java.util.TreeMap;
@ -25,14 +32,30 @@ public class Statistics {
* Creates a new statistics. * Creates a new statistics.
* *
* @param model the model to count. * @param model the model to count.
* @throws PinException PinException
*/ */
public Statistics(Model model) { public Statistics(Model model) throws PinException {
HashSet<CommonBusValue> cbvs = new HashSet<>();
map = new TreeMap<>(); map = new TreeMap<>();
for (Node n : model) { for (Node n : model) {
if (n instanceof Countable) { if (n instanceof Countable) {
count(new Index((Countable) n)); count(new Index((Countable) n));
} else } else
count(new Index(n.getClass().getSimpleName())); count(new Index(n.getClass().getSimpleName()));
if (n instanceof Element) {
for (ObservableValue ov : ((Element) n).getOutputs()) {
for (Observer o : ov.getObservers()) {
if (o instanceof CommonBusValue)
cbvs.add((CommonBusValue) o);
}
}
}
}
for (CommonBusValue cbv : cbvs) {
PinDescription.PullResistor r = cbv.getResistor();
if (r == PinDescription.PullResistor.pullDown || r == PinDescription.PullResistor.pullUp)
count(new Index(r.name(), cbv.getBits()));
} }
} }
@ -56,6 +79,13 @@ public class Statistics {
private final int inputs; private final int inputs;
private final int addrBits; private final int addrBits;
private Index(String name, int bits) {
this.name = name;
this.bits = bits;
this.inputs = 0;
this.addrBits = 0;
}
private Index(String name) { private Index(String name) {
this.name = name; this.name = name;
this.bits = 0; this.bits = 0;