converter

ignacioDias · Apr 3, 2024 · dc517b8 · dc517b8
1 parent 6beca7b
commit dc517b8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/TP/automata/ndfa/NotDeterministicFiniteAutomata.cpp b/TP/automata/ndfa/NotDeterministicFiniteAutomata.cpp
@@ -71,20 +71,20 @@ DeterministicFiniteAutomata NotDeterministicFiniteAutomata :: nfaToDfa() { //TOD
 
     convertedAutomata.setE(getE());
 
-    calculateNewK(newK);
+    calculateNewK(newK, convertedAutomata);
     convertedAutomata.setK(newK);
     convertedAutomata.setF(calculateFinal(newK));
     return convertedAutomata;
 }
-void NotDeterministicFiniteAutomata :: calculateNewK(set<set<int>> newK) {
+void NotDeterministicFiniteAutomata :: calculateNewK(set<set<int>> newK, DeterministicFiniteAutomata dfa) {
     set<set<int>> unvisitedNodes = newK;
     for(const auto& currentNode : unvisitedNodes) {
         for (auto currentNumber: getE()) {
             set<int> currentSet = move(currentNode, currentNumber);
-            if (newK.count(currentSet) == 0) {
-                newK.insert(currentSet);
-                unvisitedNodes.insert((currentSet));
-            }
+            currentSet = getSymbolClosure(currentSet, LAMBDA);
+            newK.insert(currentSet);
+            unvisitedNodes.insert((currentSet));
+            dfa.addPath(currentNode, currentNumber,currentSet);
         }
         unvisitedNodes.erase(currentNode);
     }

diff --git a/TP/automata/ndfa/NotDeterministicFiniteAutomata.h b/TP/automata/ndfa/NotDeterministicFiniteAutomata.h
@@ -38,6 +38,6 @@ class NotDeterministicFiniteAutomata : public AutomataInterface {
     set<int> getSymbolClosure(const set<int> Q, int symbol);
     set<int> move(const set<int>& Q, int a);
     set<set<int>> calculateFinal(set<set<int>> k);
-    void calculateNewK(set<set<int>> newK);
+    void calculateNewK(set<set<int>> newK, DeterministicFiniteAutomata dfa);
 };
 #endif //TPOB1_NOTDETERMINISTICFINITEAUTOMATA_H
diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log
@@ -1,3 +1,3 @@
-Start testing: Apr 01 18:58 -03
+Start testing: Apr 03 11:27 -03
 ----------------------------------------------------------
-End testing: Apr 01 18:58 -03
+End testing: Apr 03 11:27 -03