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/06/22 21:12:00 UTC
[3/3] incubator-joshua git commit: Merge branch 'fhieber-owner'
Merge branch 'fhieber-owner'
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/f3a51183
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/f3a51183
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/f3a51183
Branch: refs/heads/master
Commit: f3a511836d139f270ce2ffaeefd39090b3cbb826
Parents: 2b5b4dc fd8867d
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jun 22 17:11:52 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jun 22 17:11:52 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/joshua/decoder/Decoder.java | 26 +++---
.../joshua/decoder/chart_parser/Chart.java | 2 +-
.../joshua/decoder/ff/ArityPhrasePenalty.java | 11 +--
.../joshua/decoder/ff/LexicalFeatures.java | 8 +-
.../apache/joshua/decoder/ff/OOVPenalty.java | 10 ++-
.../apache/joshua/decoder/ff/PhraseModel.java | 25 +++---
.../apache/joshua/decoder/ff/PhrasePenalty.java | 15 ++--
.../apache/joshua/decoder/ff/RuleCountBin.java | 7 +-
.../org/apache/joshua/decoder/ff/RuleFF.java | 9 ++-
.../decoder/ff/fragmentlm/FragmentLMFF.java | 11 ++-
.../joshua/decoder/ff/tm/AbstractGrammar.java | 30 +++----
.../apache/joshua/decoder/ff/tm/Grammar.java | 2 +-
.../apache/joshua/decoder/ff/tm/OwnerId.java | 52 ++++++++++++
.../apache/joshua/decoder/ff/tm/OwnerMap.java | 83 ++++++++++++++++++++
.../org/apache/joshua/decoder/ff/tm/Rule.java | 20 ++---
.../decoder/ff/tm/SentenceFilteredGrammar.java | 2 +-
.../tm/hash_based/MemoryBasedBatchGrammar.java | 43 ++++------
.../decoder/ff/tm/packed/PackedGrammar.java | 14 ++--
.../GrammarBuilderWalkerFunction.java | 3 +-
.../decoder/hypergraph/HyperGraphPruning.java | 2 +-
.../joshua/decoder/phrase/PhraseTable.java | 10 ++-
.../apache/joshua/decoder/phrase/Stacks.java | 4 +-
.../class_lm/ClassBasedLanguageModelTest.java | 3 +-
.../joshua/decoder/ff/tm/OwnerMapTest.java | 39 +++++++++
.../apache/joshua/system/AlignmentMapTest.java | 3 +-
25 files changed, 307 insertions(+), 127 deletions(-)
----------------------------------------------------------------------