moved some examples

This commit is contained in:
hneemann 2017-06-27 19:35:23 +02:00
parent c9d3e6825e
commit 2ed83253fa
4 changed files with 360 additions and 4 deletions

View File

@ -0,0 +1,356 @@
<?xml version="1.0" encoding="utf-8"?>
<circuit>
<version>1</version>
<attributes>
<entry>
<string>Description</string>
<string>The two FETs in the transmission gate are not
necessary in this simulation because no body diodes
are simulated.
In order to be compatible with the literature, two FETs
are also used in the simulation.</string>
</entry>
</attributes>
<visualElements>
<visualElement>
<elementName>PFET</elementName>
<elementAttributes/>
<pos x="500" y="220"/>
</visualElement>
<visualElement>
<elementName>PFET</elementName>
<elementAttributes/>
<pos x="620" y="220"/>
</visualElement>
<visualElement>
<elementName>NFET</elementName>
<elementAttributes/>
<pos x="500" y="300"/>
</visualElement>
<visualElement>
<elementName>NFET</elementName>
<elementAttributes/>
<pos x="620" y="300"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>not Out</string>
</entry>
<entry>
<string>Label</string>
<string>~Q</string>
</entry>
</elementAttributes>
<pos x="700" y="140"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>Out</string>
</entry>
<entry>
<string>Label</string>
<string>Q</string>
</entry>
</elementAttributes>
<pos x="700" y="280"/>
</visualElement>
<visualElement>
<elementName>NFET</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
</entry>
</elementAttributes>
<pos x="400" y="320"/>
</visualElement>
<visualElement>
<elementName>PFET</elementName>
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="3"/>
</entry>
</elementAttributes>
<pos x="440" y="240"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>Data In</string>
</entry>
<entry>
<string>Label</string>
<string>D</string>
</entry>
</elementAttributes>
<pos x="300" y="280"/>
</visualElement>
<visualElement>
<elementName>NFET</elementName>
<elementAttributes/>
<pos x="340" y="200"/>
</visualElement>
<visualElement>
<elementName>PFET</elementName>
<elementAttributes/>
<pos x="340" y="120"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="360" y="100"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Description</string>
<string>Clock In</string>
</entry>
<entry>
<string>Label</string>
<string>C</string>
</entry>
</elementAttributes>
<pos x="300" y="180"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="360" y="260"/>
</visualElement>
<visualElement>
<elementName>Testcase</elementName>
<elementAttributes>
<entry>
<string>Testdata</string>
<testData>
<dataString>C D Q ~Q
1 0 0 1
0 0 0 1
0 1 0 1
0 0 0 1
1 1 1 0
0 1 1 0
0 0 1 0
1 0 0 1
0 0 0 1
</dataString>
</testData>
</entry>
</elementAttributes>
<pos x="700" y="360"/>
</visualElement>
<visualElement>
<elementName>VDD</elementName>
<elementAttributes/>
<pos x="520" y="200"/>
</visualElement>
<visualElement>
<elementName>Ground</elementName>
<elementAttributes/>
<pos x="520" y="360"/>
</visualElement>
<visualElement>
<elementName>PullUp</elementName>
<elementAttributes/>
<pos x="640" y="200"/>
</visualElement>
<visualElement>
<elementName>PullDown</elementName>
<elementAttributes/>
<pos x="640" y="360"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="320" y="240"/>
<p2 x="340" y="240"/>
</wire>
<wire>
<p1 x="480" y="420"/>
<p2 x="680" y="420"/>
</wire>
<wire>
<p1 x="360" y="180"/>
<p2 x="440" y="180"/>
</wire>
<wire>
<p1 x="300" y="180"/>
<p2 x="320" y="180"/>
</wire>
<wire>
<p1 x="600" y="340"/>
<p2 x="620" y="340"/>
</wire>
<wire>
<p1 x="480" y="340"/>
<p2 x="500" y="340"/>
</wire>
<wire>
<p1 x="320" y="120"/>
<p2 x="340" y="120"/>
</wire>
<wire>
<p1 x="640" y="280"/>
<p2 x="680" y="280"/>
</wire>
<wire>
<p1 x="440" y="280"/>
<p2 x="480" y="280"/>
</wire>
<wire>
<p1 x="520" y="280"/>
<p2 x="560" y="280"/>
</wire>
<wire>
<p1 x="300" y="280"/>
<p2 x="400" y="280"/>
</wire>
<wire>
<p1 x="560" y="280"/>
<p2 x="600" y="280"/>
</wire>
<wire>
<p1 x="680" y="280"/>
<p2 x="700" y="280"/>
</wire>
<wire>
<p1 x="320" y="360"/>
<p2 x="440" y="360"/>
</wire>
<wire>
<p1 x="560" y="140"/>
<p2 x="700" y="140"/>
</wire>
<wire>
<p1 x="600" y="220"/>
<p2 x="620" y="220"/>
</wire>
<wire>
<p1 x="480" y="220"/>
<p2 x="500" y="220"/>
</wire>
<wire>
<p1 x="400" y="260"/>
<p2 x="400" y="280"/>
</wire>
<wire>
<p1 x="400" y="280"/>
<p2 x="400" y="300"/>
</wire>
<wire>
<p1 x="320" y="120"/>
<p2 x="320" y="180"/>
</wire>
<wire>
<p1 x="320" y="240"/>
<p2 x="320" y="360"/>
</wire>
<wire>
<p1 x="320" y="180"/>
<p2 x="320" y="240"/>
</wire>
<wire>
<p1 x="640" y="260"/>
<p2 x="640" y="280"/>
</wire>
<wire>
<p1 x="640" y="200"/>
<p2 x="640" y="220"/>
</wire>
<wire>
<p1 x="640" y="340"/>
<p2 x="640" y="360"/>
</wire>
<wire>
<p1 x="640" y="280"/>
<p2 x="640" y="300"/>
</wire>
<wire>
<p1 x="480" y="220"/>
<p2 x="480" y="280"/>
</wire>
<wire>
<p1 x="480" y="340"/>
<p2 x="480" y="420"/>
</wire>
<wire>
<p1 x="480" y="280"/>
<p2 x="480" y="340"/>
</wire>
<wire>
<p1 x="560" y="140"/>
<p2 x="560" y="280"/>
</wire>
<wire>
<p1 x="680" y="280"/>
<p2 x="680" y="420"/>
</wire>
<wire>
<p1 x="600" y="220"/>
<p2 x="600" y="280"/>
</wire>
<wire>
<p1 x="600" y="280"/>
<p2 x="600" y="340"/>
</wire>
<wire>
<p1 x="440" y="320"/>
<p2 x="440" y="360"/>
</wire>
<wire>
<p1 x="440" y="180"/>
<p2 x="440" y="240"/>
</wire>
<wire>
<p1 x="440" y="260"/>
<p2 x="440" y="280"/>
</wire>
<wire>
<p1 x="440" y="280"/>
<p2 x="440" y="300"/>
</wire>
<wire>
<p1 x="360" y="160"/>
<p2 x="360" y="180"/>
</wire>
<wire>
<p1 x="360" y="100"/>
<p2 x="360" y="120"/>
</wire>
<wire>
<p1 x="360" y="240"/>
<p2 x="360" y="260"/>
</wire>
<wire>
<p1 x="360" y="180"/>
<p2 x="360" y="200"/>
</wire>
<wire>
<p1 x="520" y="260"/>
<p2 x="520" y="280"/>
</wire>
<wire>
<p1 x="520" y="200"/>
<p2 x="520" y="220"/>
</wire>
<wire>
<p1 x="520" y="340"/>
<p2 x="520" y="360"/>
</wire>
<wire>
<p1 x="520" y="280"/>
<p2 x="520" y="300"/>
</wire>
</wires>
</circuit>

View File

@ -28,8 +28,8 @@ public class TestExamples extends TestCase {
*/
public void testDistExamples() throws Exception {
File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig");
assertEquals(189, new FileScanner(this::check).scan(examples));
assertEquals(88, testCasesInFiles);
assertEquals(188, new FileScanner(this::check).scan(examples));
assertEquals(87, testCasesInFiles);
}
/**
@ -39,8 +39,8 @@ public class TestExamples extends TestCase {
*/
public void testTestExamples() throws Exception {
File examples = new File(Resources.getRoot(), "/dig/test");
assertEquals(78, new FileScanner(this::check).scan(examples));
assertEquals(72, testCasesInFiles);
assertEquals(80, new FileScanner(this::check).scan(examples));
assertEquals(74, testCasesInFiles);
}