You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/09/14 18:22:53 UTC

[25/29] incubator-joshua git commit: Merge branch 'master' into 7

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/732997be/joshua-core/src/test/resources/decoder/n-ary/joshua.config
----------------------------------------------------------------------
diff --cc joshua-core/src/test/resources/decoder/n-ary/joshua.config
index c2b2b48,0000000..1710c50
mode 100644,000000..100644
--- a/joshua-core/src/test/resources/decoder/n-ary/joshua.config
+++ b/joshua-core/src/test/resources/decoder/n-ary/joshua.config
@@@ -1,22 -1,0 +1,24 @@@
- lm = kenlm 5 false false 100 lm.gz
++lm = kenlm 5 false false 100 src/test/resources/decoder/n-ary/lm.gz
 +
- tm = thrax phrase 20 grammar
- tm = thrax glue -1 glue-grammar
++tm = thrax phrase 20 src/test/resources/decoder/n-ary/grammar
++tm = thrax glue -1 src/test/resources/decoder/n-ary/glue-grammar
 +
 +mark_oovs = true
 +
 +default-non-terminal = X
 +goalSymbol = GOAL
 +
 +#pruning config
 +pop-limit = 100
 +
 +#nbest config
 +use_unique_nbest = true
 +use_tree_nbest = false
 +add_combined_cost = true
 +top_n = 1
 +
- weights-file = weights
++output-format = %c %s
++
++weights-file = src/test/resources/decoder/n-ary/weights
 +feature-function = WordPenalty
 +feature-function = OOVPenalty

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/732997be/joshua-core/src/test/resources/decoder/n-ary/output.gold
----------------------------------------------------------------------
diff --cc joshua-core/src/test/resources/decoder/n-ary/output.gold
index e2c051b,0000000..742b98c
mode 100644,000000..100644
--- a/joshua-core/src/test/resources/decoder/n-ary/output.gold
+++ b/joshua-core/src/test/resources/decoder/n-ary/output.gold
@@@ -1,2 -1,0 +1,2 @@@
- 0 ||| Goats eat cheese ||| WordPenalty=-2.171 lm_0=-16.587 tm_glue_0=1.000 ||| -11.503
- 1 ||| i will go home ||| WordPenalty=-2.606 lm_0=-12.155 tm_glue_0=1.000 ||| -4.414
++-11.503 Goats eat cheese
++-4.414 i will go home

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/732997be/joshua-core/src/test/resources/lattice/joshua.config
----------------------------------------------------------------------
diff --cc joshua-core/src/test/resources/lattice/joshua.config
index e3b24c8,0000000..e67cc15
mode 100644,000000..100644
--- a/joshua-core/src/test/resources/lattice/joshua.config
+++ b/joshua-core/src/test/resources/lattice/joshua.config
@@@ -1,47 -1,0 +1,47 @@@
- tm = thrax pt 1 grammar.test
- tm = thrax glue -1 glue-grammar
++tm = thrax pt 1 src/test/resources/lattice/grammar.test
++tm = thrax glue -1 src/test/resources/lattice/glue-grammar
 +
 +#lm config
- lm = berkeleylm 3 false false 100 test.lm
++feature-function = LanguageModel -lm_type berkeleylm -lm_order 3 -lm_file src/test/resources/lattice/test.lm
 +
 +#tm config
 +default_non_terminal=X
 +goalSymbol=GOAL
 +
 +#pruning config
 +pop-limit = 100
 +
 +#nbest config
 +use_unique_nbest = true 
 +include-align-index = false
 +top_n = 300
 +
 +mark-oovs = true
 +
 +# this shouldn't apply to the lattice
 +maxlen = 1
 +
 +lattice-decoding = true
 +
 +output-format = %i ||| %e ||| %s ||| %f ||| %c
 +
 +feature-function = OOVPenalty
 +feature-function = WordPenalty
 +feature-function = SourcePath
 +
 +###### model weights
 +#lm order weight
 +lm_0 1.0
 +
 +#phrasemodel owner column(0-indexed) weight
 +tm_pt_0 1.0
 +tm_pt_1 0.5
 +tm_pt_2 0.5
 +
 +tm_glue_0 0.0
 +
 +#wordpenalty weight
 +WordPenalty -1.0
 +SourcePath 1.0
 +
 +OOVPenalty 1.0