diff options
author | phikoehn <pkoehn@inf.ed.ac.uk> | 2012-09-03 10:21:47 +0400 |
---|---|---|
committer | phikoehn <pkoehn@inf.ed.ac.uk> | 2012-09-03 10:21:47 +0400 |
commit | d99f97297f9e343386f1dd15cb4ec6ac0a0c7cfa (patch) | |
tree | ebac77174d71c602d3002ae450c5e1c9207c861c /phrase-extract | |
parent | 4a1a995878ed069dd4d77e0ac6c1727dc223ebe6 (diff) |
merges
Diffstat (limited to 'phrase-extract')
-rw-r--r-- | phrase-extract/extract-rules.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/phrase-extract/extract-rules.cpp b/phrase-extract/extract-rules.cpp index 252547557..f031df8e4 100644 --- a/phrase-extract/extract-rules.cpp +++ b/phrase-extract/extract-rules.cpp @@ -116,14 +116,10 @@ int main(int argc, char* argv[]) << "rule extraction from an aligned parallel corpus\n"; RuleExtractionOptions options; -<<<<<<< HEAD int sentenceOffset = 0; #ifdef WITH_THREADS int thread_count = 1; #endif -======= - ->>>>>>> b317522563feb4ca7ff978a0de661ec2189934ea if (argc < 5) { cerr << "syntax: extract-rules corpus.target corpus.source corpus.align extract [" @@ -267,7 +263,6 @@ int main(int argc, char* argv[]) options.unpairedExtractFormat = true; } else if (strcmp(argv[i],"--ConditionOnTargetLHS") == 0) { options.conditionOnTargetLhs = true; -<<<<<<< HEAD #ifdef WITH_THREADS } else if (strcmp(argv[i],"-threads") == 0 || strcmp(argv[i],"--threads") == 0 || @@ -280,8 +275,6 @@ int main(int argc, char* argv[]) exit(1); } sentenceOffset = atoi(argv[++i]); -======= ->>>>>>> b317522563feb4ca7ff978a0de661ec2189934ea } else { cerr << "extract: syntax error, unknown option '" << string(argv[i]) << "'\n"; exit(1); |