diff options
| author | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
|---|---|---|
| committer | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
| commit | e4eb201c52be74fee74399a6f35fcbe8eb85d834 (patch) | |
| tree | 7792ef96d63262f6e28f1857741e1162c7dccbc4 /phrase-extract/DomainFeature.cpp | |
| parent | cea2d9d8bb34a81660974cae20d66aefec4e0468 (diff) | |
| parent | a0b6b6a341e74b47bbef4652ad7fd928cf91e17c (diff) | |
merged master into dynamic-models and solved conflicts
Diffstat (limited to 'phrase-extract/DomainFeature.cpp')
| -rw-r--r-- | phrase-extract/DomainFeature.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/phrase-extract/DomainFeature.cpp b/phrase-extract/DomainFeature.cpp index 0526d058b..4cbaba50c 100644 --- a/phrase-extract/DomainFeature.cpp +++ b/phrase-extract/DomainFeature.cpp @@ -2,9 +2,6 @@ #include "ExtractionPhrasePair.h" #include "tables-core.h" #include "InputFileStream.h" -#include "SafeGetline.h" - -#define TABLE_LINE_MAX_LENGTH 1000 using namespace std; @@ -16,12 +13,11 @@ void Domain::load( const std::string &domainFileName ) { Moses::InputFileStream fileS( domainFileName ); istream *fileP = &fileS; - while(true) { - char line[TABLE_LINE_MAX_LENGTH]; - SAFE_GETLINE((*fileP), line, TABLE_LINE_MAX_LENGTH, '\n', __FILE__); - if (fileP->eof()) break; + + string line; + while(getline(*fileP, line)) { // read - vector< string > domainSpecLine = tokenize( line ); + vector< string > domainSpecLine = tokenize( line.c_str() ); int lineNumber; if (domainSpecLine.size() != 2 || ! sscanf(domainSpecLine[0].c_str(), "%d", &lineNumber)) { |