diff options
| author | Christophe SERVAN <cservan@trou-de-fer.grenoble.xrce.xerox.com> | 2015-02-16 21:46:25 +0300 |
|---|---|---|
| committer | Christophe SERVAN <cservan@trou-de-fer.grenoble.xrce.xerox.com> | 2015-02-16 21:46:25 +0300 |
| commit | 90471e22a8513af2ae8f202345bfc896a517d063 (patch) | |
| tree | eee1982c957fb46f9b9fd91c474b032bbdd9ee4d /mert | |
| parent | d0ff70decc98827d3adf9943b2a88d1cad0945be (diff) | |
Change Namespace in TER library
Diffstat (limited to 'mert')
| -rw-r--r-- | mert/TER/tercalc.cpp | 6 | ||||
| -rw-r--r-- | mert/TER/tercalc.h | 4 | ||||
| -rw-r--r-- | mert/TER/tools.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mert/TER/tercalc.cpp b/mert/TER/tercalc.cpp index ad7a5a15a..fac17c82b 100644 --- a/mert/TER/tercalc.cpp +++ b/mert/TER/tercalc.cpp @@ -892,7 +892,7 @@ namespace TERCPPNS_TERCpp } } - vector<vecTerShift> * terCalc::calculerPermutations ( vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCpp::terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign ) + vector<vecTerShift> * terCalc::calculerPermutations ( vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCPPNS_TERCpp::terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign ) { vector<vecTerShift> * allshifts = new vector<vecTerShift>(0); // to_return.clear(); @@ -1072,11 +1072,11 @@ namespace TERCPPNS_TERCpp } - alignmentStruct terCalc::permuter ( vector< string >& words, TERCpp::terShift& s ) + alignmentStruct terCalc::permuter ( vector< string >& words, TERCPPNS_TERCpp::terShift& s ) { return permuter ( words, s.start, s.end, s.newloc ); } - alignmentStruct terCalc::permuter ( vector< string >& words, TERCpp::terShift* s ) + alignmentStruct terCalc::permuter ( vector< string >& words, TERCPPNS_TERCpp::terShift* s ) { return permuter ( words, s->start, s->end, s->newloc ); } diff --git a/mert/TER/tercalc.h b/mert/TER/tercalc.h index bb1c68f15..7fac9d4e3 100644 --- a/mert/TER/tercalc.h +++ b/mert/TER/tercalc.h @@ -98,9 +98,9 @@ namespace TERCPPNS_TERCpp terAlignment TER ( vector<string>& hyp, vector<string>& ref , float avRefLength ); terAlignment TER ( vector<string>& hyp, vector<string>& ref ); terAlignment TER ( vector<int>& hyp, vector<int>& ref ); - bestShiftStruct * findBestShift ( vector< string >& cur, vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCpp::terAlignment& med_align ); + bestShiftStruct * findBestShift ( vector< string >& cur, vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCPPNS_TERCpp::terAlignment& med_align ); void calculateTerAlignment ( terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign ); - vector<vecTerShift> * calculerPermutations ( vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCpp::terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign ); + vector<vecTerShift> * calculerPermutations ( vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCPPNS_TERCpp::terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign ); alignmentStruct permuter ( vector<string>& words, terShift& s ); alignmentStruct permuter ( vector<string>& words, terShift* s ); alignmentStruct permuter ( vector<string>& words, int start, int end, int newloc ); diff --git a/mert/TER/tools.cpp b/mert/TER/tools.cpp index 3c14884df..d03deb1f9 100644 --- a/mert/TER/tools.cpp +++ b/mert/TER/tools.cpp @@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "tools.h" using namespace std; -using namespace TERCPPNS_boost::xpressive; +using namespace boost::xpressive; namespace TERCPPNS_Tools { |