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

Added some more test cases for the double-throw multi pole relay. See #172

Browse Source
This commit is contained in:
hneemann 2018-07-17 14:33:45 +02:00
parent ad6cd92cfb
commit 384b840fa6
4 changed files with 1038 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distribution/ReleaseNotes.txt
View File

@ -1,7 +1,8 @@
Release Notes
HEAD, planned as v0.20
- improved zooming and navigating in the measurement graph
- Improved zooming and navigating in the measurement graph.
- Added multi pole double-throw relays.
v0.19, released on 14. June 2018
- Added a tabbed pane to the attributes dialog to make it more beginner friendly.

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

@ -45,8 +45,8 @@ public class TestExamples extends TestCase {
public void testTestExamples() throws Exception {
File examples = new File(Resources.getRoot(), "/dig/test");
testCasesInFiles = 0;
assertEquals(135, new FileScanner(TestExamples::check).scan(examples));
assertEquals(127, testCasesInFiles);
assertEquals(137, new FileScanner(TestExamples::check).scan(examples));
assertEquals(129, testCasesInFiles);
}
/**

349
src/test/resources/dig/test/switch/relayFullAdder.dig Normal file
View File

@ -0,0 +1,349 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<attributes/>
<visualElements>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>A</string>
</entry>
</elementAttributes>
<pos x="420" y="40"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>B</string>
</entry>
</elementAttributes>
<pos x="420" y="180"/>
</visualElement>
<visualElement>
<elementName>Testcase</elementName>
<elementAttributes>
<entry>
<string>Testdata</string>
<testData>
<dataString>A B C Sum Carry
loop (C,2)
loop (A,2)
loop (B,2)
let s=A+B+C;
(A) (B) (C) (s&amp;1) (s&gt;&gt;1)
end loop
end loop
end loop
</dataString>
</testData>
</entry>
</elementAttributes>
<pos x="420" y="240"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>C</string>
</entry>
</elementAttributes>
<pos x="740" y="220"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
</elementAttributes>
<pos x="600" y="120"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="460" y="100"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="520" y="60"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="620" y="200"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="440" y="80"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>Sum</string>
</entry>
</elementAttributes>
<pos x="880" y="120"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>Carry</string>
</entry>
</elementAttributes>
<pos x="880" y="260"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
</elementAttributes>
<pos x="820" y="160"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="680" y="140"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="740" y="100"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="840" y="240"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="660" y="120"/>
</visualElement>
<visualElement>
<elementName>PullDown</elementName>
<elementAttributes/>
<pos x="860" y="280"/>
</visualElement>
<visualElement>
<elementName>PullDown</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
</elementAttributes>
<pos x="860" y="100"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="540" y="120"/>
<p2 x="520" y="140"/>
</wire>
<wire>
<p1 x="760" y="160"/>
<p2 x="740" y="180"/>
</wire>
<wire>
<p1 x="820" y="160"/>
<p2 x="860" y="160"/>
</wire>
<wire>
<p1 x="720" y="160"/>
<p2 x="740" y="160"/>
</wire>
<wire>
<p1 x="760" y="160"/>
<p2 x="780" y="160"/>
</wire>
<wire>
<p1 x="600" y="80"/>
<p2 x="680" y="80"/>
</wire>
<wire>
<p1 x="500" y="80"/>
<p2 x="560" y="80"/>
</wire>
<wire>
<p1 x="720" y="80"/>
<p2 x="740" y="80"/>
</wire>
<wire>
<p1 x="640" y="260"/>
<p2 x="860" y="260"/>
</wire>
<wire>
<p1 x="860" y="260"/>
<p2 x="880" y="260"/>
</wire>
<wire>
<p1 x="500" y="100"/>
<p2 x="560" y="100"/>
</wire>
<wire>
<p1 x="440" y="100"/>
<p2 x="460" y="100"/>
</wire>
<wire>
<p1 x="420" y="180"/>
<p2 x="560" y="180"/>
</wire>
<wire>
<p1 x="600" y="180"/>
<p2 x="620" y="180"/>
</wire>
<wire>
<p1 x="720" y="180"/>
<p2 x="740" y="180"/>
</wire>
<wire>
<p1 x="760" y="180"/>
<p2 x="780" y="180"/>
</wire>
<wire>
<p1 x="660" y="180"/>
<p2 x="680" y="180"/>
</wire>
<wire>
<p1 x="500" y="40"/>
<p2 x="520" y="40"/>
</wire>
<wire>
<p1 x="420" y="40"/>
<p2 x="460" y="40"/>
</wire>
<wire>
<p1 x="600" y="120"/>
<p2 x="640" y="120"/>
</wire>
<wire>
<p1 x="500" y="120"/>
<p2 x="520" y="120"/>
</wire>
<wire>
<p1 x="540" y="120"/>
<p2 x="560" y="120"/>
</wire>
<wire>
<p1 x="820" y="120"/>
<p2 x="860" y="120"/>
</wire>
<wire>
<p1 x="720" y="120"/>
<p2 x="780" y="120"/>
</wire>
<wire>
<p1 x="860" y="120"/>
<p2 x="880" y="120"/>
</wire>
<wire>
<p1 x="500" y="140"/>
<p2 x="520" y="140"/>
</wire>
<wire>
<p1 x="540" y="140"/>
<p2 x="560" y="140"/>
</wire>
<wire>
<p1 x="440" y="140"/>
<p2 x="460" y="140"/>
</wire>
<wire>
<p1 x="720" y="140"/>
<p2 x="780" y="140"/>
</wire>
<wire>
<p1 x="660" y="140"/>
<p2 x="680" y="140"/>
</wire>
<wire>
<p1 x="740" y="220"/>
<p2 x="780" y="220"/>
</wire>
<wire>
<p1 x="820" y="220"/>
<p2 x="840" y="220"/>
</wire>
<wire>
<p1 x="640" y="120"/>
<p2 x="640" y="260"/>
</wire>
<wire>
<p1 x="740" y="80"/>
<p2 x="740" y="100"/>
</wire>
<wire>
<p1 x="660" y="120"/>
<p2 x="660" y="140"/>
</wire>
<wire>
<p1 x="660" y="140"/>
<p2 x="660" y="180"/>
</wire>
<wire>
<p1 x="520" y="40"/>
<p2 x="520" y="60"/>
</wire>
<wire>
<p1 x="440" y="80"/>
<p2 x="440" y="100"/>
</wire>
<wire>
<p1 x="440" y="100"/>
<p2 x="440" y="140"/>
</wire>
<wire>
<p1 x="840" y="220"/>
<p2 x="840" y="240"/>
</wire>
<wire>
<p1 x="620" y="180"/>
<p2 x="620" y="200"/>
</wire>
<wire>
<p1 x="860" y="100"/>
<p2 x="860" y="120"/>
</wire>
<wire>
<p1 x="860" y="160"/>
<p2 x="860" y="260"/>
</wire>
<wire>
<p1 x="860" y="260"/>
<p2 x="860" y="280"/>
</wire>
</wires>
</circuit>

685
src/test/resources/dig/test/switch/relayFullAdder2.dig Normal file
View File

@ -0,0 +1,685 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<attributes/>
<visualElements>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>A</string>
</entry>
<entry>
<string>Bits</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="300" y="40"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>B</string>
</entry>
<entry>
<string>Bits</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="300" y="180"/>
</visualElement>
<visualElement>
<elementName>Testcase</elementName>
<elementAttributes>
<entry>
<string>Testdata</string>
<testData>
<dataString>A B C_in S C_out
loop (C,2)
loop (A,4)
loop (B,4)
let s=A+B+C;
(A) (B) (C) (s&amp;3) (s&gt;&gt;2)
end loop
end loop
end loop
</dataString>
</testData>
</entry>
</elementAttributes>
<pos x="300" y="440"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>C_in</string>
</entry>
</elementAttributes>
<pos x="740" y="220"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
</elementAttributes>
<pos x="580" y="120"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="440" y="100"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="500" y="60"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="600" y="200"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="420" y="80"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
</elementAttributes>
<pos x="820" y="160"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="680" y="140"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="740" y="100"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="840" y="240"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="660" y="120"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
</elementAttributes>
<pos x="580" y="340"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="440" y="320"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="500" y="280"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="600" y="420"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="420" y="300"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>C_out</string>
</entry>
</elementAttributes>
<pos x="960" y="480"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
</elementAttributes>
<pos x="820" y="380"/>
</visualElement>
<visualElement>
<elementName>RelayDT</elementName>
<elementAttributes>
<entry>
<string>poles</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="680" y="360"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="740" y="320"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="840" y="460"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="660" y="340"/>
</visualElement>
<visualElement>
<elementName>PullDown</elementName>
<elementAttributes/>
<pos x="940" y="500"/>
</visualElement>
<visualElement>
<elementName>Splitter</elementName>
<elementAttributes>
<entry>
<string>Input Splitting</string>
<string>2</string>
</entry>
<entry>
<string>Output Splitting</string>
<string>1,1</string>
</entry>
</elementAttributes>
<pos x="340" y="40"/>
</visualElement>
<visualElement>
<elementName>Splitter</elementName>
<elementAttributes>
<entry>
<string>Input Splitting</string>
<string>2</string>
</entry>
<entry>
<string>Output Splitting</string>
<string>1,1</string>
</entry>
</elementAttributes>
<pos x="340" y="180"/>
</visualElement>
<visualElement>
<elementName>Splitter</elementName>
<elementAttributes>
<entry>
<string>Input Splitting</string>
<string>1,1</string>
</entry>
<entry>
<string>Output Splitting</string>
<string>2</string>
</entry>
</elementAttributes>
<pos x="900" y="120"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>S</string>
</entry>
<entry>
<string>Bits</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="960" y="120"/>
</visualElement>
<visualElement>
<elementName>PullDown</elementName>
<elementAttributes>
<entry>
<string>Bits</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="940" y="140"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="520" y="120"/>
<p2 x="500" y="140"/>
</wire>
<wire>
<p1 x="520" y="340"/>
<p2 x="500" y="360"/>
</wire>
<wire>
<p1 x="760" y="160"/>
<p2 x="740" y="180"/>
</wire>
<wire>
<p1 x="760" y="380"/>
<p2 x="740" y="400"/>
</wire>
<wire>
<p1 x="820" y="160"/>
<p2 x="860" y="160"/>
</wire>
<wire>
<p1 x="720" y="160"/>
<p2 x="740" y="160"/>
</wire>
<wire>
<p1 x="760" y="160"/>
<p2 x="780" y="160"/>
</wire>
<wire>
<p1 x="620" y="480"/>
<p2 x="860" y="480"/>
</wire>
<wire>
<p1 x="860" y="480"/>
<p2 x="940" y="480"/>
</wire>
<wire>
<p1 x="940" y="480"/>
<p2 x="960" y="480"/>
</wire>
<wire>
<p1 x="480" y="320"/>
<p2 x="540" y="320"/>
</wire>
<wire>
<p1 x="420" y="320"/>
<p2 x="440" y="320"/>
</wire>
<wire>
<p1 x="640" y="260"/>
<p2 x="860" y="260"/>
</wire>
<wire>
<p1 x="480" y="260"/>
<p2 x="500" y="260"/>
</wire>
<wire>
<p1 x="400" y="260"/>
<p2 x="440" y="260"/>
</wire>
<wire>
<p1 x="480" y="100"/>
<p2 x="540" y="100"/>
</wire>
<wire>
<p1 x="420" y="100"/>
<p2 x="440" y="100"/>
</wire>
<wire>
<p1 x="480" y="40"/>
<p2 x="500" y="40"/>
</wire>
<wire>
<p1 x="360" y="40"/>
<p2 x="440" y="40"/>
</wire>
<wire>
<p1 x="300" y="40"/>
<p2 x="340" y="40"/>
</wire>
<wire>
<p1 x="360" y="200"/>
<p2 x="380" y="200"/>
</wire>
<wire>
<p1 x="480" y="360"/>
<p2 x="500" y="360"/>
</wire>
<wire>
<p1 x="520" y="360"/>
<p2 x="540" y="360"/>
</wire>
<wire>
<p1 x="420" y="360"/>
<p2 x="440" y="360"/>
</wire>
<wire>
<p1 x="720" y="360"/>
<p2 x="780" y="360"/>
</wire>
<wire>
<p1 x="660" y="360"/>
<p2 x="680" y="360"/>
</wire>
<wire>
<p1 x="480" y="140"/>
<p2 x="500" y="140"/>
</wire>
<wire>
<p1 x="520" y="140"/>
<p2 x="540" y="140"/>
</wire>
<wire>
<p1 x="420" y="140"/>
<p2 x="440" y="140"/>
</wire>
<wire>
<p1 x="720" y="140"/>
<p2 x="780" y="140"/>
</wire>
<wire>
<p1 x="660" y="140"/>
<p2 x="680" y="140"/>
</wire>
<wire>
<p1 x="880" y="140"/>
<p2 x="900" y="140"/>
</wire>
<wire>
<p1 x="580" y="300"/>
<p2 x="680" y="300"/>
</wire>
<wire>
<p1 x="480" y="300"/>
<p2 x="540" y="300"/>
</wire>
<wire>
<p1 x="720" y="300"/>
<p2 x="740" y="300"/>
</wire>
<wire>
<p1 x="380" y="400"/>
<p2 x="540" y="400"/>
</wire>
<wire>
<p1 x="580" y="400"/>
<p2 x="600" y="400"/>
</wire>
<wire>
<p1 x="720" y="400"/>
<p2 x="740" y="400"/>
</wire>
<wire>
<p1 x="760" y="400"/>
<p2 x="780" y="400"/>
</wire>
<wire>
<p1 x="660" y="400"/>
<p2 x="680" y="400"/>
</wire>
<wire>
<p1 x="580" y="80"/>
<p2 x="680" y="80"/>
</wire>
<wire>
<p1 x="480" y="80"/>
<p2 x="540" y="80"/>
</wire>
<wire>
<p1 x="720" y="80"/>
<p2 x="740" y="80"/>
</wire>
<wire>
<p1 x="580" y="340"/>
<p2 x="620" y="340"/>
</wire>
<wire>
<p1 x="480" y="340"/>
<p2 x="500" y="340"/>
</wire>
<wire>
<p1 x="520" y="340"/>
<p2 x="540" y="340"/>
</wire>
<wire>
<p1 x="820" y="340"/>
<p2 x="880" y="340"/>
</wire>
<wire>
<p1 x="720" y="340"/>
<p2 x="780" y="340"/>
</wire>
<wire>
<p1 x="360" y="180"/>
<p2 x="540" y="180"/>
</wire>
<wire>
<p1 x="580" y="180"/>
<p2 x="600" y="180"/>
</wire>
<wire>
<p1 x="720" y="180"/>
<p2 x="740" y="180"/>
</wire>
<wire>
<p1 x="760" y="180"/>
<p2 x="780" y="180"/>
</wire>
<wire>
<p1 x="660" y="180"/>
<p2 x="680" y="180"/>
</wire>
<wire>
<p1 x="300" y="180"/>
<p2 x="340" y="180"/>
</wire>
<wire>
<p1 x="820" y="440"/>
<p2 x="840" y="440"/>
</wire>
<wire>
<p1 x="640" y="440"/>
<p2 x="780" y="440"/>
</wire>
<wire>
<p1 x="580" y="120"/>
<p2 x="640" y="120"/>
</wire>
<wire>
<p1 x="480" y="120"/>
<p2 x="500" y="120"/>
</wire>
<wire>
<p1 x="520" y="120"/>
<p2 x="540" y="120"/>
</wire>
<wire>
<p1 x="820" y="120"/>
<p2 x="900" y="120"/>
</wire>
<wire>
<p1 x="720" y="120"/>
<p2 x="780" y="120"/>
</wire>
<wire>
<p1 x="920" y="120"/>
<p2 x="940" y="120"/>
</wire>
<wire>
<p1 x="940" y="120"/>
<p2 x="960" y="120"/>
</wire>
<wire>
<p1 x="820" y="380"/>
<p2 x="860" y="380"/>
</wire>
<wire>
<p1 x="720" y="380"/>
<p2 x="740" y="380"/>
</wire>
<wire>
<p1 x="760" y="380"/>
<p2 x="780" y="380"/>
</wire>
<wire>
<p1 x="740" y="220"/>
<p2 x="780" y="220"/>
</wire>
<wire>
<p1 x="820" y="220"/>
<p2 x="840" y="220"/>
</wire>
<wire>
<p1 x="360" y="60"/>
<p2 x="400" y="60"/>
</wire>
<wire>
<p1 x="640" y="120"/>
<p2 x="640" y="260"/>
</wire>
<wire>
<p1 x="640" y="260"/>
<p2 x="640" y="440"/>
</wire>
<wire>
<p1 x="740" y="80"/>
<p2 x="740" y="100"/>
</wire>
<wire>
<p1 x="740" y="300"/>
<p2 x="740" y="320"/>
</wire>
<wire>
<p1 x="420" y="80"/>
<p2 x="420" y="100"/>
</wire>
<wire>
<p1 x="420" y="300"/>
<p2 x="420" y="320"/>
</wire>
<wire>
<p1 x="420" y="320"/>
<p2 x="420" y="360"/>
</wire>
<wire>
<p1 x="420" y="100"/>
<p2 x="420" y="140"/>
</wire>
<wire>
<p1 x="840" y="220"/>
<p2 x="840" y="240"/>
</wire>
<wire>
<p1 x="840" y="440"/>
<p2 x="840" y="460"/>
</wire>
<wire>
<p1 x="940" y="120"/>
<p2 x="940" y="140"/>
</wire>
<wire>
<p1 x="940" y="480"/>
<p2 x="940" y="500"/>
</wire>
<wire>
<p1 x="620" y="340"/>
<p2 x="620" y="480"/>
</wire>
<wire>
<p1 x="880" y="140"/>
<p2 x="880" y="340"/>
</wire>
<wire>
<p1 x="400" y="60"/>
<p2 x="400" y="260"/>
</wire>
<wire>
<p1 x="500" y="40"/>
<p2 x="500" y="60"/>
</wire>
<wire>
<p1 x="500" y="260"/>
<p2 x="500" y="280"/>
</wire>
<wire>
<p1 x="660" y="120"/>
<p2 x="660" y="140"/>
</wire>
<wire>
<p1 x="660" y="340"/>
<p2 x="660" y="360"/>
</wire>
<wire>
<p1 x="660" y="360"/>
<p2 x="660" y="400"/>
</wire>
<wire>
<p1 x="660" y="140"/>
<p2 x="660" y="180"/>
</wire>
<wire>
<p1 x="600" y="180"/>
<p2 x="600" y="200"/>
</wire>
<wire>
<p1 x="600" y="400"/>
<p2 x="600" y="420"/>
</wire>
<wire>
<p1 x="860" y="160"/>
<p2 x="860" y="260"/>
</wire>
<wire>
<p1 x="860" y="380"/>
<p2 x="860" y="480"/>
</wire>
<wire>
<p1 x="380" y="200"/>
<p2 x="380" y="400"/>
</wire>
</wires>
</circuit>