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/11/17 18:29:13 UTC

[9/9] incubator-joshua git commit: Merge branch 'save_custom_grammars'

Merge branch 'save_custom_grammars'


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

Branch: refs/heads/master
Commit: f15123bf29f8cbfa00313cf18509d508b1cf6542
Parents: 561799a 8b39f2e
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu Nov 17 13:28:54 2016 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu Nov 17 13:28:54 2016 -0500

----------------------------------------------------------------------
 demo/README.md                                  |  11 +-
 demo/demo.config                                |   3 +
 .../java/org/apache/joshua/decoder/Decoder.java | 120 +++---
 .../joshua/decoder/chart_parser/Chart.java      |   4 +-
 .../apache/joshua/decoder/ff/tm/Grammar.java    |   5 +
 .../decoder/ff/tm/SentenceFilteredGrammar.java  | 366 -------------------
 .../tm/hash_based/MemoryBasedBatchGrammar.java  |  83 ++++-
 .../decoder/ff/tm/packed/PackedGrammar.java     |   5 +
 .../joshua/decoder/phrase/PhraseTable.java      |  10 +
 .../joshua/decoder/segment_file/Token.java      |   2 +-
 .../org/apache/joshua/server/ServerThread.java  |  42 ++-
 src/test/resources/decoder/n-ary/joshua.config  |   2 -
 12 files changed, 193 insertions(+), 460 deletions(-)
----------------------------------------------------------------------