avances humildes

ignacioDias · Apr 4, 2024 · 4966a2f · 4966a2f
1 parent dc517b8
commit 4966a2f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/TP/automata/dfa/DeterministicFiniteAutomata.cpp b/TP/automata/dfa/DeterministicFiniteAutomata.cpp
@@ -9,16 +9,16 @@ DeterministicFiniteAutomata::DeterministicFiniteAutomata() : K(), E(), d(), q0()
 void DeterministicFiniteAutomata::setE(set<int> alphabet) {
     this->E = alphabet;
 }
-void DeterministicFiniteAutomata::setQ0(set<int> q0) {
-    this->q0 = q0;
-}
 
 void DeterministicFiniteAutomata :: setK(set<set<int>> states) {
     this->K = states;
 }
 void DeterministicFiniteAutomata :: setInitialState(set<int> q) {
     this->q0 = q;
 }
+set<int> DeterministicFiniteAutomata :: getInitialState() {
+    return this->q0;
+}
 void DeterministicFiniteAutomata :: setF(set<set<int>> final) {
     this->F = final;
 }
@@ -60,8 +60,8 @@ bool DeterministicFiniteAutomata :: belongs(string numbers) {
     }
     return isFinalNode(currentNode);
 }
-bool DeterministicFiniteAutomata :: isFinalNode(set<int> node) {
-    for(auto currentNode : getF()) {
+bool DeterministicFiniteAutomata :: isFinalNode(const set<int>& node) {
+    for(const auto& currentNode : getF()) {
         if(currentNode == node)
             return true;
     }

diff --git a/TP/automata/dfa/DeterministicFiniteAutomata.h b/TP/automata/dfa/DeterministicFiniteAutomata.h
@@ -23,10 +23,11 @@ class DeterministicFiniteAutomata {
     set<int> calculateDelta(const pair<set<int>,int>& key);
     void addPath(set<int> node, int arc, set<int> destination);
     bool repOk();
-    void setQ0(set<int> q0);
     bool belongs(string numbers);
     set<set<int>> getF();
+    set<int> getInitialState();
 private:
-    bool isFinalNode(set<int> node);
+    bool isFinalNode(const set<int>& node);
+
 };
 #endif // DETERMINISTICFINITEAUTOMATA_H
diff --git a/TP/parser/Parser.cpp b/TP/parser/Parser.cpp
@@ -99,3 +99,9 @@ void Parser::fileManagement(const string& line) {
     } else if(!isRankdirLine(line) || line == "}" && readLastLine)
         throw runtime_error("Formato invalido del archivo.");
 }
+string Parser::dnaToFile(DeterministicFiniteAutomata dfa) {
+    string ret = "digraph{"
+                 "inic[shape=point];"
+                 "inic->";
+    return ret;
+}
diff --git a/TP/parser/Parser.h b/TP/parser/Parser.h
@@ -17,18 +17,19 @@ class Parser {
     void addAutomataInformationFromTransitionLine(string line);
     void fileManagement(const string& line);
     NotDeterministicFiniteAutomata getNDA();
-    static bool validateInitialStateLine(string line);
+    static bool validateInitialStateLine(string line); //priv?
     static bool validateFirstLine(const string& line);
     static bool validateLastLine(const string& line);
     static bool validateTransitionLine(const string& line);
     static bool validateFinalStateLine(const string& line);
     bool isRankdirLine(const string& line);
-
+    string dnaToFile(DeterministicFiniteAutomata dfa);
 
 private:
     static bool checkDelta(const string& line);
     NotDeterministicFiniteAutomata nda; 
-    bool readLastLine; 
+    bool readLastLine;
+
 };
 
 

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 03 11:27 -03
+Start testing: Apr 04 00:12 -03
 ----------------------------------------------------------
-End testing: Apr 03 11:27 -03
+End testing: Apr 04 00:12 -03