Merge branch 'refactor/maven' into feature/multimeter3

This commit is contained in:
Bane Stojkovic
2025-03-17 22:52:47 +01:00
25 changed files with 192 additions and 147 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+9 -1
View File
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.5-FINAL</version>
<version>5.4.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -64,21 +64,29 @@
<groupId>org.diylc.local</groupId>
<artifactId>app-framework</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/../lib/app-framework.jar</systemPath>
</dependency>
<dependency>
<groupId>org.diylc.local</groupId>
<artifactId>gerber-writer-api-1.0.0</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/../lib/gerber-writer-api-1.0.0.jar</systemPath>
</dependency>
<dependency>
<groupId>org.diylc.local</groupId>
<artifactId>jep-2.4.1</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/../lib/jep-2.4.1.jar</systemPath>
</dependency>
<dependency>
<groupId>org.diylc.local</groupId>
<artifactId>svgSalamander-1.1.2.4</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/../lib/svgSalamander-1.1.2.4.jar</systemPath>
</dependency>
</dependencies>
</project>
@@ -55,9 +55,14 @@ public class SpiceAnalyzer extends AbstractNetlistAnalyzer implements INetlistAn
protected Summary summarize(Netlist netlist, Node preferredOutput) throws TreeException {
// grab all components that are in the netlist
List<IDIYComponent<?>> allComponents = netlist.getComponents();
List<Group> groups = netlist.getSortedGroups();
List<IDIYComponent<?>> allComponents = groups.stream()
.flatMap(x -> x.getNodes().stream()
.map(y -> y.getComponent()))
.distinct()
.collect(Collectors.toList());
int unconnectedIndex = groups.size();
int maxLen = 0;