Added 7448.

This commit is contained in:
hneemann 2017-05-12 19:42:23 +02:00
parent dbaa126bf0
commit 80f5b87b33
3 changed files with 1927 additions and 209 deletions

View File

@ -96,12 +96,12 @@
<rotation rotation="3"/>
</entry>
</elementAttributes>
<pos x="740" y="-320"/>
<pos x="740" y="-300"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="540" y="-360"/>
<pos x="540" y="-340"/>
</visualElement>
<visualElement>
<elementName>Clock</elementName>
@ -110,21 +110,17 @@
<string>runRealTime</string>
<boolean>true</boolean>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
</entry>
<entry>
<string>Frequency</string>
<int>10</int>
</entry>
</elementAttributes>
<pos x="720" y="-400"/>
<pos x="-260" y="-380"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="420" y="-200"/>
<pos x="420" y="-180"/>
</visualElement>
<visualElement>
<elementName>74162.dig</elementName>
@ -134,17 +130,17 @@
<rotation rotation="3"/>
</entry>
</elementAttributes>
<pos x="380" y="-320"/>
<pos x="380" y="-300"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="180" y="-360"/>
<pos x="180" y="-340"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="60" y="-200"/>
<pos x="60" y="-180"/>
</visualElement>
<visualElement>
<elementName>74162.dig</elementName>
@ -154,17 +150,17 @@
<rotation rotation="3"/>
</entry>
</elementAttributes>
<pos x="20" y="-320"/>
<pos x="20" y="-300"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="-180" y="-360"/>
<pos x="-180" y="-340"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="-300" y="-200"/>
<pos x="-300" y="-180"/>
</visualElement>
</visualElements>
<wires>
@ -192,6 +188,14 @@
<p1 x="-100" y="-100"/>
<p2 x="20" y="-100"/>
</wire>
<wire>
<p1 x="-220" y="-360"/>
<p2 x="140" y="-360"/>
</wire>
<wire>
<p1 x="140" y="-360"/>
<p2 x="780" y="-360"/>
</wire>
<wire>
<p1 x="600" y="360"/>
<p2 x="660" y="360"/>
@ -205,12 +209,8 @@
<p2 x="-60" y="360"/>
</wire>
<wire>
<p1 x="-200" y="-140"/>
<p2 x="160" y="-140"/>
</wire>
<wire>
<p1 x="160" y="-140"/>
<p2 x="700" y="-140"/>
<p1 x="-220" y="-140"/>
<p2 x="340" y="-140"/>
</wire>
<wire>
<p1 x="560" y="140"/>
@ -224,18 +224,6 @@
<p1 x="-160" y="140"/>
<p2 x="-100" y="140"/>
</wire>
<wire>
<p1 x="-20" y="-400"/>
<p2 x="340" y="-400"/>
</wire>
<wire>
<p1 x="700" y="-400"/>
<p2 x="720" y="-400"/>
</wire>
<wire>
<p1 x="340" y="-400"/>
<p2 x="700" y="-400"/>
</wire>
<wire>
<p1 x="580" y="-80"/>
<p2 x="700" y="-80"/>
@ -248,86 +236,6 @@
<p1 x="-140" y="-80"/>
<p2 x="-20" y="-80"/>
</wire>
<wire>
<p1 x="140" y="-340"/>
<p2 x="160" y="-340"/>
</wire>
<wire>
<p1 x="-220" y="-340"/>
<p2 x="-200" y="-340"/>
</wire>
<wire>
<p1 x="180" y="-340"/>
<p2 x="220" y="-340"/>
</wire>
<wire>
<p1 x="-180" y="-340"/>
<p2 x="-140" y="-340"/>
</wire>
<wire>
<p1 x="500" y="-340"/>
<p2 x="540" y="-340"/>
</wire>
<wire>
<p1 x="540" y="-340"/>
<p2 x="580" y="-340"/>
</wire>
<wire>
<p1 x="260" y="-340"/>
<p2 x="300" y="-340"/>
</wire>
<wire>
<p1 x="-140" y="-340"/>
<p2 x="-100" y="-340"/>
</wire>
<wire>
<p1 x="-60" y="-340"/>
<p2 x="20" y="-340"/>
</wire>
<wire>
<p1 x="660" y="-340"/>
<p2 x="740" y="-340"/>
</wire>
<wire>
<p1 x="580" y="-340"/>
<p2 x="620" y="-340"/>
</wire>
<wire>
<p1 x="300" y="-340"/>
<p2 x="380" y="-340"/>
</wire>
<wire>
<p1 x="220" y="-340"/>
<p2 x="260" y="-340"/>
</wire>
<wire>
<p1 x="-100" y="-340"/>
<p2 x="-60" y="-340"/>
</wire>
<wire>
<p1 x="620" y="-340"/>
<p2 x="660" y="-340"/>
</wire>
<wire>
<p1 x="420" y="-180"/>
<p2 x="460" y="-180"/>
</wire>
<wire>
<p1 x="60" y="-180"/>
<p2 x="100" y="-180"/>
</wire>
<wire>
<p1 x="-300" y="-180"/>
<p2 x="-260" y="-180"/>
</wire>
<wire>
<p1 x="460" y="-180"/>
<p2 x="500" y="-180"/>
</wire>
<wire>
<p1 x="100" y="-180"/>
<p2 x="140" y="-180"/>
</wire>
<wire>
<p1 x="460" y="340"/>
<p2 x="560" y="340"/>
@ -364,6 +272,18 @@
<p1 x="-180" y="120"/>
<p2 x="-120" y="120"/>
</wire>
<wire>
<p1 x="-260" y="-380"/>
<p2 x="-20" y="-380"/>
</wire>
<wire>
<p1 x="340" y="-380"/>
<p2 x="700" y="-380"/>
</wire>
<wire>
<p1 x="-20" y="-380"/>
<p2 x="340" y="-380"/>
</wire>
<wire>
<p1 x="-100" y="-60"/>
<p2 x="220" y="-60"/>
@ -381,16 +301,88 @@
<p2 x="-20" y="380"/>
</wire>
<wire>
<p1 x="-220" y="-160"/>
<p2 x="340" y="-160"/>
<p1 x="420" y="-160"/>
<p2 x="460" y="-160"/>
</wire>
<wire>
<p1 x="60" y="-160"/>
<p2 x="100" y="-160"/>
</wire>
<wire>
<p1 x="-300" y="-160"/>
<p2 x="-260" y="-160"/>
</wire>
<wire>
<p1 x="700" y="-160"/>
<p2 x="780" y="-160"/>
</wire>
<wire>
<p1 x="460" y="-160"/>
<p2 x="500" y="-160"/>
</wire>
<wire>
<p1 x="100" y="-160"/>
<p2 x="140" y="-160"/>
</wire>
<wire>
<p1 x="180" y="-320"/>
<p2 x="220" y="-320"/>
</wire>
<wire>
<p1 x="-180" y="-320"/>
<p2 x="-140" y="-320"/>
</wire>
<wire>
<p1 x="500" y="-320"/>
<p2 x="540" y="-320"/>
</wire>
<wire>
<p1 x="540" y="-320"/>
<p2 x="580" y="-320"/>
</wire>
<wire>
<p1 x="-140" y="-320"/>
<p2 x="-100" y="-320"/>
</wire>
<wire>
<p1 x="260" y="-320"/>
<p2 x="300" y="-320"/>
</wire>
<wire>
<p1 x="-60" y="-320"/>
<p2 x="20" y="-320"/>
</wire>
<wire>
<p1 x="660" y="-320"/>
<p2 x="740" y="-320"/>
</wire>
<wire>
<p1 x="580" y="-320"/>
<p2 x="620" y="-320"/>
</wire>
<wire>
<p1 x="300" y="-320"/>
<p2 x="380" y="-320"/>
</wire>
<wire>
<p1 x="-100" y="-320"/>
<p2 x="-60" y="-320"/>
</wire>
<wire>
<p1 x="220" y="-320"/>
<p2 x="260" y="-320"/>
</wire>
<wire>
<p1 x="620" y="-320"/>
<p2 x="660" y="-320"/>
</wire>
<wire>
<p1 x="-260" y="100"/>
<p2 x="-260" y="340"/>
</wire>
<wire>
<p1 x="-260" y="-200"/>
<p2 x="-260" y="-180"/>
<p1 x="-260" y="-180"/>
<p2 x="-260" y="-160"/>
</wire>
<wire>
<p1 x="580" y="100"/>
@ -405,12 +397,12 @@
<p2 x="580" y="-20"/>
</wire>
<wire>
<p1 x="580" y="-200"/>
<p1 x="580" y="-180"/>
<p2 x="580" y="-80"/>
</wire>
<wire>
<p1 x="580" y="-340"/>
<p2 x="580" y="-320"/>
<p1 x="580" y="-320"/>
<p2 x="580" y="-300"/>
</wire>
<wire>
<p1 x="260" y="320"/>
@ -425,16 +417,12 @@
<p2 x="260" y="180"/>
</wire>
<wire>
<p1 x="260" y="-200"/>
<p1 x="260" y="-180"/>
<p2 x="260" y="-100"/>
</wire>
<wire>
<p1 x="260" y="-340"/>
<p2 x="260" y="-320"/>
</wire>
<wire>
<p1 x="-200" y="-340"/>
<p2 x="-200" y="-140"/>
<p1 x="260" y="-320"/>
<p2 x="260" y="-300"/>
</wire>
<wire>
<p1 x="200" y="140"/>
@ -457,36 +445,40 @@
<p2 x="-140" y="-20"/>
</wire>
<wire>
<p1 x="-140" y="-200"/>
<p1 x="-140" y="-180"/>
<p2 x="-140" y="-80"/>
</wire>
<wire>
<p1 x="-140" y="-340"/>
<p2 x="-140" y="-320"/>
<p1 x="-140" y="-320"/>
<p2 x="-140" y="-300"/>
</wire>
<wire>
<p1 x="460" y="100"/>
<p2 x="460" y="340"/>
<p1 x="780" y="-360"/>
<p2 x="780" y="-160"/>
</wire>
<wire>
<p1 x="460" y="-200"/>
<p2 x="460" y="-180"/>
<p1 x="140" y="-360"/>
<p2 x="140" y="-300"/>
</wire>
<wire>
<p1 x="140" y="100"/>
<p2 x="140" y="160"/>
</wire>
<wire>
<p1 x="140" y="-200"/>
<p2 x="140" y="-180"/>
<p1 x="140" y="-180"/>
<p2 x="140" y="-160"/>
</wire>
<wire>
<p1 x="140" y="-120"/>
<p2 x="140" y="-20"/>
</wire>
<wire>
<p1 x="140" y="-340"/>
<p2 x="140" y="-320"/>
<p1 x="460" y="100"/>
<p2 x="460" y="340"/>
</wire>
<wire>
<p1 x="460" y="-180"/>
<p2 x="460" y="-160"/>
</wire>
<wire>
<p1 x="-20" y="100"/>
@ -497,8 +489,8 @@
<p2 x="-20" y="-20"/>
</wire>
<wire>
<p1 x="-20" y="-400"/>
<p2 x="-20" y="-320"/>
<p1 x="-20" y="-380"/>
<p2 x="-20" y="-300"/>
</wire>
<wire>
<p1 x="340" y="100"/>
@ -509,15 +501,15 @@
<p2 x="340" y="-20"/>
</wire>
<wire>
<p1 x="340" y="-400"/>
<p2 x="340" y="-320"/>
<p1 x="340" y="-380"/>
<p2 x="340" y="-300"/>
</wire>
<wire>
<p1 x="340" y="-200"/>
<p2 x="340" y="-160"/>
<p1 x="340" y="-180"/>
<p2 x="340" y="-140"/>
</wire>
<wire>
<p1 x="660" y="-200"/>
<p1 x="660" y="-180"/>
<p2 x="660" y="-120"/>
</wire>
<wire>
@ -529,12 +521,12 @@
<p2 x="660" y="-20"/>
</wire>
<wire>
<p1 x="660" y="-340"/>
<p2 x="660" y="-320"/>
<p1 x="660" y="-320"/>
<p2 x="660" y="-300"/>
</wire>
<wire>
<p1 x="20" y="-340"/>
<p2 x="20" y="-320"/>
<p1 x="20" y="-320"/>
<p2 x="20" y="-300"/>
</wire>
<wire>
<p1 x="20" y="-100"/>
@ -548,6 +540,10 @@
<p1 x="600" y="320"/>
<p2 x="600" y="360"/>
</wire>
<wire>
<p1 x="-220" y="-360"/>
<p2 x="-220" y="-300"/>
</wire>
<wire>
<p1 x="-220" y="100"/>
<p2 x="-220" y="160"/>
@ -557,29 +553,25 @@
<p2 x="-220" y="-20"/>
</wire>
<wire>
<p1 x="-220" y="-340"/>
<p2 x="-220" y="-320"/>
</wire>
<wire>
<p1 x="-220" y="-200"/>
<p2 x="-220" y="-160"/>
<p1 x="-220" y="-180"/>
<p2 x="-220" y="-140"/>
</wire>
<wire>
<p1 x="540" y="100"/>
<p2 x="540" y="120"/>
</wire>
<wire>
<p1 x="540" y="-200"/>
<p1 x="540" y="-180"/>
<p2 x="540" y="-20"/>
</wire>
<wire>
<p1 x="540" y="-360"/>
<p2 x="540" y="-340"/>
</wire>
<wire>
<p1 x="540" y="-340"/>
<p2 x="540" y="-320"/>
</wire>
<wire>
<p1 x="540" y="-320"/>
<p2 x="540" y="-300"/>
</wire>
<wire>
<p1 x="220" y="100"/>
<p2 x="220" y="180"/>
@ -593,12 +585,12 @@
<p2 x="220" y="-20"/>
</wire>
<wire>
<p1 x="220" y="-200"/>
<p1 x="220" y="-180"/>
<p2 x="220" y="-80"/>
</wire>
<wire>
<p1 x="220" y="-340"/>
<p2 x="220" y="-320"/>
<p1 x="220" y="-320"/>
<p2 x="220" y="-300"/>
</wire>
<wire>
<p1 x="-160" y="140"/>
@ -608,10 +600,6 @@
<p1 x="-160" y="320"/>
<p2 x="-160" y="340"/>
</wire>
<wire>
<p1 x="160" y="-340"/>
<p2 x="160" y="-140"/>
</wire>
<wire>
<p1 x="-100" y="320"/>
<p2 x="-100" y="340"/>
@ -629,36 +617,36 @@
<p2 x="-100" y="-20"/>
</wire>
<wire>
<p1 x="-100" y="-200"/>
<p1 x="-100" y="-180"/>
<p2 x="-100" y="-100"/>
</wire>
<wire>
<p1 x="-100" y="-340"/>
<p2 x="-100" y="-320"/>
<p1 x="-100" y="-320"/>
<p2 x="-100" y="-300"/>
</wire>
<wire>
<p1 x="100" y="100"/>
<p2 x="100" y="340"/>
</wire>
<wire>
<p1 x="100" y="-200"/>
<p2 x="100" y="-180"/>
<p1 x="100" y="-180"/>
<p2 x="100" y="-160"/>
</wire>
<wire>
<p1 x="740" y="-100"/>
<p2 x="740" y="-20"/>
</wire>
<wire>
<p1 x="740" y="-340"/>
<p2 x="740" y="-320"/>
<p1 x="740" y="-320"/>
<p2 x="740" y="-300"/>
</wire>
<wire>
<p1 x="420" y="-200"/>
<p2 x="420" y="-180"/>
<p1 x="420" y="-180"/>
<p2 x="420" y="-160"/>
</wire>
<wire>
<p1 x="-300" y="-200"/>
<p2 x="-300" y="-180"/>
<p1 x="-300" y="-180"/>
<p2 x="-300" y="-160"/>
</wire>
<wire>
<p1 x="620" y="320"/>
@ -673,12 +661,12 @@
<p2 x="620" y="180"/>
</wire>
<wire>
<p1 x="620" y="-200"/>
<p1 x="620" y="-180"/>
<p2 x="620" y="-100"/>
</wire>
<wire>
<p1 x="620" y="-340"/>
<p2 x="620" y="-320"/>
<p1 x="620" y="-320"/>
<p2 x="620" y="-300"/>
</wire>
<wire>
<p1 x="300" y="100"/>
@ -689,12 +677,12 @@
<p2 x="300" y="-20"/>
</wire>
<wire>
<p1 x="300" y="-200"/>
<p1 x="300" y="-180"/>
<p2 x="300" y="-120"/>
</wire>
<wire>
<p1 x="300" y="-340"/>
<p2 x="300" y="-320"/>
<p1 x="300" y="-320"/>
<p2 x="300" y="-300"/>
</wire>
<wire>
<p1 x="560" y="140"/>
@ -717,16 +705,16 @@
<p2 x="-180" y="120"/>
</wire>
<wire>
<p1 x="-180" y="-360"/>
<p2 x="-180" y="-340"/>
<p1 x="-180" y="-340"/>
<p2 x="-180" y="-320"/>
</wire>
<wire>
<p1 x="-180" y="-200"/>
<p1 x="-180" y="-180"/>
<p2 x="-180" y="-20"/>
</wire>
<wire>
<p1 x="-180" y="-340"/>
<p2 x="-180" y="-320"/>
<p1 x="-180" y="-320"/>
<p2 x="-180" y="-300"/>
</wire>
<wire>
<p1 x="500" y="100"/>
@ -737,28 +725,28 @@
<p2 x="500" y="-20"/>
</wire>
<wire>
<p1 x="500" y="-340"/>
<p2 x="500" y="-320"/>
<p1 x="500" y="-320"/>
<p2 x="500" y="-300"/>
</wire>
<wire>
<p1 x="500" y="-200"/>
<p2 x="500" y="-180"/>
<p1 x="500" y="-180"/>
<p2 x="500" y="-160"/>
</wire>
<wire>
<p1 x="180" y="100"/>
<p2 x="180" y="120"/>
</wire>
<wire>
<p1 x="180" y="-360"/>
<p2 x="180" y="-340"/>
<p1 x="180" y="-340"/>
<p2 x="180" y="-320"/>
</wire>
<wire>
<p1 x="180" y="-200"/>
<p1 x="180" y="-180"/>
<p2 x="180" y="-20"/>
</wire>
<wire>
<p1 x="180" y="-340"/>
<p2 x="180" y="-320"/>
<p1 x="180" y="-320"/>
<p2 x="180" y="-300"/>
</wire>
<wire>
<p1 x="-120" y="120"/>
@ -777,12 +765,12 @@
<p2 x="-60" y="-20"/>
</wire>
<wire>
<p1 x="-60" y="-200"/>
<p1 x="-60" y="-180"/>
<p2 x="-60" y="-120"/>
</wire>
<wire>
<p1 x="-60" y="-340"/>
<p2 x="-60" y="-320"/>
<p1 x="-60" y="-320"/>
<p2 x="-60" y="-300"/>
</wire>
<wire>
<p1 x="700" y="100"/>
@ -793,24 +781,24 @@
<p2 x="700" y="-20"/>
</wire>
<wire>
<p1 x="700" y="-400"/>
<p2 x="700" y="-320"/>
<p1 x="700" y="-380"/>
<p2 x="700" y="-300"/>
</wire>
<wire>
<p1 x="700" y="-200"/>
<p2 x="700" y="-140"/>
<p1 x="700" y="-180"/>
<p2 x="700" y="-160"/>
</wire>
<wire>
<p1 x="380" y="-340"/>
<p2 x="380" y="-320"/>
<p1 x="380" y="-320"/>
<p2 x="380" y="-300"/>
</wire>
<wire>
<p1 x="380" y="-100"/>
<p2 x="380" y="-20"/>
</wire>
<wire>
<p1 x="60" y="-200"/>
<p2 x="60" y="-180"/>
<p1 x="60" y="-180"/>
<p2 x="60" y="-160"/>
</wire>
</wires>
</circuit>

File diff suppressed because it is too large Load Diff

View File

@ -28,7 +28,7 @@ public class TestExamples extends TestCase {
*/
public void testDistExamples() throws Exception {
File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig");
assertEquals(128, new FileScanner(this::check).scan(examples));
assertEquals(129, new FileScanner(this::check).scan(examples));
assertEquals(73, testCasesInFiles);
}