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/04/29 06:47:08 UTC
[06/10] incubator-joshua git commit: Merge branch 'master' of
github.com:KellenSunderland/incubator-joshua into structured_translations
Merge branch 'master' of github.com:KellenSunderland/incubator-joshua into structured_translations
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/62072fe8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/62072fe8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/62072fe8
Branch: refs/heads/master
Commit: 62072fe80f457f3dd8273b50f528937ac9635250
Parents: 051cc48 282d526
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu Apr 28 19:49:19 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu Apr 28 19:49:19 2016 -0400
----------------------------------------------------------------------
jni/kenlm_wrap.cc | 57 ++++-
resources/berkeley_lm/lm | 16 ++
resources/berkeley_lm/lm.berkeleylm | Bin 0 -> 4294 bytes
resources/berkeley_lm/lm.berkeleylm.gz | Bin 0 -> 1786 bytes
resources/berkeley_lm/lm.gz | Bin 0 -> 162 bytes
resources/wa_grammar | 6 +-
src/joshua/decoder/Decoder.java | 4 +
src/joshua/decoder/JoshuaConfiguration.java | 11 +-
src/joshua/decoder/StructuredTranslation.java | 72 ++----
src/joshua/decoder/Translation.java | 182 +++++--------
src/joshua/decoder/chart_parser/Cell.java | 62 ++---
src/joshua/decoder/chart_parser/Chart.java | 8 +-
src/joshua/decoder/ff/lm/KenLM.java | 35 ++-
src/joshua/decoder/ff/lm/LanguageModelFF.java | 28 +-
.../decoder/hypergraph/AlignedSourceTokens.java | 18 ++
.../decoder/hypergraph/AllSpansWalker.java | 4 +-
.../hypergraph/FeatureVectorExtractor.java | 80 ++++++
src/joshua/decoder/hypergraph/ForestWalker.java | 14 +-
.../GrammarBuilderWalkerFunction.java | 2 +-
src/joshua/decoder/hypergraph/HGNode.java | 2 -
src/joshua/decoder/hypergraph/HyperGraph.java | 10 +-
.../decoder/hypergraph/KBestExtractor.java | 254 +++++++------------
.../hypergraph/OutputStringExtractor.java | 195 ++++++++++++++
.../decoder/hypergraph/ViterbiExtractor.java | 159 ++++++------
.../ViterbiFeatureVectorWalkerFunction.java | 44 ----
.../ViterbiOutputStringWalkerFunction.java | 96 -------
.../decoder/hypergraph/WalkerFunction.java | 9 +-
.../hypergraph/WordAlignmentExtractor.java | 32 ++-
.../decoder/hypergraph/WordAlignmentState.java | 20 +-
src/joshua/decoder/io/JSONMessage.java | 2 +-
src/joshua/oracle/OracleExtractionHG.java | 6 +-
test/bn-en/hiero/input.bn | 2 +-
.../decoder/ff/lm/LanguageModelFFTest.java | 94 +++++++
.../lm/berkeley_lm/LMGrammarBerkeleyTest.java | 62 +++++
.../kbest_extraction/KBestExtractionTest.java | 20 +-
.../ConstrainedPhraseDecodingTest.java | 20 +-
.../phrase/decode/PhraseDecodingTest.java | 20 +-
tst/joshua/system/AlignmentMapTest.java | 20 +-
tst/joshua/system/KenLmTest.java | 75 +++++-
.../system/MultithreadedTranslationTests.java | 20 +-
tst/joshua/system/StructuredOutputTest.java | 20 +-
.../system/StructuredTranslationTest.java | 49 +++-
tst/joshua/util/FormatUtilsTest.java | 20 +-
43 files changed, 1194 insertions(+), 656 deletions(-)
----------------------------------------------------------------------