From 8a6ea12b683b8a5bb559abf69a42a73989c6a121 Mon Sep 17 00:00:00 2001
From: Tocuro <rawalcher@edu.aau.at>
Date: Mon, 8 Jan 2024 15:13:00 +0100
Subject: [PATCH] hope this works...

---
 .idea/compiler.xml                            |   1 +
 .idea/jarRepositories.xml                     |   9 +-
 .idea/misc.xml                                |   4 +-
 .../shelved.patch                             |  22 +++
 ...e_Update_at_08_01_2024_12_06__Changes_.xml |   4 +
 .idea/workspace.xml                           | 165 ++++++++++++++++++
 src/main/java/ab1/impl/GRUPPE/NFAImpl.java    | 134 +++++++-------
 target/classes/ab1/impl/GRUPPE/NFAImpl.class  | Bin 7654 -> 9389 bytes
 8 files changed, 262 insertions(+), 77 deletions(-)
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06_[Changes]/shelved.patch
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06__Changes_.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 273d387..7efc65a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 712ab9d..2161097 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -3,8 +3,13 @@
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
       <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
+      <option name="name" value="libs-release" />
+      <option name="url" value="${env.ARTIFACTORY_URL}/maven" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="snapshots" />
+      <option name="name" value="libs-snapshot" />
+      <option name="url" value="${env.ARTIFACTORY_URL}/maven" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2738f8e..ecfa09c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK" />
+  <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/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06_[Changes]/shelved.patch
new file mode 100644
index 0000000..9fc6e24
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06_[Changes]/shelved.patch
@@ -0,0 +1,22 @@
+Index: .idea/jarRepositories.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n  <component name=\"RemoteRepositoriesConfiguration\">\r\n    <remote-repository>\r\n      <option name=\"id\" value=\"central\" />\r\n      <option name=\"name\" value=\"libs-release\" />\r\n      <option name=\"url\" value=\"${env.ARTIFACTORY_URL}/maven\" />\r\n    </remote-repository>\r\n    <remote-repository>\r\n      <option name=\"id\" value=\"snapshots\" />\r\n      <option name=\"name\" value=\"libs-snapshot\" />\r\n      <option name=\"url\" value=\"${env.ARTIFACTORY_URL}/maven\" />\r\n    </remote-repository>\r\n    <remote-repository>\r\n      <option name=\"id\" value=\"central\" />\r\n      <option name=\"name\" value=\"Maven Central repository\" />\r\n      <option name=\"url\" value=\"https://repo1.maven.org/maven2\" />\r\n    </remote-repository>\r\n    <remote-repository>\r\n      <option name=\"id\" value=\"jboss.community\" />\r\n      <option name=\"name\" value=\"JBoss Community repository\" />\r\n      <option name=\"url\" value=\"https://repository.jboss.org/nexus/content/repositories/public/\" />\r\n    </remote-repository>\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
+--- a/.idea/jarRepositories.xml	(revision b2f6932eae27588a4b5ad8e1bb1f83f2a533182a)
++++ b/.idea/jarRepositories.xml	(date 1704711982177)
+@@ -7,6 +7,11 @@
+       <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" />
+       <option name="url" value="${env.ARTIFACTORY_URL}/maven" />
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06__Changes_.xml
new file mode 100644
index 0000000..4892713
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06__Changes_.xml
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_08_01_2024_12_06_[Changes]" date="1704712018273" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_08_01_2024_12_06_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 08/01/2024 12:06 [Changes]" />
+</changelist>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..4fde15a
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" 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$/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="">
+      <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>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="main" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GitLabMergeRequestFiltersHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPENED&quot;,
+    &quot;assignee&quot;: {
+      &quot;type&quot;: &quot;org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue&quot;,
+      &quot;username&quot;: &quot;rawalcher&quot;,
+      &quot;fullname&quot;: &quot;rawalcher&quot;
+    }
+  }
+}</component>
+  <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;
+  }
+}</component>
+  <component name="LineStatusTrackerManager">
+    <file path="$PROJECT_DIR$/src/main/java/ab1/impl/GRUPPE/NFAImpl.java">
+      <ranges>
+        <range start1="9" end1="9" start2="9" end2="10" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="37" end1="37" start2="38" end2="39" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="56" end1="61" start2="58" end2="68" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="62" end1="62" start2="69" end2="78" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="67" end1="71" start2="83" end2="86" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="72" end1="72" start2="87" end2="96" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="76" end1="77" start2="100" end2="101" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="94" end1="95" start2="118" end2="119" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="111" end1="112" start2="135" end2="136" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="122" end1="123" start2="146" end2="147" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="187" end1="188" start2="211" end2="212" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="230" end1="231" start2="254" end2="255" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="242" end1="242" start2="266" end2="267" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="254" end1="273" start2="279" end2="282" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="278" end1="279" start2="287" end2="288" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="287" end1="288" start2="296" end2="300" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="290" end1="291" start2="302" end2="303" changelist="2bf04d9d-9125-4ed6-9018-847e14e9822c" />
+        <range start1="292" end1="293" start2="304" end2="305" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="297" end1="310" start2="309" end2="313" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="312" end1="313" start2="315" end2="317" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="314" end1="317" start2="318" end2="321" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="377" end1="388" start2="381" end2="388" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+        <range start1="389" end1="389" start2="389" end2="393" changelist="2bf04d9d-9125-4ed6-9018-847e14e9822c" />
+        <range start1="390" end1="404" start2="394" end2="394" changelist="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" />
+      </ranges>
+    </file>
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 2
+}</component>
+  <component name="ProjectId" id="2afDcX9p9UZiDe6ife9RGZcJjKQ" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="RunManager">
+    <configuration name="ab1.tests in ETI_Abgabe" 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="TEST_OBJECT" value="package" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="JetRunConfigurationType">
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
+      <option name="filePath" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="JUnit.ab1.tests in ETI_Abgabe" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="f5e08808-a5af-4c89-a1ee-21b3bcb9ae3e" name="Changes" comment="" />
+      <created>1704700820495</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1704700820495</updated>
+      <workItem from="1704700821945" duration="5461000" />
+      <workItem from="1704712375384" duration="4940000" />
+      <workItem from="1704717343016" duration="2934000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <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" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-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 698c513..3d79de2 100644
--- a/src/main/java/ab1/impl/GRUPPE/NFAImpl.java
+++ b/src/main/java/ab1/impl/GRUPPE/NFAImpl.java
@@ -7,6 +7,7 @@ import ab1.Transition;
 import lombok.Getter;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class NFAImpl implements NFA {
     private Set<String> states;
@@ -35,6 +36,7 @@ public class NFAImpl implements NFA {
     public Set<String> getStates() {
         return this.states;
     }
+
     @Override
     public Collection<Transition> getTransitions() {
         return this.transitions;
@@ -54,10 +56,24 @@ public class NFAImpl implements NFA {
     public void addTransition(Transition transition) throws FinalizedStateException {
         if (this.isFinalized) {
             throw new FinalizedStateException();
-        } else if (!this.transitions.contains(transition)) {
-            // add symbol to alphabet. If it is already in the alphabet, nothing happens
-            this.alphabet.add(transition.readSymbol());
-            this.transitions.add(transition);
+        }
+        if (!states.contains(transition.fromState())) {
+            this.states.add(transition.fromState());
+        }
+        if (!states.contains(transition.toState())) {
+            this.states.add(transition.toState());
+        }
+        // add symbol to alphabet. If it is already in the alphabet, nothing happens
+        this.alphabet.add(transition.readSymbol());
+        this.transitions.add(transition);
+    }
+
+    public void addAllTransition(Set<Transition> transitions) throws FinalizedStateException {
+        if(this.isFinalized){
+            throw new FinalizedStateException();
+        }
+        for (Transition transition : transitions) {
+            this.addTransition(transition);
         }
     }
 
@@ -65,16 +81,24 @@ public class NFAImpl implements NFA {
     public void addAcceptingState(String state) throws FinalizedStateException {
         if (this.isFinalized) {
             throw new FinalizedStateException();
-        } else if (!this.states.contains(state)) {
-            this.states.add(state);
-            this.acceptingStates.add(state);
+        }
+        this.states.add(state);
+        this.acceptingStates.add(state);
+    }
+
+    public void addAllAcceptingStates(Set<String> states) throws FinalizedStateException {
+        if(this.isFinalized){
+            throw new FinalizedStateException();
+        }
+        for (String state : states) {
+            this.addAcceptingState(state);
         }
     }
 
     // #TODO
     @Override
     public NFA union(NFA other) throws FinalizedStateException {
-        if(!this.isFinalized || !other.isFinalized()){
+        if (!this.isFinalized || !other.isFinalized()) {
             throw new FinalizedStateException();
         }
         NFAImpl unionNFA = new NFAImpl(this.initialState);
@@ -92,7 +116,7 @@ public class NFAImpl implements NFA {
     // #TODO
     @Override
     public NFA intersection(NFA other) throws FinalizedStateException {
-        if(!this.isFinalized || !other.isFinalized()){
+        if (!this.isFinalized || !other.isFinalized()) {
             throw new FinalizedStateException();
         }
         NFAImpl intersectionNFA = new NFAImpl(this.initialState);
@@ -109,7 +133,7 @@ public class NFAImpl implements NFA {
     // #TODO
     @Override
     public NFA concatenation(NFA other) throws FinalizedStateException {
-        if(!this.isFinalized || !other.isFinalized()){
+        if (!this.isFinalized || !other.isFinalized()) {
             throw new FinalizedStateException();
         }
         NFAImpl concatenationNFA = new NFAImpl(this.initialState);
@@ -120,7 +144,7 @@ public class NFAImpl implements NFA {
         concatenationNFA.transitions.addAll(this.transitions);
         concatenationNFA.transitions.addAll(other.getTransitions());
 
-        for(String accceptingState : this.acceptingStates){
+        for (String accceptingState : this.acceptingStates) {
             Transition epsilon = new Transition(accceptingState, null, other.getInitialState());
             concatenationNFA.transitions.add(epsilon);
         }
@@ -185,7 +209,7 @@ public class NFAImpl implements NFA {
     // #TODO
     @Override
     public NFA complement() throws FinalizedStateException {
-        if(!this.isFinalized){
+        if (!this.isFinalized) {
             throw new FinalizedStateException();
         }
 
@@ -228,7 +252,7 @@ public class NFAImpl implements NFA {
         return false;
     }
 
-    public NFA convertNFAtoDFA (NFAImpl input){
+    public NFA convertNFAtoDFA(NFAImpl input) {
 
         /*
         What do we need to do?
@@ -240,6 +264,7 @@ public class NFAImpl implements NFA {
 
          */
 
+        Set<String> dfaAcceptingStates = new HashSet<>();
         // all states of the DFA
         List<Set<String>> dfaStates = new ArrayList<>();
         // all transitions of the DFA
@@ -252,31 +277,15 @@ public class NFAImpl implements NFA {
         // getting the epsilon closure of the start state
         startState = epsilonClosure(startState, input);
         dfaStates.add(startState);
-
-        // find all letters in transitions
-        // obsolete, added alphabet to NFA which stores all read symbols
-        /*
-        Set<Character> possibleLetters = new HashSet<>();
-        Set<Transition> possibleTransitions = new HashSet<>();
-        for(Transition transition : input.transitions){
-            for(String state : states) {
-                if (state.equals(transition.fromState())){
-
-                    if(transition.readSymbol() != null){
-                        possibleLetters.add(transition.readSymbol());
-                        possibleTransitions.add(transition);
-                    }
-                    break;
-                }
-            }
+        if (isAcceptingState(startState, input)){
+            dfaAcceptingStates.add(getIndexOfSet(startState, dfaStates));
         }
-         */
 
         // do the above with each DFA state
         Queue<Set<String>> queue = new LinkedList<>();
         queue.add(startState);
         // iterate each Letter
-        while (!queue.isEmpty()){
+        while (!queue.isEmpty()) {
             Set<String> currentState = queue.poll();
             // for each possible Letter
             for (char letter : input.getAlphabet()) {
@@ -285,36 +294,31 @@ public class NFAImpl implements NFA {
                 if (!dfaStates.contains(newState)) {
                     queue.add(newState);
                     dfaStates.add(newState);
-                    // build new Transition
+                    if (isAcceptingState(newState, input)) {
+                        dfaAcceptingStates.add(getIndexOfSet(newState, dfaStates));
+                    }
+
                 }
                 // build new Transition
                 dfaTransitions.add(new Transition(Integer.toString(dfaStates.indexOf(currentState)), letter, Integer.toString(dfaStates.indexOf(newState))));
 
-                // we gotta change this to only a string is given
+                // we got to change this to only a string is given
                 //dfaTransitions.add(new Transition(currentState, letter, newState));
             }
         }
 
-/*
-        for(Character letter : possibleLetters){
-            Set<String> newState = new HashSet<>();
-            for(Transition trans  : possibleTransitions){
-                if(trans.readSymbol().equals(letter)){
-                    // is every transition fromState = state from states? Hoffentlich ja :')
-                    newState.add(trans.toState());
-                }
-            }
-            //deal with newState + new Transitions
-            if(DFA_states.contains(newState)){
-                Transition newtrans = new Transition(DFA_states.get(index), letter, DFA_states.get(DFA_states.indexOf(newState)));
-            }
+        NFAImpl newDFA = new NFAImpl("0");
+
+        for(int i=1;i<dfaStates.size();i++){
+            newDFA.states.add(""+i);
         }
 
- */
+        newDFA.addAllTransition(dfaTransitions);
+        newDFA.addAllAcceptingStates(dfaAcceptingStates);
 
-        // what we gonna do now?
-        return null;
-        // return new DFA(dfaStates, dfaTransitions, startState, determineAcceptingStates(dfaStates, input));
+        newDFA.finalizeAutomaton();
+
+        return newDFA;
     }
 
     private Set<String> epsilonClosure(Set<String> states, NFA nfa) {
@@ -375,31 +379,13 @@ public class NFAImpl implements NFA {
         return result;
     }
 
-    private Set<Set<String>> determineAcceptingStates(Set<Set<String>> dfaStates, NFA nfa) {
-        Set<Set<String>> acceptingStates = new HashSet<>();
-        for (Set<String> dfaState : dfaStates) {
-            for (String nfaState : dfaState) {
-                if (nfa.getAcceptingStates().contains(nfaState)) {
-                    acceptingStates.add(dfaState);
-                    break;
-                }
+    private boolean isAcceptingState(Set<String> states, NFA input) {
+        for (String accState : input.getAcceptingStates()) {
+            if (states.contains(accState)) {
+                return true;
             }
         }
-        return acceptingStates;
+        return false;
     }
 
-    public void test(){
-         final NFAFactory factory = new NFAFactoryImpl();
-            var instance = factory.buildNFA("START");
-            instance.addTransition(
-                    Transition.builder()
-                            .fromState("START")
-                            .readSymbol('a')
-                            .toState("ACCEPT")
-                            .build()
-            );
-            instance.addAcceptingState("ACCEPT");
-            instance.finalizeAutomaton();
-
-        }
 }
diff --git a/target/classes/ab1/impl/GRUPPE/NFAImpl.class b/target/classes/ab1/impl/GRUPPE/NFAImpl.class
index 407ea7a8f92ece1feef3d084d77439c9c00181c8..1ec6e11d7f9e934fae45648e64ba5582ff5757fd 100644
GIT binary patch
literal 9389
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

literal 7654
zcmX^0Z`VEs1_oP(S6mEC49x5dEIbUX3~Y=H0$GV=iTXK-dFlH8Nm;4MC5#MgHko;u
zC3cJq%o>_uoD3Wcoa_u-JPh0nJd6zDiAjd~nYjfy`tCuY0RgW1er}GQxdl0l3_KuB
znTa{UC5a`ej0{3P2!n%5iZb)kt=Sp)7#Re?!lfmdIr<)n#Tmh=C0q==49p;F1bG;Q
z7=#%a*or|$6f-jLL(Bjx4o)qx=4KFO5MyT$=V6dwkYr@wMHm&FTEfV{oS2fr$RMf#
z(S_tCYt1N-`O-WLG9dH0ONtWniZe?x^Ye;9;&MC;@*r{k#N_1Ef|AU<bg&=5a*8|*
zN+3Co#GHbR#H7>`kOmbV22}<%Mh5Q8Vz<n^#GK5k)D%Vr#wd0M4MqlOPzb?=!6vy@
zfX&U%<6=-}U<Ua@n}<OM<OPo8{JfIH%)DYQ20aFSb_N3;215oTMg~5RAt7*QGBR)#
zr6#5XSLP<==P)veYiJ_*(K#crC^5MtwaA*A!Gyt-oxu#`Jaa|{c90={ZjRuHjN)S8
zV6X&5x)oX&L1RZV4CF8y9tK+mJ4Ob!#FP}roE%05Noa6_Bf&X8Cnq%-6mZs>Q6SqK
zco-ZRoERB6(^E^pUM*&1kbt=kT?<Hq3lD=UNCRJbY6-%B#UQKQc^EuER&y4mf`Y^`
zCkG_z#lzsu;KRtkky(;jlvt8q#K<6qVu2@A+?t!gkHMdvA%KS=kindhK?spLU`iMn
z*fSD~{ZcDRKx%_|7(y6A85vmeQY%Ur8AM>FA}1VnhH#WD0tqXSM<RI`q8OqX8Tivv
zOFZ*3OAsj^)gXutYf${gf<ixzk--KUq+pAn@>t^&Nf4?`GYk}sksu<Gharg}nUR4n
zwV*gNCqK_QC%?F~D3y^x6KXs-_(9pm2bvD7p{WKg!OoD%$RL6UC!fr`?9>#W%;FL*
zh7?dj%>ZS$OhyKNgqpz8)Y4RLh75*m9)=uHIJ0LKyXF>@RD#6vco_1*L0XWXlLK;O
zArC_lLop)*cY11xBQyswG6=$g8p$Q4j10nHTfm_LPt#lsB@E>}3>6HOj0~K~8Hq(<
zi8-aI;1ul)vY?uWp@yNBkwF}m03FjxQi~8Ni;+PKJvf|kh6ku5ss}|<1D<pr#?H`$
z5+cDRiOJbq42=xTAi@SjfVu5F3>~1rU@pin;AZGz@M34^MhR|2ZUUu_ULJ-%P=ex2
zE6UFW=Or$NFop>{3==^G1zT!iX<`nzn3&ANFa@NLy(Ay1tdU_F55shZ8H@}p1*OFq
zj0|c}KZC;(Qmn%wA6W>Lj%V>O%m!shAy5pVmVY2eYl8xL9!O0wh_wKe--{U;ID<3O
z^AbzI=}j4uOkr_p1L1=0fu>qJYeoh|h%iDGC{ZHf$r_|a4P6bE1OZma;+&t73aTG6
z^HTjvbCXhwLK2g5z_m_(a$-(cVo@fD4;5r7$;d2bWRL{MJC?f3nvsF4xFoR%Qi3ru
zsG=uN9A45wQHO|48?Z%ae&bC{NkIrPG6-v+tI`Z(WZ*(nO^gfz=qeZ)c)^LyH?aWf
zH7<D7Qq0I82r9EtqL7h+6<n7xGO(8BW#;FBN;$Bher}G|ns62)18aUsMrsiw11FLg
z2UrWZ{@}^XD@iRXh7|pb4E)GkumaxX{JiAElGMCJQ02hLzz!{x7#Tp7D!BH8)~bvQ
z0w`+1+PSiGQd9F%gG&;N7#X-VkX<H}lb>JUl$e~29C&=FH8mpxb6#2^BLh!CPHC}!
z0j!?jO3u$M$Vtsj%`0JK;6-r2Rtly;Yi`HVlKkAn5>Vi9fa~*2Q1gWwVncCwei3?`
z0-C5bqZk=j%E8k7$@zI@sYNAzZjL4SE}#lm1rod15*xDTIPy}<!FiaGfh{Msqy!WN
zjLwV<Jjta+MX7nP1j(A2S5R8Q$iSJBmIzi}%*eo(l9q@Fl43>%)<RIp%*Y^!l!?HF
zwKXGym=8*}s4Pf@rXLd|#lfj1(1ec2q=*a%^|c*1|Cu3a1KUBYM)qV_Ed@%L$=RsR
z1t)H6Mg~<R<H2H3<I&5MKxi?C*S+u*jaK{NFq5qq+Q?!nN-ZwUDPd#?BE}Y+l?o1P
zBvMjKQj2mk^HLpAa%?dp14kY-mKhm1U=hy9P>kIbc)f0CO~CU6bTcw&pcHY46atP3
zcqI)^6I{XhrA5i9ZkeERm<QS|&;unP21N!A1||kZ1``H01}0D&pMjBKAp-*g6T>0~
zCQzFk&R@*H1nOsi<>VQJ;o=~5N=W=A3{0RVI0FNN1Op=jD}xmSBg0Y#28LM-%nVEn
z3=D2s+Zh<Ow6`*_Ywc#>joi+_zm-8iYYT&b_D%*7CWdf?s1$-Ji(o2fF>hs1-UxQb
zG6n_)H3m)w1_m((76x$!P6i1E5e7*Hc?Ky4Ee2@@QwA9Z2L@RNR|a{8<zQ7{7ci_~
zSjhkaZVam!co-NN7#SQHiW!)|?$ihK85meWZrT91hK+%dfq_98Yz#;X0|P767)Wrf
zW?%$0pRpJsg>HyCPD9o(Ffz=>>JnLWLv(N&0&+<dLo_tlk-fu?ZipckLl_y>GOUAo
zql1A79A{=)TNspQGH~x^P><Zspt)ab3xkyQP6jO|hFJ_UT3Z+tw6`(nLZc5N1&T>f
z95FM1;z){tje&u|jDelOoPnRgf<cDCib0FPn!%L87VH8sh%L|n1*u%muz`V*0b~LT
z0~5b0!zKm>1{MZJ26YBThRqCCQ1`V$-DiyHK2UN3yH64nkFd10g+Ug|1R0I&I7bF{
z1}6r724@Bt1{Vf(23H0n26rUK8N(fC%&-NVXh0@_9H)fhxUCG^ppHAnz|6qRz`&3M
zaU75KP6lH}hFOSE+|9rdskMcHeLI7Nug(@oCfLbf&BPE6;%V<>uxDg|^QAyxj^JtU
zWN?Pdf}$1T7bOM`1_lNn1_1_N1_=g#1{H=t1|x<b1}BCPh5&|8h6IKPu%8qlE`$3i
ziD5g#4hBXB6$U$ooeV1(m|#IKz>ea(UDWoS8^pIbd<T|A_gx%=07E>31VbW&3PUo3
z5km@t6GIw907E)M0z)Q2-|fcZyFD=9F`9x#U>Fz}7ScNIw6-wF?qu*}Wbo77$>7V#
zFq1)FcPB#-Bf|lPFe{eb40@50ER5Pa86p@Nwll<7vFdDLkdkDDWVPl0&*>ln$B2Q4
zfq@~PL4cuvL4u)(L4~1&!HA)h!HJ=qA%LNRA%UTap^l-NVFE)9!yJZMhWQNj;J`9r
zU}c!Vz{9YYVFLpzLmh)0!#)Nc1{RR#;mKnmJbBbI?1u-S00WBv`(K7Yb_Nc12EShn
zCMZee0K-8@Mqrd;U}a!sU|^U43QX+j-$xrI{cCSwKuQtXTNq?P`2^x?c!>GxKts$@
z2Nq&}pa9cl1StlE77NH6Nfu~9#Si0w%BJQ2k7%QZT?+#{Ln{M6LkEL2LpOsaLl1*F
zLqCHn!z6|zhRF<t4AU6u8KyIIGt6Y@W0(yNJ1qtlhC&7@hC>V+7+4sR7&I9UGw^`3
z)&ywSNi&o(9AQ`qEz1NLSor@k*h2!$`WFKeN{Ah$c8JMB$_v_s*a8N2hJ_6L3`-cK
z8J06>GOS=QXIRPL%CLqZiD4~6A;SiSdWMY*-3*%<`WUv-AjFQrLX2S_12Z_yf(le+
zGSV2Rk^tvJc&ZXWq^jlr-!dW+3#5$Q&A`sEhk>7AKZ7*G0R~NmgAC>jhZ#Z`jxvNZ
z90z+9QmIA46M`MXad<-DXJF?4%U}pe2)`IaQPP1bgE^MUTX_vyTjUJb7Sy%~Bf|*>
zP)h~W;4%R>>=+o>v{+CYOrTL_28N3atPGcsOkjh$lab*h+<F~oQ;3Nf-R@gRI+@@)
zPcfW^WO)WN21am|j;Zq@SSKWGU^+p~%`@OS6}g%}%Ww`742*9XSQ)q&7#Maz8;rhC
z+7C)wu}HFLZ)1pu77$=gf)$GnDC>hV`)-Dm$n6YiR;-e&Afa?7hHy|Bngyzj(?P6U
zP<bnA#iqTDp#Yo;tk@;lp{0v6hy^Z?OSUnTnQ>@oNwSG@Xm4Yv(%#09V8y8;$q6lB
z#3WfkY>@F_L6FtU|L<J>e=0cjuz;IFUJODE3=AI`I2b-N2rztOkYxDIpvv%zL66}#
zgE^xhg9D=wgBPO+LkOcNLjt2XLkpuM!xTm-hWU)r3@aIB7&b8~Fl=R1WZ1!I0uIR-
z22O@43~~(T8H5=)8Cn?h7%nheWZ+;(U<hTn#2^fAc<qA55Cg+5hRfhI$ic9Q;R=H=
z0~3P)!zzZW48jb|43Z2B8CEd}Gq5l?FjO&IW4O-1%5Z~$fx(V}4Qj(822QBCix}7#
zAZFZzo3R*f#v-^Gw-{K#EeUM~*8dD%3~b;8&%w?h3PTwT41XCEz&yX-3~oOem_RMg
zB!*;2LSl?%U<Nm7T0l{)y`7=XZ#P3@<aUN;Xq>l%OR{WZXr0B70;1bMwI-_$v~ASM
z$Y8}L$p(!_2M`M!k9wfk-Nw)($-0f9e<p*9B>Of7-Qx^0x**0Ra3Y$?z$eK9=5Aw{
z8ovDhp5^~%>4J&?NF;*mTE;L2PR4KsA;t&>NybP9MaC!wZN_K@KgJk_WX4#ALdH0T
z8pcG1dd4J%CdOoNWO*>KGx#y+F@RdP><rorA>gJYsBUb5M^Ov37skNQ!f=FP2LlrW
zCqp&EZEzF`F%&V}VYth{0*)9+BMzi~5d$Ms)glIF28gPA3@qTFmu6u7%OD93;l{rV
za_kIY><oUt8JxjE4e7hwXJ7&i)k1^Z32Y?;LnA22w=?itv1mi`1S=@3fZHf(AQm_*
z!>rhJk%AkMZ5-g)M$d{vk^>anY|!B5*v6oHj6nt@sJo4!OlARtfFuiu2MK#fa8HwD
zL4-HB$Yo4t;AG5TP-o0!@M6qj$Y#uDs9?-xsAkM#sAJ5Bhp!hjd^s4@q2UYado;qs
zw-Fw`jSLSME`p1xMsP?oGjK9gFgyfj0Z_t+6jC7dknjb`fs!_;;V%mcRY7p5`u$~4
zLJn0>wGIi_M+{61kKsvKhk*&4lry2>>IV&07EqZ44%Pq=3mmMXpt1@Q>WCDq2T#Fa
zR_r=E8D=svfC70A6T?gfeqB(MfJ+<(w&nlNE&sm;DZPUG$c)7d9E>FlYK)}}u8d_2
zp^W7Waf}rViHubYDU8(&>5MhtFa%|HR|Xk|Ck#9c><nrQb_`D$gu(5%On4Y(f(s8&
zhd2`)av+Z-f@bO%nBgfCqH_^c=M{#V42%pM3?NlE8JH0%Qveo*au9~$PX;DL2tH$A
z1kF-FQYHg(UseH>I+(ykDyYI^U=Rem9<@4zM8k6dN6<hzq%uJ=WE;a=bVIl>4H0kz
U&7)z_Jf8^742%pfz}5Ck09JXUsQ>@~