diff --git a/adeterminize.fsm/src/FSMDeterminizer.cpp b/adeterminize.fsm/src/FSMDeterminizer.cpp index 454bacceec1a6145606cdda9454f3a2e141cbb78..9f9167484073bec4a9d35a6eb1fd01cc102ed177 100644 --- a/adeterminize.fsm/src/FSMDeterminizer.cpp +++ b/adeterminize.fsm/src/FSMDeterminizer.cpp @@ -1,6 +1,6 @@ #include "FSMDeterminizer.h" -namespace automaton { +namespace determinization { set<State> FSMDeterminizer::findToStates(const set<State>& nfsmStates, const Symbol& input) { const set<TransitionFSM>& nfsmTransitions = this->nondeterministicFSM->getTransitions(); @@ -80,4 +80,4 @@ FSM* FSMDeterminizer::determinize() { return this->deterministicFSM; } -} /* namespace automaton */ +} /* namespace determinization */ diff --git a/adeterminize.fsm/src/FSMDeterminizer.h b/adeterminize.fsm/src/FSMDeterminizer.h index 5b6b885e841d1b14206639f42d5ae0a14ac35007..ea48363b9b69046651b5fb5e2a5763c49378f166 100644 --- a/adeterminize.fsm/src/FSMDeterminizer.h +++ b/adeterminize.fsm/src/FSMDeterminizer.h @@ -6,13 +6,14 @@ #include <map> #include "automaton/State.h" -#include "automaton/DeterminizationUtils.h" +#include "DeterminizationUtils.h" #include "automaton/FSM/FSM.h" #include "automaton/FSM/TransitionFSM.h" using namespace std; +using namespace automaton; -namespace automaton { +namespace determinization { class FSMDeterminizer { protected: @@ -27,5 +28,5 @@ public: }; -} /* namespace automaton */ +} /* namespace determinization */ #endif /* FSMDETERMINIZER_H_ */ \ No newline at end of file diff --git a/adeterminize.fsm/src/adeterminize.fsm.cpp b/adeterminize.fsm/src/adeterminize.fsm.cpp index 0fdd9e10b3506ed51b6b7e856fb2a61423c1317a..31fe0c40d46861a633a8f19dcbb103994b6763e0 100644 --- a/adeterminize.fsm/src/adeterminize.fsm.cpp +++ b/adeterminize.fsm/src/adeterminize.fsm.cpp @@ -9,6 +9,7 @@ using namespace std; using namespace automaton; +using namespace determinization; using namespace alib; diff --git a/adeterminize.idpda/src/IDPDADeterminizer.cpp b/adeterminize.idpda/src/IDPDADeterminizer.cpp index 330642b31881dfd19b9a0f48a71fd8f3559d8c47..7f25b7d904d1111a0639063ad4c42372178c684b 100644 --- a/adeterminize.idpda/src/IDPDADeterminizer.cpp +++ b/adeterminize.idpda/src/IDPDADeterminizer.cpp @@ -1,6 +1,6 @@ #include "IDPDADeterminizer.h" -namespace automaton { +namespace determinization { set<State> IDPDADeterminizer::findToStates(const set<State>& nidpdaStates, const Symbol& input, list<Symbol>* stackPop, list<Symbol>* stackPush) { const set<TransitionPDA>& nidpdaTransitions = this->nondeterministicIDPDA->getTransitions(); @@ -85,4 +85,4 @@ PDA* IDPDADeterminizer::determinize() { return this->deterministicIDPDA; } -} /* namespace automaton */ +} /* namespace determinization */ diff --git a/adeterminize.idpda/src/IDPDADeterminizer.h b/adeterminize.idpda/src/IDPDADeterminizer.h index 40e8b5da5f1d9eca5858d9f69e34fea7bc36a578..ad32481c61faf8760b8cb7afde76bf7e0f953523 100644 --- a/adeterminize.idpda/src/IDPDADeterminizer.h +++ b/adeterminize.idpda/src/IDPDADeterminizer.h @@ -7,13 +7,14 @@ #include <list> #include "automaton/State.h" -#include "automaton/DeterminizationUtils.h" +#include "DeterminizationUtils.h" #include "automaton/PDA/PDA.h" #include "automaton/PDA/TransitionPDA.h" using namespace std; +using namespace automaton; -namespace automaton { +namespace determinization { class IDPDADeterminizer { protected: @@ -28,5 +29,5 @@ public: }; -} /* namespace automaton */ +} /* namespace determinization */ #endif /* IDPDADETERMINIZER_H_ */ \ No newline at end of file diff --git a/adeterminize.idpda/src/adeterminize.idpda.cpp b/adeterminize.idpda/src/adeterminize.idpda.cpp index 545a704c69bc627cf3de0b06e05cf5a2d9034660..c4df4d58b1563203695cdb2c12498abad31421c7 100644 --- a/adeterminize.idpda/src/adeterminize.idpda.cpp +++ b/adeterminize.idpda/src/adeterminize.idpda.cpp @@ -9,6 +9,7 @@ using namespace std; using namespace automaton; +using namespace determinization; using namespace alib; diff --git a/alib/src/automaton/DeterminizationUtils.cpp b/adeterminize/src/DeterminizationUtils.cpp similarity index 97% rename from alib/src/automaton/DeterminizationUtils.cpp rename to adeterminize/src/DeterminizationUtils.cpp index 50dacc96203be5ec8eb43d64d1978c77797ebb2d..89060cf71eb93c5ac27dd5f8ea9441684dacf928 100644 --- a/alib/src/automaton/DeterminizationUtils.cpp +++ b/adeterminize/src/DeterminizationUtils.cpp @@ -1,6 +1,6 @@ #include "DeterminizationUtils.h" -namespace automaton { +namespace determinization { string DeterminizationUtils::buildStateName(const set<State>& states) { string name = "["; @@ -54,4 +54,4 @@ bool DeterminizationUtils::containSomeFinalStateOfAutomaton(const set<State>& st return intersection.size() > 0; } -} /* namespace automaton */ +} /* namespace determinization */ diff --git a/alib/src/automaton/DeterminizationUtils.h b/adeterminize/src/DeterminizationUtils.h similarity index 85% rename from alib/src/automaton/DeterminizationUtils.h rename to adeterminize/src/DeterminizationUtils.h index 87ee060714280a423ce7c28737003a8737cd0a4e..38e529a69b226773802ab0d0aba82864db6421f3 100644 --- a/alib/src/automaton/DeterminizationUtils.h +++ b/adeterminize/src/DeterminizationUtils.h @@ -7,13 +7,14 @@ #include <map> #include <algorithm> -#include "State.h" -#include "Automaton.h" -#include "PDA/PDA.h" +#include "automaton/State.h" +#include "automaton/Automaton.h" +#include "automaton/PDA/PDA.h" using namespace std; +using namespace automaton; -namespace automaton { +namespace determinization { class DeterminizationUtils { public: @@ -36,5 +37,5 @@ public: static bool containSomeFinalStateOfAutomaton(const set<State>& states, const Automaton& automaton); }; -} /* namespace automaton */ +} /* namespace determinization */ #endif /* DETERKMINIZATIONUTILS_H_ */ \ No newline at end of file