Start work on saving CfgToPdaConversion.

Author: navrkald

src/finite_machine/computationalrules.cpp

@@ -96,14 +96,14 @@ QSet<QString> getTos(QList<ComputationalRules> list)
     return tos;
 }
 
-QDataStream &operator<<(QDataStream& out, const ComputationalRules& rule)
+QDataStream& ComputationalRules::operator<<(QDataStream& out)
 {
-    out << rule.from << rule.symbol << rule.to;
+    out << from << symbol << to;
     return out;
 }
 
-QDataStream &operator>>(QDataStream &in, ComputationalRules &rule)
+QDataStream& ComputationalRules::operator>>(QDataStream &in)
 {
-    in >> rule.from >> rule.symbol >> rule.to;
+    in >> from >> symbol >> to;
     return in;
 }

src/finite_machine/computationalrules.h

@@ -42,6 +42,10 @@ class ComputationalRules// : public QObject
 //         return returnRule;
 //     }
 
+	QDataStream &operator<<(QDataStream& out);
+	QDataStream &operator>>(QDataStream &in);
+
+
 public:
     QString from;
     QString to;
@@ -51,8 +55,6 @@ class ComputationalRules// : public QObject
 bool operator<(const ComputationalRules& r1, const ComputationalRules& r2);
 
 QDebug operator<<(QDebug dbg, const ComputationalRules& rule);
-QDataStream &operator<<(QDataStream& out, const ComputationalRules& rule);
-QDataStream &operator>>(QDataStream &in, ComputationalRules &rule);
 
 bool lessThan(const ComputationalRules& r1, const ComputationalRules& r2);
 QSet <QString> getFroms(QList <ComputationalRules> list);

src/finite_machine/finiteautomata.cpp

@@ -1047,7 +1047,7 @@ bool operator ==(const FiniteAutomata FA1, const FiniteAutomata FA2)
     return true;
 }
 
-QDebug operator<< (QDebug d, const FiniteAutomata &FA)
+QDebug operator<<(QDebug d, const FiniteAutomata &FA)
 {
    d << "FA=(Q,S,R,s,F)";
    d << "Q={" << FA.m_states <<"}";
@@ -1059,18 +1059,18 @@ QDebug operator<< (QDebug d, const FiniteAutomata &FA)
    return d;
 }
 
-QDataStream &operator<<(QDataStream &out, const FiniteAutomata &FA)
+QDataStream& FiniteAutomata::operator<<(QDataStream &out)
 {
-    out << FA.m_states << FA.m_startState << FA.m_finalStates << FA.m_alphabet  << FA.m_rules << (quint32)FA.m_nextId << FA.m_coordinates;
+    out << m_states << m_startState << m_finalStates << m_alphabet  << m_rules << (quint32)m_nextId << m_coordinates;
     return out;
 }
 
 
 
-QDataStream &operator>>(QDataStream &in, FiniteAutomata &FA)
+QDataStream& FiniteAutomata::operator>>(QDataStream &in)
 {
     quint32 nextId;
-    in  >> FA.m_states >> FA.m_startState >> FA.m_finalStates >> FA.m_alphabet  >> FA.m_rules >> nextId >> FA.m_coordinates;
-    FA.m_nextId = (int)nextId;
+    in  >> m_states >> m_startState >> m_finalStates >> m_alphabet  >> m_rules >> nextId >> m_coordinates;
+    m_nextId = (int)nextId;
     return in;
 }

src/finite_machine/finiteautomata.h

@@ -90,6 +90,8 @@ class FiniteAutomata
 	QString PrintHtmlRules();
 	QString PrintHtmlStartState();
 	QString PrintHtmlFinalStates();
+	QDataStream& operator<<(QDataStream &out);
+	QDataStream& operator >> (QDataStream &in);
 
 // Getters and setters
 public:
@@ -118,6 +120,4 @@ bool operator==(const FiniteAutomata FA1, const FiniteAutomata FA2);
   */
 QDebug operator<< (QDebug d, const FiniteAutomata& FA);
 
-QDataStream& operator<<(QDataStream &out, const FiniteAutomata &FA);
-QDataStream& operator>>(QDataStream &in, FiniteAutomata &FA);
 #endif // FINITEAUTOMATA_H

src/finite_machine/pdacompotutationalrules.cpp

@@ -30,6 +30,20 @@ QString CPDACompotutationalRule::ToArrowText(const QSet<CPDACompotutationalRule>
 	return outText;
 }
 
+QDataStream & CPDACompotutationalRule::operator<<(QDataStream & out)
+{
+	ComputationalRules::operator<<(out);
+	out << m_popSymol;
+	out << m_pushSymbols;
+	return out;
+	// TODO: insert return statement here
+}
+
+QDataStream & CPDACompotutationalRule::operator >> (QDataStream & in)
+{
+	// TODO: insert return statement here
+}
+
 QSet<QString> CPDACompotutationalRule::GetStackSymbols()
 {
 	QSet<QString> stackSymbols;

src/finite_machine/pdacompotutationalrules.h

@@ -69,6 +69,10 @@ class CPDACompotutationalRule : public ComputationalRules
 //        return returnRule;
 //    }
 
+public:
+	QDataStream &operator<<(QDataStream& out);
+	QDataStream &operator>>(QDataStream &in);
+
 public:
     QString GetPopSymbol() { return m_popSymol; }
 		QVector<QString> GetPushSymbols() { return m_pushSymbols; }

src/finite_machine/pushdownautomata.cpp

@@ -133,6 +133,18 @@ bool CPushDownAutomata::AreEquivalentSimpleImplementation(CPushDownAutomata pda1
 
 }
 
+QDataStream& CPushDownAutomata::operator<<(QDataStream & out)
+{
+	FiniteAutomata::operator<<(out);
+	return out << m_stackAlphabet << m_pdaRules;
+}
+
+QDataStream& CPushDownAutomata::operator>>(QDataStream & in)
+{
+	FiniteAutomata::operator>>(in);
+	return in >> m_stackAlphabet >> m_pdaRules;
+}
+
 bool operator ==(const CPushDownAutomata& pda1, const CPushDownAutomata& pda2)
 {
 	if (pda1.m_states != pda2.m_states)

src/finite_machine/pushdownautomata.h

@@ -26,12 +26,16 @@ class CPushDownAutomata : public FiniteAutomata
 	bool RenameState(QString oldStateName, QString newStateName);
 	static bool AreEquivalent(CPushDownAutomata pda1, CPushDownAutomata pda2);
 	static bool AreEquivalentSimpleImplementation(CPushDownAutomata pda1, CPushDownAutomata pda2);
+	QDataStream& operator<<(QDataStream &out);
+	QDataStream& operator >> (QDataStream &in);
 
 public:
 	QSet <QString> m_stackAlphabet;
 	QSet <CPDACompotutationalRule> m_pdaRules;
 };
 
 bool operator==(const CPushDownAutomata& pda1, const CPushDownAutomata& pda2);
+QDataStream& operator<<(QDataStream &out, const FiniteAutomata &FA);
+QDataStream& operator >> (QDataStream &in, FiniteAutomata &FA);
 
 #endif // PUSHDOWNAUTOMATA_H

src/mainwindow.cpp

@@ -684,6 +684,12 @@ void MainWindow::on_action_save_triggered()
                 out <<  ((CFADeterminizationWidget*)m_centralWidget)->GetOutputFA();
             }
             break;
+		case CFG_TO_PDA:
+			out << ((CCfgToPdaWidget*)m_centralWidget)->GetCfg();
+			if (m_mode != AlgorithmModes::algorithmSteping) {
+				out << ((CCfgToPdaWidget*)m_centralWidget)->GetPda();
+			}
+			break;
         // This should never happend
         case none:
             showStatusMessage(tr("ERROR: No conversion selected!"));