From 8741bd9ea1a43228f33ba454adc0709ef8f9dbe0 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Thu, 23 Feb 2017 15:25:14 +0100
Subject: [PATCH] moved some examples to distribution

---
 distribution/Assembly.xml                     |  7 +++
 .../dig/test/fet => main/dig/cmos}/and.dig    | 58 ++++++++++--------
 .../test/fet => main/dig/cmos}/inverter.dig   | 60 ++++++++++---------
 .../fet => main/dig/cmos}/openDrainOut.dig    |  0
 .../fet => main/dig/cmos}/tristateout.dig     |  6 +-
 .../digital/integration/TestExamples.java     |  8 +--
 6 files changed, 80 insertions(+), 59 deletions(-)
 rename src/{test/resources/dig/test/fet => main/dig/cmos}/and.dig (90%)
 rename src/{test/resources/dig/test/fet => main/dig/cmos}/inverter.dig (66%)
 rename src/{test/resources/dig/test/fet => main/dig/cmos}/openDrainOut.dig (100%)
 rename src/{test/resources/dig/test/fet => main/dig/cmos}/tristateout.dig (100%)

diff --git a/distribution/Assembly.xml b/distribution/Assembly.xml
index 8d1815513..0b2f145a7 100644
--- a/distribution/Assembly.xml
+++ b/distribution/Assembly.xml
@@ -67,6 +67,13 @@
                 <include>*.dig</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/src/main/dig/cmos</directory>
+            <outputDirectory>/examples/cmos/</outputDirectory>
+            <includes>
+                <include>*.dig</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>${basedir}/src/main/dig/test</directory>
             <outputDirectory>/examples/test/</outputDirectory>
diff --git a/src/test/resources/dig/test/fet/and.dig b/src/main/dig/cmos/and.dig
similarity index 90%
rename from src/test/resources/dig/test/fet/and.dig
rename to src/main/dig/cmos/and.dig
index 9e2567d0d..c51aaf084 100644
--- a/src/test/resources/dig/test/fet/and.dig
+++ b/src/main/dig/cmos/and.dig
@@ -15,7 +15,7 @@
           <string>A</string>
         </entry>
       </elementAttributes>
-      <pos x="140" y="300"/>
+      <pos x="120" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -82,7 +82,7 @@
           <string>B</string>
         </entry>
       </elementAttributes>
-      <pos x="140" y="460"/>
+      <pos x="120" y="460"/>
     </visualElement>
     <visualElement>
       <elementName>NFET</elementName>
@@ -126,6 +126,14 @@
     </visualElement>
   </visualElements>
   <wires>
+    <wire>
+      <p1 x="140" y="440"/>
+      <p2 x="180" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="320"/>
+      <p2 x="180" y="440"/>
+    </wire>
     <wire>
       <p1 x="220" y="240"/>
       <p2 x="260" y="240"/>
@@ -135,15 +143,15 @@
       <p2 x="340" y="240"/>
     </wire>
     <wire>
-      <p1 x="160" y="320"/>
+      <p1 x="180" y="320"/>
       <p2 x="240" y="320"/>
     </wire>
     <wire>
-      <p1 x="160" y="500"/>
+      <p1 x="140" y="500"/>
       <p2 x="200" y="500"/>
     </wire>
     <wire>
-      <p1 x="180" y="260"/>
+      <p1 x="140" y="260"/>
       <p2 x="200" y="260"/>
     </wire>
     <wire>
@@ -155,8 +163,8 @@
       <p2 x="200" y="440"/>
     </wire>
     <wire>
-      <p1 x="140" y="460"/>
-      <p2 x="160" y="460"/>
+      <p1 x="120" y="460"/>
+      <p2 x="140" y="460"/>
     </wire>
     <wire>
       <p1 x="300" y="460"/>
@@ -167,8 +175,8 @@
       <p2 x="320" y="300"/>
     </wire>
     <wire>
-      <p1 x="140" y="300"/>
-      <p2 x="180" y="300"/>
+      <p1 x="120" y="300"/>
+      <p2 x="140" y="300"/>
     </wire>
     <wire>
       <p1 x="340" y="380"/>
@@ -182,14 +190,6 @@
       <p1 x="260" y="380"/>
       <p2 x="300" y="380"/>
     </wire>
-    <wire>
-      <p1 x="160" y="320"/>
-      <p2 x="160" y="460"/>
-    </wire>
-    <wire>
-      <p1 x="160" y="460"/>
-      <p2 x="160" y="500"/>
-    </wire>
     <wire>
       <p1 x="340" y="240"/>
       <p2 x="340" y="300"/>
@@ -206,14 +206,6 @@
       <p1 x="340" y="380"/>
       <p2 x="340" y="420"/>
     </wire>
-    <wire>
-      <p1 x="180" y="260"/>
-      <p2 x="180" y="300"/>
-    </wire>
-    <wire>
-      <p1 x="180" y="300"/>
-      <p2 x="180" y="440"/>
-    </wire>
     <wire>
       <p1 x="260" y="240"/>
       <p2 x="260" y="320"/>
@@ -222,6 +214,22 @@
       <p1 x="260" y="360"/>
       <p2 x="260" y="380"/>
     </wire>
+    <wire>
+      <p1 x="140" y="260"/>
+      <p2 x="140" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="440"/>
+      <p2 x="140" y="460"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="460"/>
+      <p2 x="140" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="300"/>
+      <p2 x="140" y="320"/>
+    </wire>
     <wire>
       <p1 x="220" y="220"/>
       <p2 x="220" y="240"/>
diff --git a/src/test/resources/dig/test/fet/inverter.dig b/src/main/dig/cmos/inverter.dig
similarity index 66%
rename from src/test/resources/dig/test/fet/inverter.dig
rename to src/main/dig/cmos/inverter.dig
index e8623229b..ea3a03360 100644
--- a/src/test/resources/dig/test/fet/inverter.dig
+++ b/src/main/dig/cmos/inverter.dig
@@ -5,7 +5,7 @@
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes/>
-      <pos x="220" y="320"/>
+      <pos x="220" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -14,12 +14,8 @@
           <string>Label</string>
           <string>A</string>
         </entry>
-        <entry>
-          <string>isHighZ</string>
-          <boolean>true</boolean>
-        </entry>
       </elementAttributes>
-      <pos x="160" y="400"/>
+      <pos x="140" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -29,22 +25,32 @@
           <string>Y</string>
         </entry>
       </elementAttributes>
-      <pos x="240" y="400"/>
+      <pos x="260" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>NFET</elementName>
-      <elementAttributes/>
-      <pos x="200" y="420"/>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>T2</string>
+        </entry>
+      </elementAttributes>
+      <pos x="200" y="440"/>
     </visualElement>
     <visualElement>
       <elementName>PFET</elementName>
-      <elementAttributes/>
-      <pos x="200" y="340"/>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>T1</string>
+        </entry>
+      </elementAttributes>
+      <pos x="200" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="220" y="480"/>
+      <pos x="220" y="500"/>
     </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
@@ -59,49 +65,49 @@ Z Z</dataString>
           </testData>
         </entry>
       </elementAttributes>
-      <pos x="280" y="300"/>
+      <pos x="300" y="460"/>
     </visualElement>
   </visualElements>
   <wires>
     <wire>
       <p1 x="220" y="400"/>
-      <p2 x="240" y="400"/>
+      <p2 x="260" y="400"/>
     </wire>
     <wire>
-      <p1 x="160" y="400"/>
+      <p1 x="140" y="400"/>
       <p2 x="180" y="400"/>
     </wire>
     <wire>
-      <p1 x="180" y="340"/>
-      <p2 x="200" y="340"/>
+      <p1 x="180" y="320"/>
+      <p2 x="200" y="320"/>
     </wire>
     <wire>
-      <p1 x="180" y="460"/>
-      <p2 x="200" y="460"/>
+      <p1 x="180" y="480"/>
+      <p2 x="200" y="480"/>
     </wire>
     <wire>
-      <p1 x="180" y="340"/>
+      <p1 x="180" y="320"/>
       <p2 x="180" y="400"/>
     </wire>
     <wire>
       <p1 x="180" y="400"/>
-      <p2 x="180" y="460"/>
+      <p2 x="180" y="480"/>
     </wire>
     <wire>
-      <p1 x="220" y="460"/>
-      <p2 x="220" y="480"/>
+      <p1 x="220" y="480"/>
+      <p2 x="220" y="500"/>
     </wire>
     <wire>
-      <p1 x="220" y="380"/>
+      <p1 x="220" y="360"/>
       <p2 x="220" y="400"/>
     </wire>
     <wire>
-      <p1 x="220" y="320"/>
-      <p2 x="220" y="340"/>
+      <p1 x="220" y="300"/>
+      <p2 x="220" y="320"/>
     </wire>
     <wire>
       <p1 x="220" y="400"/>
-      <p2 x="220" y="420"/>
+      <p2 x="220" y="440"/>
     </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/test/resources/dig/test/fet/openDrainOut.dig b/src/main/dig/cmos/openDrainOut.dig
similarity index 100%
rename from src/test/resources/dig/test/fet/openDrainOut.dig
rename to src/main/dig/cmos/openDrainOut.dig
diff --git a/src/test/resources/dig/test/fet/tristateout.dig b/src/main/dig/cmos/tristateout.dig
similarity index 100%
rename from src/test/resources/dig/test/fet/tristateout.dig
rename to src/main/dig/cmos/tristateout.dig
index a7d02d728..e297409cd 100644
--- a/src/test/resources/dig/test/fet/tristateout.dig
+++ b/src/main/dig/cmos/tristateout.dig
@@ -7,7 +7,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>T6</string>
+          <string>T4</string>
         </entry>
       </elementAttributes>
       <pos x="500" y="500"/>
@@ -17,7 +17,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>T5</string>
+          <string>T6</string>
         </entry>
       </elementAttributes>
       <pos x="500" y="440"/>
@@ -27,7 +27,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>T4</string>
+          <string>T5</string>
         </entry>
       </elementAttributes>
       <pos x="500" y="360"/>
diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java
index 0fc9690d9..1a4b0acc9 100644
--- a/src/test/java/de/neemann/digital/integration/TestExamples.java
+++ b/src/test/java/de/neemann/digital/integration/TestExamples.java
@@ -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(94, new FileScanner(this::check).scan(examples));
-        assertEquals(46, testCasesInFiles);
+        assertEquals(98, new FileScanner(this::check).scan(examples));
+        assertEquals(50, testCasesInFiles);
     }
 
     /**
@@ -39,8 +39,8 @@ public class TestExamples extends TestCase {
      */
     public void testTestExamples() throws Exception {
         File examples = new File(Resources.getRoot(), "/dig/test");
-        assertEquals(45, new FileScanner(this::check).scan(examples));
-        assertEquals(35, testCasesInFiles);
+        assertEquals(41, new FileScanner(this::check).scan(examples));
+        assertEquals(31, testCasesInFiles);
     }