From 347e78fc98498258c9938fb7b0b73a3dd5af27d9 Mon Sep 17 00:00:00 2001
From: Walcher <rawalcher@edu.aau.at>
Date: Mon, 8 Jan 2024 22:36:41 +0100
Subject: [PATCH] fucking hell

---
 .idea/misc.xml                               |   5 +-
 .idea/workspace.xml                          | 124 ++++++++++-
 src/main/java/ab1/impl/GRUPPE/NFAImpl.java   | 216 ++++++++++++-------
 target/classes/ab1/impl/GRUPPE/NFAImpl.class | Bin 9876 -> 12458 bytes
 4 files changed, 258 insertions(+), 87 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9902dc5..e39f481 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,10 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK">
+  <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">
     <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 108035c..992f8f7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/theorethische-informatik-gruppe-10.iml" afterDir="false" />
+    <list default="true" id="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" name="Changes" comment="changed a bit">
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06__Changes_.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" afterPath="$PROJECT_DIR$/target/classes/ab1/impl/GRUPPE/NFAImpl.class" afterDir="false" />
+    </list>
+    <list id="39d4ccb3-eae9-4ed4-996a-5a13f44678fa" name="Changes by carol" comment="" />
+    <list id="2bf04d9d-9125-4ed6-9018-847e14e9822c" name="Changes by danie" comment="">
+      <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" />
     </list>
-    <list id="2bf04d9d-9125-4ed6-9018-847e14e9822c" name="Changes by danie" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -20,7 +22,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="main" />
+        <entry key="$PROJECT_DIR$" value="2-playing-around" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -38,9 +40,52 @@
   <component name="GitLabMergeRequestsSettings">{
   &quot;selectedUrlAndAccountId&quot;: {
     &quot;first&quot;: &quot;https://git-ainf.aau.at/rawalcher/theorethische-informatik-gruppe-10.git&quot;,
-    &quot;second&quot;: &quot;e0c4ebfe-e254-4a34-93d3-a6ee2cb18f94&quot;
+    &quot;second&quot;: &quot;2afc8825-f511-4d8a-8cc1-901875567c84&quot;
   }
 }</component>
+  <component name="LineStatusTrackerManager">
+    <file path="$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java">
+      <ranges>
+        <range start1="16" end1="17" start2="16" end2="16" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="37" end1="37" start2="36" end2="42" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="52" end1="52" start2="57" end2="61" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="64" end1="65" start2="73" end2="76" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="69" end1="70" start2="80" end2="81" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="87" end1="88" start2="98" end2="99" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="95" end1="95" start2="106" end2="112" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="96" end1="97" start2="113" end2="114" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="104" end1="106" start2="121" end2="122" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="107" end1="109" start2="123" end2="124" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="110" end1="110" start2="125" end2="126" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="111" end1="111" start2="127" end2="129" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="112" end1="112" start2="130" end2="139" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="113" end1="117" start2="140" end2="147" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="118" end1="127" start2="148" end2="158" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="128" end1="130" start2="159" end2="161" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="131" end1="131" start2="162" end2="163" changelist="2bf04d9d-9125-4ed6-9018-847e14e9822c" />
+        <range start1="132" end1="133" start2="164" end2="170" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="135" end1="136" start2="172" end2="179" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="137" end1="139" start2="180" end2="184" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="140" end1="142" start2="185" end2="190" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="260" end1="262" start2="308" end2="310" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="263" end1="264" start2="311" end2="312" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="265" end1="265" start2="313" end2="315" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="266" end1="268" start2="316" end2="317" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="269" end1="269" start2="318" end2="322" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="270" end1="271" start2="323" end2="331" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="272" end1="273" start2="332" end2="348" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="301" end1="301" start2="376" end2="378" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="303" end1="317" start2="380" end2="387" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="319" end1="326" start2="389" end2="390" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="328" end1="329" start2="392" end2="393" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="344" end1="345" start2="408" end2="409" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="374" end1="376" start2="438" end2="440" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="380" end1="382" start2="444" end2="444" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="424" end1="425" start2="486" end2="487" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="428" end1="431" start2="490" end2="493" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+      </ranges>
+    </file>
+  </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
@@ -57,7 +102,8 @@
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "2-playing-around",
+    "full.screen.before.presentation.mode": "false",
+    "git-widget-placeholder": "main",
     "ignore.virus.scanning.warn.message": "true",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -71,7 +117,48 @@
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
-  <component name="RunManager">
+  <component name="RunManager" selected="JUnit.ComplexTests.complement1Test">
+    <configuration name="ComplexTests.complement1Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="ETI_Abgabe" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="ab1.tests.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </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" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="ComplexTests.union1Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="ETI_Abgabe" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="ab1.tests.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </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="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="ab1 in ETI_Abgabe" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="ETI_Abgabe" />
+      <option name="TEST_OBJECT" value="directory" />
+      <dir value="$PROJECT_DIR$/src/test/java/ab1" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="ab1.tests in ETI_Abgabe" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="ETI_Abgabe" />
       <extension name="coverage">
@@ -99,6 +186,10 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.ComplexTests.complement1Test" />
+        <item itemvalue="JUnit.ab1 in ETI_Abgabe" />
+        <item itemvalue="JUnit.ComplexTests.union1Test" />
+        <item itemvalue="JUnit.ab1.tests in ETI_Abgabe" />
         <item itemvalue="JUnit.ab1.tests in ETI_Abgabe" />
       </list>
     </recent_temporary>
@@ -147,9 +238,24 @@
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/test/java/ab1/tests/ComplexTests.java</url>
           <line>171</line>
-          <option name="timeStamp" value="1" />
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/test/java/ab1/tests/ComplexTests.java</url>
+          <line>15</line>
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java</url>
+          <line>347</line>
+          <option name="timeStamp" value="21" />
         </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" />
+      </configuration>
+    </watches-manager>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/ab1/impl/GRUPPE/NFAImpl.java b/src/main/java/ab1/impl/GRUPPE/NFAImpl.java
index 8d526a7..85dfa95 100644
--- a/src/main/java/ab1/impl/GRUPPE/NFAImpl.java
+++ b/src/main/java/ab1/impl/GRUPPE/NFAImpl.java
@@ -14,7 +14,6 @@ public class NFAImpl implements NFA {
     private String initialState;
     private Set<String> acceptingStates;
 
-    @Getter
     private Set<Character> alphabet;
 
     private boolean isFinalized;
@@ -35,6 +34,12 @@ public class NFAImpl implements NFA {
         return this.states;
     }
 
+    public void safeAddStates(Set<String> states, Set<String> toCheck, NFAImpl nfa) {
+        for (String state : states) {
+            nfa.states.add(changeIfNecessary(state, toCheck));
+        }
+    }
+
     @Override
     public Collection<Transition> getTransitions() {
         return this.transitions;
@@ -50,6 +55,10 @@ public class NFAImpl implements NFA {
         return this.initialState;
     }
 
+    public Set<Character> getAlphabet() {
+        return this.alphabet;
+    }
+
     @Override
     public void addTransition(Transition transition) throws FinalizedStateException {
         if (this.isFinalized) {
@@ -62,12 +71,14 @@ public class NFAImpl implements NFA {
             this.states.add(transition.toState());
         }
         // add symbol to alphabet. If it is already in the alphabet, nothing happens
-        this.alphabet.add(transition.readSymbol());
+        if (transition.readSymbol() != null) {
+            this.alphabet.add(transition.readSymbol());
+        }
         this.transitions.add(transition);
     }
 
     public void addAllTransitions(Set<Transition> transitions) throws FinalizedStateException {
-        if(this.isFinalized){
+        if (this.isFinalized) {
             throw new FinalizedStateException();
         }
         for (Transition transition : transitions) {
@@ -85,7 +96,7 @@ public class NFAImpl implements NFA {
     }
 
     public void addAllAcceptingStates(Set<String> states) throws FinalizedStateException {
-        if(this.isFinalized){
+        if (this.isFinalized) {
             throw new FinalizedStateException();
         }
         for (String state : states) {
@@ -93,8 +104,14 @@ public class NFAImpl implements NFA {
         }
     }
 
+    public void safeAddAcceptingStates(Set<String> states, Set<String> toCheck, NFAImpl nfa) {
+        for (String state : states) {
+            nfa.addAcceptingState(changeIfNecessary(state, toCheck));
+        }
+    }
+
     // #TODO
-    // handle case where the state is duplicated
+    // write more testcases
     @Override
     public NFA union(NFA other) throws FinalizedStateException {
         if (!this.isFinalized || !other.isFinalized()) {
@@ -102,44 +119,74 @@ public class NFAImpl implements NFA {
         }
         // new initialState with epsilon to initialState of this and other.
         // Problem: what if states are called the same in this and other + what do we use as initialState?
-        Set<String> unionStates = new HashSet<>();
-        unionStates.addAll(this.states);
-
-        //do the union:
-        String start = changeIfNecessary(changeIfNecessary("START", unionStates), other.getStates());
-
-
-
-
-        for(String state : other.getStates()){
-            if(!unionStates.contains(state)){
-                unionStates.add(state);
-            }else{
-                // a state of other has the same name as one in this.
-                //change name of state and every Transitions it is a part of in other
-                String newstate = state;
-                while (unionStates.contains(newstate)){
-                    //change the state slightly and save the different version
-                    newstate = newstate+"|";
-                }
-                for(Transition transition : other.getTransitions()){
-                    if(transition.fromState().equals(state)){
-                        Transition changedTransition = new Transition(newstate, transition.readSymbol(), transition.toState());
-                    }
-                    if(transition.toState().equals(state)){
-                        Transition changedTransition = new Transition(transition.fromState(), transition.readSymbol(), newstate);
-                    }
-                }
-                unionStates.add(newstate);
-            }
-        }
-        NFAImpl unionNFA = new NFAImpl(this.initialState);
+        NFAImpl unionNFA = new NFAImpl(this.getInitialState());
 
         unionNFA.states.addAll(this.states);
-        unionNFA.states.addAll(other.getStates());
 
-        unionNFA.transitions.addAll(this.transitions);
-        unionNFA.transitions.addAll(other.getTransitions());
+        unionNFA.addAllAcceptingStates(this.acceptingStates);
+
+        Set<String> otherAcceptingStates = new HashSet<>(other.getAcceptingStates());
+        unionNFA.safeAddAcceptingStates(this.acceptingStates, otherAcceptingStates, unionNFA);
+
+
+        Set<Transition> newTransitions = new HashSet<>();
+        for (Transition transition : other.getTransitions()) {
+            Transition newTransition =
+                    new Transition(transition.fromState(), transition.readSymbol(), transition.toState());
+            newTransitions.add(newTransition);
+        }
+        String flag = "";
+        newTransitions.add(new Transition(flag, null, other.getInitialState()));
+
+        for (String state : other.getStates()) {
+            if (!unionNFA.states.contains(state)) {
+                unionNFA.states.add(state);
+                if (other.getAcceptingStates().contains(state)) {
+                    unionNFA.acceptingStates.add(state);
+                }
+            } else {
+                // a state of other has the same name as one in this.
+                // change name of state and every Transition it is a part of in other
+                String newState = changeIfNecessary(state, unionNFA.states);
+
+                // wieder a neues set
+                Set<Transition> tempTransitions = new HashSet<>();
+
+                // check each transition of other if start or to state was state
+                for (Transition transition : newTransitions) {
+                    if (transition.fromState().equals(state)) {
+                        transition = new Transition(newState, transition.readSymbol(), transition.toState());
+                    }
+                    if (transition.toState().equals(state)) {
+                        transition = new Transition(transition.fromState(), transition.readSymbol(), newState);
+                    }
+                }
+                for (String accState : other.getAcceptingStates()) {
+                    if (accState.equals(state)) {
+                        unionNFA.acceptingStates.add(newState);
+                    }
+                }
+                newTransitions = tempTransitions; // Replace the original set with the updated set
+            }
+        }
+        // add, alphabet
+
+        Iterator<Transition> iterator = newTransitions.iterator();
+        while (iterator.hasNext()){
+            Transition transition = iterator.next();
+            if(transition.fromState().isEmpty()){
+                iterator.remove();
+
+                newTransitions.add(new Transition(unionNFA.initialState, transition.readSymbol(), transition.toState()));
+                break;
+            }
+        }
+
+        unionNFA.addAllTransitions(newTransitions);
+
+        unionNFA.addAllTransitions(this.transitions);
+
+        unionNFA.finalizeAutomaton();
 
 
         return unionNFA;
@@ -258,19 +305,47 @@ public class NFAImpl implements NFA {
         // create a copy of this NFA
         NFAImpl nfa = new NFAImpl(this.initialState);
         nfa.states.addAll(this.states);
-        nfa.transitions.addAll(this.transitions);
-        nfa.acceptingStates.addAll(this.acceptingStates);
+        nfa.addAllTransitions(this.transitions);
+        nfa.addAllAcceptingStates(this.acceptingStates);
 
-        //nfa = nfa.convertNFAtoDFA(nfa);
+        NFAImpl fakeNFA = convertNFAtoDFA(nfa);
 
+        // state -> accepting
+        // accepting -> state
 
-        /*
-        for(String state : this.states){
+        Set<String> newAcceptingstate = new HashSet<>();
 
+        for (String state : fakeNFA.getStates()) {
+            if (!fakeNFA.getAcceptingStates().contains(state)) {
+                newAcceptingstate.add(state);
+            }
         }
-        */
+        fakeNFA.acceptingStates.clear();
+        fakeNFA.addAllAcceptingStates(newAcceptingstate);
 
-        return null;
+        Set<Character> originalAlphabet = new HashSet<>(fakeNFA.alphabet);
+
+        fakeNFA.alphabet.clear();
+
+        Set<Character> newAlphabet = new HashSet<>();
+
+        for (char ch = 'a'; ch <= 'z'; ch++) {
+            if (!originalAlphabet.contains(ch)) {
+                newAlphabet.add(ch);
+            }
+        }
+
+        for (Transition transition : fakeNFA.transitions) {
+            for (Character letter : newAlphabet) {
+                fakeNFA.addTransition(new Transition(transition.fromState(), letter, transition.toState()));
+            }
+        }
+
+        fakeNFA.alphabet = newAlphabet;
+
+        fakeNFA.finalizeAutomaton();
+
+        return fakeNFA;
     }
 
     @Override
@@ -299,34 +374,23 @@ public class NFAImpl implements NFA {
             throw new FinalizedStateException();
         }
 
+        char[] wordArray = word.toCharArray();
+
         Set<String> currentStates = new HashSet<>();
         currentStates.add(this.initialState);
-        currentStates = epsilonClosure(currentStates, this);
+        currentStates = (epsilonClosure(currentStates, this));
 
-
-        for (char letter : word.toCharArray()) {
-            Set<String> nextStates = new HashSet<>();
-
-
-            for (String state : currentStates) {
-                nextStates.addAll(getStateAfterTransition(currentStates, letter, this));
-            }
-
-            nextStates = epsilonClosure(nextStates, this);
-
-            currentStates = nextStates;
+        for (char letter : wordArray) {
+            // schritt a
+            currentStates = getStateAfterTransition(currentStates, letter, this);
+            // schritt b
+            currentStates = epsilonClosure(currentStates, this);
         }
 
-        for (String state : currentStates) {
-            if (this.acceptingStates.contains(state)) {
-                return true;
-            }
-        }
-
-        return false;
+        return isAcceptingState(currentStates, this);
     }
 
-    public NFA convertNFAtoDFA(NFAImpl input) {
+    public NFAImpl convertNFAtoDFA(NFAImpl input) {
 
         // all accepting states of the DFA
         Set<String> dfaAcceptingStates = new HashSet<>();
@@ -342,7 +406,7 @@ public class NFAImpl implements NFA {
         // getting the epsilon closure of the start state
         startState = epsilonClosure(startState, input);
         dfaStates.add(startState);
-        if (isAcceptingState(startState, input)){
+        if (isAcceptingState(startState, input)) {
             dfaAcceptingStates.add(getIndexOfSet(startState, dfaStates));
         }
 
@@ -372,15 +436,13 @@ public class NFAImpl implements NFA {
 
         NFAImpl newDFA = new NFAImpl("0");
 
-        for(int i=1;i<dfaStates.size();i++){
-            newDFA.states.add(""+i);
+        for (int i = 0; i < dfaStates.size(); i++) {
+            newDFA.states.add("" + i);
         }
 
         newDFA.addAllTransitions(dfaTransitions);
         newDFA.addAllAcceptingStates(dfaAcceptingStates);
 
-        newDFA.finalizeAutomaton();
-
         return newDFA;
     }
 
@@ -422,13 +484,13 @@ public class NFAImpl implements NFA {
         return false;
     }
 
-    private String getIndexOfSet(Set<String> set, List<Set<String>> dfaStates){
+    private String getIndexOfSet(Set<String> set, List<Set<String>> dfaStates) {
         return Integer.toString(dfaStates.indexOf(set));
     }
 
-    private String changeIfNecessary(String str, Set<String> toCheck){
-        while(toCheck.contains(str)){
-            str = str+"|";
+    private String changeIfNecessary(String str, Set<String> toCheck) {
+        while (toCheck.contains(str)) {
+            str = str + "1";
         }
         return str;
     }
diff --git a/target/classes/ab1/impl/GRUPPE/NFAImpl.class b/target/classes/ab1/impl/GRUPPE/NFAImpl.class
index a3c18e6eb7ade3a7530f97034f9e1f6d5fe6cab3..a9e53a8d12e16c3a494c908fbb17c89cd6f306a0 100644
GIT binary patch
literal 12458
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
PVqj!UVoYI7V~_*@8+H@#

literal 9876
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
UK~)X|0~Z4$qdB7`qcwvh05XftWB>pF