From 8766e386e17b050f28a03d207cfeff9718f90a8f Mon Sep 17 00:00:00 2001
From: Jan Vesely <janvesely@janvesely.net>
Date: Mon, 18 Nov 2013 21:36:28 +0100
Subject: [PATCH] move determinization utils class into adeterminize part and
 move determinization programs into determinization namespace

---
 adeterminize.fsm/src/FSMDeterminizer.cpp              |  4 ++--
 adeterminize.fsm/src/FSMDeterminizer.h                |  7 ++++---
 adeterminize.fsm/src/adeterminize.fsm.cpp             |  1 +
 adeterminize.idpda/src/IDPDADeterminizer.cpp          |  4 ++--
 adeterminize.idpda/src/IDPDADeterminizer.h            |  7 ++++---
 adeterminize.idpda/src/adeterminize.idpda.cpp         |  1 +
 .../src}/DeterminizationUtils.cpp                     |  4 ++--
 .../src}/DeterminizationUtils.h                       | 11 ++++++-----
 8 files changed, 22 insertions(+), 17 deletions(-)
 rename {alib/src/automaton => adeterminize/src}/DeterminizationUtils.cpp (97%)
 rename {alib/src/automaton => adeterminize/src}/DeterminizationUtils.h (85%)

diff --git a/adeterminize.fsm/src/FSMDeterminizer.cpp b/adeterminize.fsm/src/FSMDeterminizer.cpp
index 454bacceec..9f91674840 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 5b6b885e84..ea48363b9b 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 0fdd9e10b3..31fe0c40d4 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 330642b318..7f25b7d904 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 40e8b5da5f..ad32481c61 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 545a704c69..c4df4d58b1 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 50dacc9620..89060cf71e 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 87ee060714..38e529a69b 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
-- 
GitLab