moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-09-20 15:48:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5f0eacce4bd1781356e63f94c0d1d49e0ea81c82' into miramerge

Browse Source 
redone what Barry did before, i.e. including the commit 5f0e (aka r3895) of
trunk into the miramerge branch

status after the merge:
  moses compiles
  even the regression test phrase.basic-surface-only FAILS
    (it did fail identically on the mira branch alone)

I may be accidentally adding some files that should not be here, e.g. boost.m4.

Conflicts:
	Makefile.am
	config.h.in
	configure.in
	m4/boost.m4
	moses/src/Makefile.am
	moses/src/Parameter.cpp
	moses/src/PhraseDictionary.cpp
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	scripts/generic/fsa2plf.pl
This commit is contained in:
Ondrej Bojar 2011-08-18 17:13:46 +02:00
commit 76648c840c
2 changed files with 4 additions and 6344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6343
ltmain.sh
View File

File diff suppressed because it is too large Load Diff

1
ltmain.sh Symbolic link
View File

@ -0,0 +1 @@
/usr/share/libtool/config/ltmain.sh

4
moses/src/Parameter.cpp
View File

@ -136,7 +136,6 @@ Parameter::Parameter()
AddParam("source-label-overlap", "What happens if a span already has a label. 0=add more. 1=replace. 2=discard. Default is 0");
AddParam("output-hypo-score", "Output the hypo score to stdout with the output string. For search error analysis. Default is false");
AddParam("unknown-lhs", "file containing target lhs of unknown words. 1 per line: LHS prob");
AddParam("translation-systems", "specify multiple translation systems, each consisting of an id, followed by a set of models ids, eg '0 T1 R1 L0'");
AddParam("enable-online-command", "enable online commands to change some decoder parameters (default false); if enabled, use-persistent-cache is disabled");
AddParam("discrim-lmodel-file", "Order, factor and vocabulary file for discriminative LM. Use * for filename to indicate unlimited vocabulary.");
@ -149,6 +148,9 @@ Parameter::Parameter()
AddParam("word-translation-feature", "Count feature for word translation according to word alignment");
AddParam("report-sparse-features", "Indicate which sparse feature functions should report detailed scores in n-best, instead of aggregate");
AddParam("show-weights", "print feature weights and exit");
AddParam("translation-systems", "specify multiple translation systems, each consisting of an id, followed by a set of models ids, eg '0 T1 R1 L0'");
AddParam("show-weights", "print feature weights and exit");
AddParam("alignment-output-file", "print output word alignments into given file");
}