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/08/23 13:15:49 UTC

[4/4] incubator-joshua git commit: Merge branch '7-feature_refactoring' into 7

Merge branch '7-feature_refactoring' into 7


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

Branch: refs/heads/7
Commit: 82f9183ee6fd2e0f1ff616ed92845064b92d9b76
Parents: 0ad45cc 20afddf
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 23 08:11:34 2016 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 23 08:11:34 2016 -0500

----------------------------------------------------------------------
 .../resources/kbest_extraction/joshua.config    |   4 +-
 joshua-core/resources/wa_grammar.packed/config  |   2 +-
 .../resources/wa_grammar.packed/encoding        | Bin 154 -> 154 bytes
 .../wa_grammar.packed/slice_00000.source        | Bin 204 -> 204 bytes
 .../wa_grammar.packed/slice_00000.target        | Bin 128 -> 128 bytes
 .../resources/wa_grammar.packed/vocabulary      | Bin 238 -> 187 bytes
 .../java/org/apache/joshua/decoder/BLEU.java    |   2 +-
 .../java/org/apache/joshua/decoder/Decoder.java |  95 +---
 .../apache/joshua/decoder/DecoderThread.java    |   2 +-
 .../joshua/decoder/JoshuaConfiguration.java     |   7 +-
 .../joshua/decoder/StructuredTranslation.java   |   3 -
 .../decoder/StructuredTranslationFactory.java   |   5 +-
 .../org/apache/joshua/decoder/Translation.java  |  16 +-
 .../decoder/chart_parser/ComputeNodeResult.java |  15 +-
 .../joshua/decoder/ff/ArityPhrasePenalty.java   |   3 +-
 .../joshua/decoder/ff/FeatureFunction.java      |  63 +--
 .../apache/joshua/decoder/ff/FeatureMap.java    | 107 +++++
 .../apache/joshua/decoder/ff/FeatureVector.java | 401 ++++-------------
 .../joshua/decoder/ff/LabelCombinationFF.java   |   4 +-
 .../joshua/decoder/ff/LabelSubstitutionFF.java  |   8 +-
 .../joshua/decoder/ff/LexicalFeatures.java      |  31 +-
 .../apache/joshua/decoder/ff/OOVPenalty.java    |  22 +-
 .../apache/joshua/decoder/ff/PhraseModel.java   |  85 +---
 .../apache/joshua/decoder/ff/PhrasePenalty.java |  19 +-
 .../apache/joshua/decoder/ff/RuleCountBin.java  |  77 ----
 .../org/apache/joshua/decoder/ff/RuleFF.java    |  20 +-
 .../apache/joshua/decoder/ff/RuleLength.java    |  12 +-
 .../org/apache/joshua/decoder/ff/RuleShape.java |  12 +-
 .../apache/joshua/decoder/ff/SourcePathFF.java  |  12 +-
 .../apache/joshua/decoder/ff/TargetBigram.java  |   8 +-
 .../apache/joshua/decoder/ff/WordPenalty.java   |  15 +-
 .../decoder/ff/fragmentlm/FragmentLMFF.java     |  54 +--
 .../joshua/decoder/ff/fragmentlm/Tree.java      |  16 +-
 .../joshua/decoder/ff/lm/LanguageModelFF.java   |  43 +-
 .../ff/lm/StateMinimizingLanguageModel.java     |   8 +-
 .../joshua/decoder/ff/phrase/Distortion.java    |  19 +-
 .../ff/similarity/EdgePhraseSimilarityFF.java   |   4 +-
 .../joshua/decoder/ff/tm/AbstractGrammar.java   |   4 +-
 .../apache/joshua/decoder/ff/tm/Grammar.java    |   7 -
 .../joshua/decoder/ff/tm/GrammarReader.java     |  44 +-
 .../org/apache/joshua/decoder/ff/tm/Rule.java   | 440 +++++--------------
 .../joshua/decoder/ff/tm/RuleFactory.java       |  88 ++++
 .../decoder/ff/tm/format/HieroFormatReader.java |  28 +-
 .../decoder/ff/tm/format/MosesFormatReader.java |  18 +-
 .../tm/hash_based/MemoryBasedBatchGrammar.java  |  96 ++--
 .../ff/tm/hash_based/MemoryBasedRuleBin.java    |   6 +-
 .../decoder/ff/tm/packed/PackedGrammar.java     | 157 +++----
 .../hypergraph/FeatureVectorExtractor.java      |   6 +-
 .../GrammarBuilderWalkerFunction.java           |  35 +-
 .../joshua/decoder/hypergraph/HyperGraph.java   |   2 +-
 .../decoder/hypergraph/KBestExtractor.java      |  25 +-
 .../hypergraph/OutputStringExtractor.java       |   2 +-
 .../decoder/hypergraph/ViterbiExtractor.java    |   5 +-
 .../decoder/hypergraph/WordAlignmentState.java  |   4 +-
 .../apache/joshua/decoder/phrase/Candidate.java |   2 +-
 .../joshua/decoder/phrase/Hypothesis.java       |  11 +-
 .../joshua/decoder/phrase/PhraseChart.java      |   2 +-
 .../joshua/decoder/phrase/PhraseTable.java      |  23 +-
 .../org/apache/joshua/decoder/phrase/Stack.java |   8 +-
 .../joshua/oracle/OracleExtractionHG.java       |   2 +-
 .../org/apache/joshua/server/ServerThread.java  |  26 +-
 .../org/apache/joshua/tools/GrammarPacker.java  |  77 ++--
 .../java/org/apache/joshua/util/Constants.java  |  10 +-
 .../apache/joshua/util/PackedGrammarServer.java |   8 +-
 .../util/encoding/EncoderConfiguration.java     |   5 +-
 .../util/encoding/FeatureTypeAnalyzer.java      |  10 +-
 .../joshua/decoder/ff/FeatureVectorTest.java    | 120 +++++
 .../decoder/ff/lm/LanguageModelFFTest.java      |   5 +-
 .../lm/berkeley_lm/LMGrammarBerkeleyTest.java   |   8 +-
 .../class_lm/ClassBasedLanguageModelTest.java   |   7 +-
 .../joshua/decoder/ff/tm/OwnerMapTest.java      |  18 +
 .../joshua/decoder/ff/tm/RuleFactoryTest.java   |  42 ++
 .../kbest_extraction/KBestExtractionTest.java   |   6 +-
 .../apache/joshua/system/AlignmentMapTest.java  |   8 +-
 .../apache/joshua/system/LmOovFeatureTest.java  |   2 +-
 .../joshua/system/StructuredOutputTest.java     |  27 +-
 .../system/StructuredTranslationTest.java       |  77 ++--
 77 files changed, 1098 insertions(+), 1567 deletions(-)
----------------------------------------------------------------------