From f0207de5112fae14360b8d1a44b0f19a2b21dcba Mon Sep 17 00:00:00 2001
From: Ghost_Element <danieldw@edu.aau.at>
Date: Tue, 9 Jan 2024 18:00:34 +0100
Subject: [PATCH] =?UTF-8?q?changed=20nfaAddTrap,=20bei=20dem=20Fall,=20das?=
 =?UTF-8?q?s=20Transition.readSymbol()=20einen=20nullwert=20zur=C3=BCckgib?=
 =?UTF-8?q?t.=20(Thx=20ChatGBT)=20->=20intersectionTests=20funktionieren?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/jarRepositories.xml                     |   5 ++
 .idea/misc.xml                                |   3 +-
 .idea/workspace.xml                           |  76 ++++++++++++------
 src/main/java/ab1/impl/GRUPPE/NFAImpl.java    |  24 +++---
 src/test/java/ab1/tests/myTests.java          |  63 +++++++++++++++
 .../ab1/Transition$TransitionBuilder.class    | Bin 1673 -> 1673 bytes
 target/classes/ab1/Transition.class           | Bin 1866 -> 1866 bytes
 .../ab1/tests/FinalizeTests.class             | Bin 4084 -> 4084 bytes
 8 files changed, 132 insertions(+), 39 deletions(-)
 create mode 100644 src/test/java/ab1/tests/myTests.java

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2161097..9aea7da 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="libs-release" />
       <option name="url" value="${env.ARTIFACTORY_URL}/maven" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="snapshots" />
       <option name="name" value="libs-snapshot" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e39f481..7c7a8a7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,11 +7,12 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="PWA">
     <option name="wasEnabledAtLeastOnce" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="openjdk-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aeffa15..0a24609 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" name="Changes" comment="concat GEHT">
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_18_35__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_18_35__Changes_.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/ab1/tests/myTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/ab1/impl/GRUPPE/NFAImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/ab1/Transition$TransitionBuilder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/ab1/Transition$TransitionBuilder.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/ab1/Transition.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/ab1/Transition.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/ab1/tests/FinalizeTests.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ab1/tests/FinalizeTests.class" afterDir="false" />
     </list>
     <list id="39d4ccb3-eae9-4ed4-996a-5a13f44678fa" name="Changes by carol" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -16,6 +20,13 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
@@ -53,6 +64,9 @@
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
+    "JUnit.ComplexTests.executor": "Run",
+    "JUnit.ComplexTests.intersection1Test.executor": "Run",
+    "JUnit.myTests.intersection1Test.executor": "Debug",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "WebServerToolWindowFactoryState": "false",
@@ -71,8 +85,8 @@
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.ab1 in ETI_Abgabe">
-    <configuration name="ComplexTests.complement1Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="JUnit.ComplexTests">
+    <configuration name="ComplexTests" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="ETI_Abgabe" />
       <extension name="coverage">
         <pattern>
@@ -82,14 +96,12 @@
       </extension>
       <option name="PACKAGE_NAME" value="ab1.tests" />
       <option name="MAIN_CLASS_NAME" value="ab1.tests.ComplexTests" />
-      <option name="METHOD_NAME" value="complement1Test" />
-      <option name="TEST_OBJECT" value="method" />
-      <dir value="$PROJECT_DIR$/src/test/java/ab1" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ComplexTests.plus1Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ComplexTests.intersection1Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="ETI_Abgabe" />
       <extension name="coverage">
         <pattern>
@@ -99,14 +111,13 @@
       </extension>
       <option name="PACKAGE_NAME" value="ab1.tests" />
       <option name="MAIN_CLASS_NAME" value="ab1.tests.ComplexTests" />
-      <option name="METHOD_NAME" value="plus1Test" />
+      <option name="METHOD_NAME" value="intersection1Test" />
       <option name="TEST_OBJECT" value="method" />
-      <dir value="$PROJECT_DIR$/src/test/java/ab1" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ComplexTests.union1Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ComplexTests.intersection2Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="ETI_Abgabe" />
       <extension name="coverage">
         <pattern>
@@ -116,7 +127,7 @@
       </extension>
       <option name="PACKAGE_NAME" value="ab1.tests" />
       <option name="MAIN_CLASS_NAME" value="ab1.tests.ComplexTests" />
-      <option name="METHOD_NAME" value="union1Test" />
+      <option name="METHOD_NAME" value="intersection2Test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -130,7 +141,7 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ab1.tests in ETI_Abgabe" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="myTests.intersection1Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="ETI_Abgabe" />
       <extension name="coverage">
         <pattern>
@@ -139,7 +150,9 @@
         </pattern>
       </extension>
       <option name="PACKAGE_NAME" value="ab1.tests" />
-      <option name="TEST_OBJECT" value="package" />
+      <option name="MAIN_CLASS_NAME" value="ab1.tests.myTests" />
+      <option name="METHOD_NAME" value="intersection1Test" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -157,11 +170,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.ComplexTests" />
+        <item itemvalue="JUnit.ComplexTests.intersection2Test" />
+        <item itemvalue="JUnit.ComplexTests.intersection1Test" />
+        <item itemvalue="JUnit.myTests.intersection1Test" />
         <item itemvalue="JUnit.ab1 in ETI_Abgabe" />
-        <item itemvalue="JUnit.ComplexTests.plus1Test" />
-        <item itemvalue="JUnit.ComplexTests.complement1Test" />
-        <item itemvalue="JUnit.ComplexTests.union1Test" />
-        <item itemvalue="JUnit.ab1.tests in ETI_Abgabe" />
       </list>
     </recent_temporary>
   </component>
@@ -269,20 +282,33 @@
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint enabled="true" type="java-method">
+        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java</url>
-          <line>336</line>
-          <properties class="ab1.impl.GRUPPE.NFAImpl" method="complement">
-            <option name="EMULATED" value="true" />
-            <option name="WATCH_EXIT" value="false" />
-          </properties>
-          <option name="timeStamp" value="13" />
+          <line>211</line>
+          <option name="timeStamp" value="43" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java</url>
+          <line>343</line>
+          <option name="timeStamp" value="44" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java</url>
+          <line>355</line>
+          <option name="timeStamp" value="53" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java</url>
+          <line>523</line>
+          <option name="timeStamp" value="55" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
       <configuration name="JUnit">
         <watch expression="((HashSet)((NFAImpl)testInstance).acceptingStates).toArray()[2]" custom="java.util.HashSet,ab1.impl.GRUPPE.NFAImpl" />
+        <watch expression="transition.readSymbol()" />
+        <watch expression="transition.readSymbol()==letter" />
       </configuration>
     </watches-manager>
   </component>
diff --git a/src/main/java/ab1/impl/GRUPPE/NFAImpl.java b/src/main/java/ab1/impl/GRUPPE/NFAImpl.java
index 28b0e8a..0f1e34f 100644
--- a/src/main/java/ab1/impl/GRUPPE/NFAImpl.java
+++ b/src/main/java/ab1/impl/GRUPPE/NFAImpl.java
@@ -206,15 +206,11 @@ public class NFAImpl implements NFA {
         if (!this.isFinalized || !other.isFinalized()) {
             throw new FinalizedStateException();
         }
-        NFAImpl intersectionNFA = new NFAImpl(this.initialState);
-
-        intersectionNFA.states.addAll(this.states);
-        intersectionNFA.states.retainAll(other.getStates());
-
-        intersectionNFA.transitions.addAll(this.transitions);
-        intersectionNFA.transitions.retainAll(other.getTransitions());
-
-        return intersectionNFA;
+        NFA newNFA_A = this.complement();
+        NFA newNFA_B = other.complement();
+        NFA unionNFA = newNFA_A.union(newNFA_B);
+        NFA result = unionNFA.complement();
+        return result;
     }
 
     @Override
@@ -345,7 +341,7 @@ public class NFAImpl implements NFA {
         nfa.addAllTransitions(this.transitions);
         nfa.addAllAcceptingStates(this.acceptingStates);
 
-        nfaAddTrap(nfa);
+        nfaAddTrap(nfa); //error on last occasion
 
         NFAImpl fakeNFA = convertNFAtoDFA(nfa);
 
@@ -524,9 +520,11 @@ public class NFAImpl implements NFA {
             for(char letter : completeAlphabet){
                 boolean hasTransition = false;
                 for(Transition transition : input.getTransitions()){
-                    if(transition.fromState().equals(state)&&transition.readSymbol().equals(letter)){
-                        hasTransition = true;
-                        break;
+                    if(transition.fromState().equals(state)/*&&transition.readSymbol().equals(letter)*/){
+                        if(transition.readSymbol()!= null&&transition.readSymbol()==letter) {
+                            hasTransition = true;
+                            break;
+                        }
                     }
                 }
                 if(!hasTransition){
diff --git a/src/test/java/ab1/tests/myTests.java b/src/test/java/ab1/tests/myTests.java
new file mode 100644
index 0000000..3187091
--- /dev/null
+++ b/src/test/java/ab1/tests/myTests.java
@@ -0,0 +1,63 @@
+package ab1.tests;
+
+import ab1.NFA;
+import ab1.NFAFactory;
+import ab1.NFAProvider;
+import ab1.Transition;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class myTests {
+    private final NFAFactory factory = NFAProvider.provideFactory();
+
+    @Test
+    public void intersection1Test() {
+        var nfaA = buildCharLanguage('a');
+        var nfaB = buildCharLanguage('b');
+
+        var testInstance = nfaA.intersection(nfaB);
+
+        assertFalse(testInstance.acceptsWord("a"));
+        assertFalse(testInstance.acceptsWord("b"));
+        assertFalse(testInstance.acceptsWord("ab"));
+        assertFalse(testInstance.acceptsWord("ba"));
+    }
+
+
+
+
+
+
+    private NFA buildCharStarLanguage(char c) {
+        var instance = factory.buildNFA("START");
+        instance.addTransition(
+                Transition.builder()
+                        .fromState("START")
+                        .readSymbol(c)
+                        .toState("START")
+                        .build()
+        );
+        instance.addAcceptingState("START");
+        instance.finalizeAutomaton();
+
+        return instance;
+    }
+
+    private NFA buildCharLanguage(char c) {
+        var instance = factory.buildNFA("START");
+        instance.addTransition(
+                Transition.builder()
+                        .fromState("START")
+                        .readSymbol(c)
+                        .toState("ACCEPT")
+                        .build()
+        );
+        instance.addAcceptingState("ACCEPT");
+        instance.finalizeAutomaton();
+
+        assertTrue(instance.acceptsWord(String.valueOf(c)));
+
+        return instance;
+    }
+}
diff --git a/target/classes/ab1/Transition$TransitionBuilder.class b/target/classes/ab1/Transition$TransitionBuilder.class
index 6a10a5ff3040c811bb292274985c03fb7f9716f0..8deddb3decf6a3274ce4269395490e708c3cf086 100644
GIT binary patch
delta 52
zcmeC=?d09?l1Y%CjX{@-L61S7oxy;IL7KsEvJ>+mW)249$#0lkH?y#0FtO?|FftfT
IE@YDc02%lSS^xk5

delta 52
zcmeC=?d09?l8KpvL3i?gW>-OeHU@nz1_K5|b_OFJ25AQ4$-kHmZDwJ~U}Du{U}Vsl
IT*xK?05v`e<p2Nx

diff --git a/target/classes/ab1/Transition.class b/target/classes/ab1/Transition.class
index d83e6b5b1aa9a06868130b38faa7fe7b217ccb77..55ad5d1eb3dbb31ef6b6d971c9c3789a565b3046 100644
GIT binary patch
delta 79
zcmX@bcZzQV3$q|U8-oQGgC&C%JA*Y3gAIf2WM}3_%p45%li8WI7pt-`tC};gGH@{1
jF*q<dGB`0fGcYg+F)%TRFmN!qFmN)sGPpB%GDrdd2r3G`

delta 79
zcmX@bcZzQV3o|nZgT>@u%-VwdYz($s40a6m><kV(42}#=lSP>yEmmb=R<&VZW#C{i
jXRu_jVz6d#W?*0tVqjtrVc=kJVc=wNWpHQkWRL^^K35Ba

diff --git a/target/test-classes/ab1/tests/FinalizeTests.class b/target/test-classes/ab1/tests/FinalizeTests.class
index 1057bafae7db69c722b61096264d77c4a9790161..17e959cf098b9a1cb8c27f4e7235f4d31a592bea 100644
GIT binary patch
delta 267
zcmew&|3!X-3%ejc8$%x#LqEd=c7};O43iipZ~n;6#8@xDz{bzUFpZ0Wk6}6wLnlKs
zKPSUXZUz~KSv(B08RjrDaAoJDrskyvmn0T3GH`2X`XnY9>ifAlTJv)<%mXQ$&%>|)
zq>!f|r?l9=Ahjs5B)^ECjbRbU%*8wm9SqI<Yz#|5yk$HL?O+>LfHbb;VOS*#(#e&a
zpIeZVnwy$e!q3LA2BdN=4?`0}^XAVSOW0g{8JHQSFid5b!T@2-fV1YpSqtH;C2-bq
NIBPY-l*xDaB>*vlK#%|c

delta 254
zcmew&|3!X-3%k4k0~<dZLq8V-AHxJ5hE9fNeolr-+zc`dlX)1XFif3X#vxZf9mJo(
z!!VO!DkB3=K~8D0e?e+dVo81xKO4hrkk&ao3>^&3{A>*KK)m@p4DDcp7J@V`;$c_}
z(#VyZpIeZVnwy$e!q3LA6r^w&4?`1J+X^m*l?<!c8CLT!tYKKo$e@&!SeB@tlbDyT
zpP4r~h5hs9&m2qGT$eL2GxRd_G4wJ(SQFu_X>isoIBPDPwE)gq!q7YU4!;BdipD>+