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/13 16:53:15 UTC

[09/12] incubator-joshua git commit: Merge branch 'master' of https://github.com/apache/incubator-joshua

Merge branch 'master' of https://github.com/apache/incubator-joshua


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/831c8c39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/831c8c39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/831c8c39

Branch: refs/heads/master
Commit: 831c8c392b8b4b4ff6484f7555b978d5c520ba24
Parents: de364bd 90fff5a
Author: Michael A. Hedderich <mi...@users.noreply.github.com>
Authored: Tue Sep 13 18:11:49 2016 +0200
Committer: Michael A. Hedderich <mi...@users.noreply.github.com>
Committed: Tue Sep 13 18:11:49 2016 +0200

----------------------------------------------------------------------
 jni/kenlm_wrap.cc                               | 144 +++++++++----------
 .../org/apache/joshua/decoder/KenLMPool.java    |  42 ++++++
 .../decoder/LanguageModelStateManager.java      |  29 ++++
 .../org/apache/joshua/decoder/Translation.java  |  17 +--
 .../org/apache/joshua/decoder/ff/lm/KenLM.java  |  24 ++--
 .../ff/lm/StateMinimizingLanguageModel.java     |  30 +---
 .../joshua/decoder/segment_file/Sentence.java   |  11 ++
 .../org/apache/joshua/system/KenLmTest.java     |  30 ++++
 .../decoder/phrase/constrained/corpus.es        |   1 -
 .../decoder/phrase/constrained/glue.grammar     |   3 -
 .../decoder/phrase/constrained/joshua.config    |  29 ----
 .../decoder/phrase/constrained/output.gold      |   5 -
 .../decoder/phrase/constrained/test.sh          |  32 -----
 src/test/resources/decoder/phrase/decode/config |  29 ----
 .../decoder/phrase/decode/config.packed         |  29 ----
 .../resources/decoder/phrase/decode/corpus.es   |   1 -
 .../resources/decoder/phrase/decode/lm.1.gz     | Bin 2235 -> 0 bytes
 .../resources/decoder/phrase/decode/output.gold |   1 -
 .../resources/decoder/phrase/decode/rules.1.gz  | Bin 2998042 -> 0 bytes
 .../decoder/phrase/decode/rules.packed/config   |   2 -
 .../decoder/phrase/decode/rules.packed/encoding | Bin 87 -> 0 bytes
 .../decode/rules.packed/slice_00000.features    | Bin 4128858 -> 0 bytes
 .../decode/rules.packed/slice_00000.source      | Bin 1982228 -> 0 bytes
 .../decode/rules.packed/slice_00000.target      | Bin 1463856 -> 0 bytes
 .../rules.packed/slice_00000.target.lookup      | Bin 28 -> 0 bytes
 .../phrase/decode/rules.packed/vocabulary       | Bin 169225 -> 0 bytes
 .../decoder/phrase/decode/test-packed.sh        |  32 -----
 .../resources/decoder/phrase/decode/test.sh     |  17 ---
 src/test/resources/phrase_decoder/config.packed |  29 ++++
 .../phrase_decoder/rules.packed/config          |   2 +
 .../phrase_decoder/rules.packed/encoding        | Bin 0 -> 87 bytes
 .../rules.packed/slice_00000.features           | Bin 0 -> 4128858 bytes
 .../rules.packed/slice_00000.source             | Bin 0 -> 1982228 bytes
 .../rules.packed/slice_00000.target             | Bin 0 -> 1463856 bytes
 .../rules.packed/slice_00000.target.lookup      | Bin 0 -> 28 bytes
 .../phrase_decoder/rules.packed/vocabulary      | Bin 0 -> 169225 bytes
 36 files changed, 227 insertions(+), 312 deletions(-)
----------------------------------------------------------------------