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/28 12:45:49 UTC

[5/6] incubator-joshua git commit: Merge branch 'DirectBuffersRemoveEst' of https://github.com/KellenSunderland/incubator-joshua

Merge branch 'DirectBuffersRemoveEst' of https://github.com/KellenSunderland/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/553e219d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/553e219d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/553e219d

Branch: refs/heads/master
Commit: 553e219db9cdde9f9044cdde72acf30ed6dc7176
Parents: f5492d3 e9f4f5b
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Sep 28 08:44:27 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Sep 28 08:44:27 2016 -0400

----------------------------------------------------------------------
 jni/kenlm_wrap.cc                               |  39 +++---
 .../org/apache/joshua/decoder/KenLMPool.java    |  42 -------
 .../decoder/LanguageModelStateManager.java      |   8 +-
 .../java/org/apache/joshua/decoder/LmPool.java  |  70 +++++++++++
 .../joshua/decoder/ff/FeatureFunction.java      |   2 +-
 .../apache/joshua/decoder/ff/OOVPenalty.java    |   2 +-
 .../apache/joshua/decoder/ff/PhraseModel.java   |   2 +-
 .../apache/joshua/decoder/ff/PhrasePenalty.java |   2 +-
 .../apache/joshua/decoder/ff/StatelessFF.java   |   2 +-
 .../apache/joshua/decoder/ff/TargetBigram.java  |   2 +-
 .../apache/joshua/decoder/ff/WordPenalty.java   |   2 +-
 .../decoder/ff/fragmentlm/FragmentLMFF.java     |   2 +-
 .../org/apache/joshua/decoder/ff/lm/KenLM.java  | 121 +++++++++++--------
 .../joshua/decoder/ff/lm/LanguageModelFF.java   |   2 +-
 .../ff/lm/StateMinimizingLanguageModel.java     |   6 +-
 .../ff/similarity/EdgePhraseSimilarityFF.java   |   2 +-
 .../org/apache/joshua/decoder/ff/tm/Rule.java   |   2 +-
 .../joshua/decoder/segment_file/Sentence.java   |   4 -
 .../java/org/apache/joshua/util/Constants.java  |   1 +
 .../org/apache/joshua/system/KenLmTest.java     |   6 +-
 20 files changed, 186 insertions(+), 133 deletions(-)
----------------------------------------------------------------------