Merge branch 'master' of github.com:moses-smt/mosesdecoder

This commit is contained in:
Kenneth Heafield 2011-11-22 12:55:17 -05:00
commit cc7edff099
4 changed files with 3 additions and 5 deletions

View File

@ -65,7 +65,7 @@ project : default-build
project : requirements
<threading>multi:<define>WITH_THREADS
<threading>multi:<library>boost_thread
<define>_FILE_OFFSET_BITS=64 <define>_LARGE_FILES <define>USE_HYPO_POOL
<define>_FILE_OFFSET_BITS=64 <define>_LARGE_FILES
$(trace)
;

View File

@ -43,7 +43,7 @@ Parameter::Parameter()
AddParam("beam-threshold", "b", "threshold for threshold pruning");
AddParam("config", "f", "location of the configuration file");
AddParam("continue-partial-translation", "cpt", "start from nonempty hypothesis");
AddParam("decode-graph-backoff", "dpb", "only use subsequent decoding paths for unknown spans of given length");
AddParam("decoding-graph-backoff", "dpb", "only use subsequent decoding paths for unknown spans of given length");
AddParam("drop-unknown", "du", "drop unknown words instead of copying them");
AddParam("disable-discarding", "dd", "disable hypothesis discarding");
AddParam("factor-delimiter", "fd", "specify a different factor delimiter than the default");

View File

@ -1044,8 +1044,6 @@ bool StaticData::LoadPhraseTables()
for (size_t currScore = 0 ; currScore < numScoreComponent; currScore++)
weight.push_back(weightAll[weightAllOffset + currScore]);
cerr << weight.size() << endl;
if(weight.size() - tableInputScores != numScoreComponent) {
stringstream strme;
strme << "Your phrase table has " << numScoreComponent

View File

@ -8,7 +8,7 @@ clean:
$(CXX) -O6 -g -c $<
score: score.cpp reordering_classes.o
$(CXX) -lz score.cpp reordering_classes.o -o score
$(CXX) score.cpp reordering_classes.o -lz -o score
#reordering_classes.o: reordering_classes.h reordering_classes.cpp
# $(CXX) reordering_classes.cpp