ndfaToDfa bugs solved

ignacioDias · Apr 10, 2024 · 58b72cc · 58b72cc
1 parent b5a0ecb
commit 58b72cc
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 26 deletions.
diff --git a/TP/Main.cpp b/TP/Main.cpp
@@ -35,7 +35,7 @@ int main() {
 
     NotDeterministicFiniteAutomata ndfa; 
     ndfa.setInitialState(10);
-    ndfa.setE({1,2}); //a, b
+    ndfa.setE({-1,1,2}); //a, b
     ndfa.setK({10,11,12,13});
     ndfa.addPath(10,1,11);
     ndfa.addPath(11,2,11);
@@ -44,7 +44,7 @@ int main() {
     ndfa.addPath(13,1,13);
     ndfa.addPath(13,2,13);
     ndfa.addFinalState(12);
-    //cout << Parser::ndfaToString(ndfa);
+//    cout << Parser::ndfaToString(ndfa);
     DeterministicFiniteAutomata dfa = ndfa.nfaToDfa();
     cout << Parser::dfaToString(dfa);
     return 0;

diff --git a/TP/automata/dfa/DeterministicFiniteAutomata.cpp b/TP/automata/dfa/DeterministicFiniteAutomata.cpp
@@ -75,12 +75,9 @@ bool DeterministicFiniteAutomata :: isFinalNode(const set<int>& node) {
 
 set<int> DeterministicFiniteAutomata::calculateWaysToGo(const set<int>& set1, const set<int>& set2) {
     set<int> ret;
-    for(int letter : this->E) {
-        pair<set<int>,int> pair;
-        pair.first = set1;
-        pair.second = letter;
-        set<int> delta = calculateDelta(pair);
-        if(!delta.empty() && CollectionsOperators::contained(set2, delta))
+    for (int letter : this->E) {
+        set<int> delta = calculateDelta(make_pair(set1, letter));
+        if (!delta.empty() && CollectionsOperators::contained(set2, delta))
             ret.insert(letter);
     }
     return ret;

diff --git a/TP/automata/ndfa/NotDeterministicFiniteAutomata.cpp b/TP/automata/ndfa/NotDeterministicFiniteAutomata.cpp
@@ -86,15 +86,18 @@ DeterministicFiniteAutomata NotDeterministicFiniteAutomata :: nfaToDfa() {
     convertedAutomata.setF(calculateFinal(newK));
     return convertedAutomata;
 }
-void NotDeterministicFiniteAutomata :: calculateNewK(set<set<int>> newK, DeterministicFiniteAutomata dfa) {
+void NotDeterministicFiniteAutomata :: calculateNewK(set<set<int>>& newK, DeterministicFiniteAutomata dfa) {
     set<set<int>> unvisitedNodes = newK;
-    for(const auto& currentNode : unvisitedNodes) {
+    while(!unvisitedNodes.empty()) {
+        auto currentNode = *unvisitedNodes.begin();
         for (auto currentNumber: getE()) {
             set<int> currentSet = move(currentNode, currentNumber);
             currentSet = getSymbolClosure(currentSet);
-            newK.insert(currentSet);
-            unvisitedNodes.insert((currentSet));
-            dfa.addPath(currentNode, currentNumber,currentSet);
+            if (newK.count(currentSet) <= 0) {
+                newK.insert(currentSet);
+                unvisitedNodes.insert(currentSet);
+                dfa.addPath(currentNode, currentNumber, currentSet);
+            }
         }
         unvisitedNodes.erase(currentNode);
     }
@@ -108,6 +111,8 @@ set<int> NotDeterministicFiniteAutomata ::getSymbolClosure(const set<int>& Q) {
         unvisited_states.erase(curr_state);
         visited_states.insert(curr_state);
         set<int> reachable_states = calculateDelta({curr_state, LAMBDA});
+        if(reachable_states.empty())
+            result.insert(curr_state);
         for (int reachable_state : reachable_states) {
             result.insert(reachable_state);
             if (visited_states.find(reachable_state) == visited_states.end())
@@ -128,7 +133,7 @@ set<int> NotDeterministicFiniteAutomata :: move(const set<int>& Q, int a) {
     }
     return ret;
 }
-set<set<int>> NotDeterministicFiniteAutomata :: calculateFinal(set<set<int>> k) {
+set<set<int>> NotDeterministicFiniteAutomata :: calculateFinal(const set<set<int>>& k) {
     set<set<int>> newF;
     for(const auto& currentSet : k) {
         for(auto currentNumber : currentSet) {
@@ -139,4 +144,4 @@ set<set<int>> NotDeterministicFiniteAutomata :: calculateFinal(set<set<int>> k)
         }
     }
     return newF;
-}
+}
diff --git a/TP/automata/ndfa/NotDeterministicFiniteAutomata.h b/TP/automata/ndfa/NotDeterministicFiniteAutomata.h
@@ -39,7 +39,7 @@ class NotDeterministicFiniteAutomata : public AutomataInterface {
 private:
     set<int> getSymbolClosure(const set<int>& Q);
     set<int> move(const set<int>& Q, int a);
-    set<set<int>> calculateFinal(set<set<int>> k);
-    void calculateNewK(set<set<int>> newK, DeterministicFiniteAutomata dfa);
+    set<set<int>> calculateFinal(const set<set<int>>& k);
+    void calculateNewK(set<set<int>>& newK, DeterministicFiniteAutomata dfa);
 };
 #endif //TPOB1_NOTDETERMINISTICFINITEAUTOMATA_H
diff --git a/TP/auxiliarmethods/CollectionsOperators.cpp b/TP/auxiliarmethods/CollectionsOperators.cpp
@@ -19,15 +19,15 @@ bool CollectionsOperators :: belongs(int elem, const set<int>& set) {
     }
     return false;
 }
-bool CollectionsOperators :: setContained(set<set<int>> firstSet, set<int> biggerSet) {
+bool CollectionsOperators :: setContained(const set<set<int>>& firstSet, const set<int>& biggerSet) {
     bool ret = true;
-    for(auto currentSet : firstSet) {
+    for(const auto& currentSet : firstSet) {
         if(!contained(currentSet,biggerSet))
             return false;
     }
     return true;
 }
-void CollectionsOperators :: insertAll(set<int> setToBeModify, const set<int>& otherSet) {
+void CollectionsOperators :: insertAll(set<int>& setToBeModify, const set<int>& otherSet) {
     for(auto elem : otherSet) {
         setToBeModify.insert(elem);
     }

diff --git a/TP/auxiliarmethods/CollectionsOperators.h b/TP/auxiliarmethods/CollectionsOperators.h
@@ -9,8 +9,8 @@ class __attribute__((unused)) CollectionsOperators {
 public:
     static bool contained(const set<int>& firstSet, const set<int>& biggerSet);
     static bool belongs(int elem, const set<int>& set);
-    static bool setContained(set<set<int>> firstSet, set<int> biggerSet);
-    static void insertAll(set<int> setToBeModify, const set<int>& otherSet);
+    static bool setContained(const set<set<int>>& firstSet, const set<int>& biggerSet);
+    static void insertAll(set<int>& setToBeModify, const set<int>& otherSet);
     };
 
 #endif //TPOB1_COLLECTIONSOPERATORS_H
diff --git a/TP/parser/Parser.cpp b/TP/parser/Parser.cpp
@@ -115,10 +115,11 @@ string Parser::toStringSet(const set<int>& set) {
     return ret;
 }
 void Parser::toStringStatesDFA(DeterministicFiniteAutomata dfa, std::string &ret) {
-    for(auto set1 : dfa.getK()) {
-        for(auto set2 : dfa.getK()) {
+    for(const auto& set1 : dfa.getK()) {
+        for(const auto& set2 : dfa.getK()) {
             set<int> label = dfa.calculateWaysToGo(set1, set2);
             if(!label.empty()) {
+                printf("dasdasd\n");
                 ret += toStringSet(set1) + " -> " + toStringSet(set2) + " [label = \"";
                 for(auto elem : label)
                     ret += to_string(elem) + ",";

diff --git a/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/Main.cpp.o b/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/Main.cpp.o
diff --git a/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/automata/dfa/DeterministicFiniteAutomata.cpp.o b/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/automata/dfa/DeterministicFiniteAutomata.cpp.o
diff --git a/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/automata/ndfa/NotDeterministicFiniteAutomata.cpp.o b/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/automata/ndfa/NotDeterministicFiniteAutomata.cpp.o
diff --git a/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/auxiliarmethods/CollectionsOperators.cpp.o b/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/auxiliarmethods/CollectionsOperators.cpp.o
diff --git a/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/parser/Parser.cpp.o b/cmake-build-debug/CMakeFiles/tpOb1.dir/TP/parser/Parser.cpp.o
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 10 11:58 -03
+Start testing: Apr 10 18:20 -03
 ----------------------------------------------------------
-End testing: Apr 10 11:58 -03
+End testing: Apr 10 18:20 -03
diff --git a/cmake-build-debug/tpOb1 b/cmake-build-debug/tpOb1