Change Namespace in TER library

This commit is contained in:
Christophe SERVAN 2015-02-16 19:46:25 +01:00
parent d0ff70decc
commit 90471e22a8
3 changed files with 6 additions and 6 deletions

View File

@ -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); vector<vecTerShift> * allshifts = new vector<vecTerShift>(0);
// to_return.clear(); // 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 ); 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 ); return permuter ( words, s->start, s->end, s->newloc );
} }

View File

@ -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 , float avRefLength );
terAlignment TER ( vector<string>& hyp, vector<string>& ref ); terAlignment TER ( vector<string>& hyp, vector<string>& ref );
terAlignment TER ( vector<int>& hyp, vector<int>& 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 ); 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, terShift* s ); alignmentStruct permuter ( vector<string>& words, terShift* s );
alignmentStruct permuter ( vector<string>& words, int start, int end, int newloc ); alignmentStruct permuter ( vector<string>& words, int start, int end, int newloc );

View File

@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "tools.h" #include "tools.h"
using namespace std; using namespace std;
using namespace TERCPPNS_boost::xpressive; using namespace boost::xpressive;
namespace TERCPPNS_Tools namespace TERCPPNS_Tools
{ {