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

fixed a bug which can occur if several nets are connected by tunnels

Browse Source
This commit is contained in:
hneemann 2018-01-25 18:27:22 +01:00
parent 9ed1668cc6
commit 06275f591c
2 changed files with 203 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/de/neemann/digital/integration/TestExamples.java
View File

@ -40,7 +40,7 @@ public class TestExamples extends TestCase {
*/
public void testTestExamples() throws Exception {
File examples = new File(Resources.getRoot(), "/dig/test");
assertEquals(116, new FileScanner(this::check).scan(examples));
assertEquals(117, new FileScanner(this::check).scan(examples));
assertEquals(106, testCasesInFiles);
}

202
src/test/resources/dig/test/net/chaining.dig Normal file
View File

@ -0,0 +1,202 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<attributes/>
<visualElements>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>in</string>
</entry>
</elementAttributes>
<pos x="460" y="180"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>out</string>
</entry>
</elementAttributes>
<pos x="600" y="300"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>A0</string>
</entry>
</elementAttributes>
<pos x="540" y="180"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
<entry>
<string>NetName</string>
<string>A0</string>
</entry>
</elementAttributes>
<pos x="520" y="200"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>A1</string>
</entry>
</elementAttributes>
<pos x="540" y="200"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
<entry>
<string>NetName</string>
<string>A1</string>
</entry>
</elementAttributes>
<pos x="520" y="220"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>A2</string>
</entry>
</elementAttributes>
<pos x="540" y="220"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
<entry>
<string>NetName</string>
<string>A2</string>
</entry>
</elementAttributes>
<pos x="520" y="240"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
<entry>
<string>NetName</string>
<string>A3</string>
</entry>
</elementAttributes>
<pos x="520" y="260"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
<entry>
<string>NetName</string>
<string>A4</string>
</entry>
</elementAttributes>
<pos x="520" y="280"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
<entry>
<string>NetName</string>
<string>A5</string>
</entry>
</elementAttributes>
<pos x="520" y="300"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>A3</string>
</entry>
</elementAttributes>
<pos x="540" y="240"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>A4</string>
</entry>
</elementAttributes>
<pos x="540" y="260"/>
</visualElement>
<visualElement>
<elementName>Tunnel</elementName>
<elementAttributes>
<entry>
<string>NetName</string>
<string>A5</string>
</entry>
</elementAttributes>
<pos x="540" y="280"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="520" y="240"/>
<p2 x="540" y="240"/>
</wire>
<wire>
<p1 x="460" y="180"/>
<p2 x="540" y="180"/>
</wire>
<wire>
<p1 x="520" y="260"/>
<p2 x="540" y="260"/>
</wire>
<wire>
<p1 x="520" y="200"/>
<p2 x="540" y="200"/>
</wire>
<wire>
<p1 x="520" y="280"/>
<p2 x="540" y="280"/>
</wire>
<wire>
<p1 x="520" y="300"/>
<p2 x="600" y="300"/>
</wire>
<wire>
<p1 x="520" y="220"/>
<p2 x="540" y="220"/>
</wire>
</wires>
<measurementOrdering/>
</circuit>