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/24 19:46:02 UTC

[41/41] incubator-joshua git commit: Merge branch 'master' into JOSHUA-304

Merge branch 'master' into JOSHUA-304


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

Branch: refs/heads/JOSHUA-304
Commit: fb5d35da0999fe6533b91b6076a4c4032d5d6710
Parents: 255927d 0744ebf
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Aug 24 15:44:44 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Aug 24 15:44:44 2016 -0400

----------------------------------------------------------------------
 CHANGELOG                                       |    7 +
 demo/README.md                                  |    2 +-
 demo/apache_joshua_logo.png                     |  Bin 0 -> 306617 bytes
 demo/apache_joshua_logo_faded.png               |  Bin 0 -> 309216 bytes
 demo/demo.config                                |    3 +
 demo/demo.js                                    |   19 +-
 demo/index.html                                 |   37 +-
 examples/README.md                              |   36 +-
 pom.xml                                         |   30 +-
 resources/berkeley_lm/lm                        |   16 -
 resources/berkeley_lm/lm.berkeleylm             |  Bin 4294 -> 0 bytes
 resources/berkeley_lm/lm.berkeleylm.gz          |  Bin 1786 -> 0 bytes
 resources/berkeley_lm/lm.gz                     |  Bin 162 -> 0 bytes
 resources/grammar.glue                          |    4 -
 resources/kbest_extraction/glue-grammar         |    3 -
 resources/kbest_extraction/grammar              |   25 -
 resources/kbest_extraction/joshua.config        |   27 -
 resources/kbest_extraction/lm.gz                |  Bin 2466496 -> 0 bytes
 resources/kbest_extraction/output.gold          | 3126 ------------------
 resources/kbest_extraction/output.scores.gold   | 3126 ------------------
 resources/kenlm/oilers.kenlm                    |  Bin 49011 -> 0 bytes
 resources/lm_oov/joshua.config                  |   17 -
 resources/phrase_decoder/config                 |   29 -
 resources/phrase_decoder/constrained.config     |   28 -
 .../phrase_decoder/constrained.output.gold      |    5 -
 resources/phrase_decoder/lm.1.gz                |  Bin 2235 -> 0 bytes
 resources/phrase_decoder/output.gold            |    1 -
 resources/phrase_decoder/rules.1.gz             |  Bin 2998042 -> 0 bytes
 resources/wa_grammar                            |    3 -
 resources/wa_grammar.packed/config              |    2 -
 resources/wa_grammar.packed/encoding            |  Bin 154 -> 0 bytes
 .../wa_grammar.packed/slice_00000.alignments    |  Bin 45 -> 0 bytes
 .../wa_grammar.packed/slice_00000.features      |  Bin 47 -> 0 bytes
 resources/wa_grammar.packed/slice_00000.source  |  Bin 204 -> 0 bytes
 resources/wa_grammar.packed/slice_00000.target  |  Bin 128 -> 0 bytes
 .../wa_grammar.packed/slice_00000.target.lookup |  Bin 32 -> 0 bytes
 resources/wa_grammar.packed/vocabulary          |  Bin 238 -> 0 bytes
 .../org/apache/joshua/adagrad/AdaGradCore.java  |  101 +-
 .../org/apache/joshua/adagrad/Optimizer.java    |  348 +-
 .../org/apache/joshua/corpus/BasicPhrase.java   |    2 +-
 .../apache/joshua/corpus/ContiguousPhrase.java  |    8 +-
 .../java/org/apache/joshua/corpus/Phrase.java   |    2 +-
 .../java/org/apache/joshua/corpus/Span.java     |    6 +-
 .../org/apache/joshua/corpus/SymbolTable.java   |    2 +-
 .../org/apache/joshua/corpus/Vocabulary.java    |   10 +-
 .../joshua/corpus/syntax/ArraySyntaxTree.java   |   51 +-
 .../apache/joshua/corpus/syntax/SyntaxTree.java |   10 +-
 .../org/apache/joshua/decoder/ArgsParser.java   |    8 +-
 .../java/org/apache/joshua/decoder/BLEU.java    |   72 +-
 .../java/org/apache/joshua/decoder/Decoder.java |   28 +-
 .../apache/joshua/decoder/DecoderThread.java    |    2 +-
 .../joshua/decoder/JoshuaConfiguration.java     |   45 +-
 .../joshua/decoder/NbestMinRiskReranker.java    |   33 +-
 .../joshua/decoder/StructuredTranslation.java   |    9 +-
 .../decoder/StructuredTranslationFactory.java   |    5 +-
 .../org/apache/joshua/decoder/Translation.java  |    8 +-
 .../org/apache/joshua/decoder/Translations.java |    2 +-
 .../joshua/decoder/chart_parser/Cell.java       |   12 +-
 .../joshua/decoder/chart_parser/Chart.java      |   51 +-
 .../decoder/chart_parser/ComputeNodeResult.java |    8 +-
 .../decoder/chart_parser/CubePruneState.java    |   20 +-
 .../joshua/decoder/chart_parser/DotChart.java   |   24 +-
 .../joshua/decoder/chart_parser/SourcePath.java |    4 +-
 .../decoder/chart_parser/StateConstraint.java   |    5 +-
 .../joshua/decoder/chart_parser/SuperNode.java  |    2 +-
 .../joshua/decoder/ff/FeatureFunction.java      |   24 +-
 .../apache/joshua/decoder/ff/FeatureVector.java |   21 +-
 .../joshua/decoder/ff/LabelCombinationFF.java   |    2 +-
 .../joshua/decoder/ff/LabelSubstitutionFF.java  |    8 +-
 .../joshua/decoder/ff/LexicalFeatures.java      |    2 +-
 .../apache/joshua/decoder/ff/OOVPenalty.java    |    7 +-
 .../apache/joshua/decoder/ff/PhraseModel.java   |    2 +-
 .../apache/joshua/decoder/ff/PhrasePenalty.java |    4 +-
 .../org/apache/joshua/decoder/ff/RuleFF.java    |    6 +-
 .../decoder/ff/RulePropertiesQuerying.java      |    6 +-
 .../org/apache/joshua/decoder/ff/RuleShape.java |    2 +-
 .../joshua/decoder/ff/SourceDependentFF.java    |    4 +-
 .../apache/joshua/decoder/ff/SourcePathFF.java  |    2 +-
 .../apache/joshua/decoder/ff/TargetBigram.java  |   13 +-
 .../ff/fragmentlm/ConcatenationIterator.java    |   10 +-
 .../decoder/ff/fragmentlm/FragmentLMFF.java     |   59 +-
 .../ff/fragmentlm/PennTreebankReader.java       |   17 +-
 .../joshua/decoder/ff/fragmentlm/Tree.java      |   56 +-
 .../joshua/decoder/ff/fragmentlm/Trees.java     |    8 +-
 .../org/apache/joshua/decoder/ff/lm/KenLM.java  |   26 +-
 .../joshua/decoder/ff/lm/LanguageModelFF.java   |   39 +-
 .../ff/lm/berkeley_lm/LMGrammarBerkeley.java    |    4 +-
 .../ff/lm/bloomfilter_lm/BloomFilter.java       |    2 +-
 .../BloomFilterLanguageModel.java               |   18 +-
 .../joshua/decoder/ff/lm/buildin_lm/TrieLM.java |   25 +-
 .../joshua/decoder/ff/phrase/Distortion.java    |    2 +-
 .../ff/similarity/EdgePhraseSimilarityFF.java   |   17 +-
 .../ff/state_maintenance/NgramDPState.java      |    6 +-
 .../joshua/decoder/ff/tm/AbstractGrammar.java   |   12 +-
 .../decoder/ff/tm/BasicRuleCollection.java      |    2 +-
 .../joshua/decoder/ff/tm/CreateGlueGrammar.java |    2 +-
 .../joshua/decoder/ff/tm/GrammarReader.java     |    2 +-
 .../apache/joshua/decoder/ff/tm/OwnerMap.java   |    2 +-
 .../org/apache/joshua/decoder/ff/tm/Rule.java   |   67 +-
 .../decoder/ff/tm/SentenceFilteredGrammar.java  |   12 +-
 .../decoder/ff/tm/format/MosesFormatReader.java |    2 +-
 .../ff/tm/hash_based/ExtensionIterator.java     |    2 +-
 .../tm/hash_based/MemoryBasedBatchGrammar.java  |    8 +-
 .../decoder/ff/tm/packed/PackedGrammar.java     |   87 +-
 .../ff/tm/packed/SliceAggregatingTrie.java      |    4 +-
 .../decoder/hypergraph/AlignedSourceTokens.java |    2 +-
 .../decoder/hypergraph/AllSpansWalker.java      |   19 +-
 .../hypergraph/DefaultInsideOutside.java        |   34 +-
 .../joshua/decoder/hypergraph/ForestWalker.java |   10 +-
 .../GrammarBuilderWalkerFunction.java           |   14 +-
 .../joshua/decoder/hypergraph/HGNode.java       |   54 +-
 .../joshua/decoder/hypergraph/HyperEdge.java    |    6 +-
 .../joshua/decoder/hypergraph/HyperGraph.java   |   30 +-
 .../decoder/hypergraph/HyperGraphPruning.java   |    9 +-
 .../decoder/hypergraph/KBestExtractor.java      |   51 +-
 .../hypergraph/OutputStringExtractor.java       |    8 +-
 .../hypergraph/StringToTreeConverter.java       |   16 +-
 .../decoder/hypergraph/ViterbiExtractor.java    |   10 +-
 .../hypergraph/WordAlignmentExtractor.java      |    2 +-
 .../decoder/hypergraph/WordAlignmentState.java  |    8 +-
 .../apache/joshua/decoder/io/JSONMessage.java   |   18 +-
 .../decoder/io/TranslationRequestStream.java    |    6 +-
 .../apache/joshua/decoder/phrase/Candidate.java |   38 +-
 .../apache/joshua/decoder/phrase/Coverage.java  |    2 +-
 .../apache/joshua/decoder/phrase/Future.java    |    8 +-
 .../apache/joshua/decoder/phrase/Header.java    |   87 +
 .../joshua/decoder/phrase/Hypothesis.java       |    5 +-
 .../joshua/decoder/phrase/PhraseChart.java      |   73 +-
 .../joshua/decoder/phrase/PhraseNodes.java      |   58 +
 .../joshua/decoder/phrase/PhraseTable.java      |    4 +-
 .../org/apache/joshua/decoder/phrase/Stack.java |   13 +-
 .../apache/joshua/decoder/phrase/Stacks.java    |   25 +-
 .../joshua/decoder/phrase/TargetPhrases.java    |   87 -
 .../decoder/segment_file/ConstraintRule.java    |    4 +-
 .../joshua/decoder/segment_file/Sentence.java   |   18 +-
 .../joshua/decoder/segment_file/Token.java      |    9 +-
 .../java/org/apache/joshua/pro/PROCore.java     |   22 +-
 .../org/apache/joshua/server/ServerThread.java  |    9 +-
 .../LMBerkeleySentenceProbablityTest.java       |    4 +-
 .../lm/berkeley_lm/LMGrammarBerkeleyTest.java   |   10 +-
 .../class_lm/ClassBasedLanguageModelTest.java   |    4 +-
 .../kbest_extraction/KBestExtractionTest.java   |    4 +-
 .../phrase/decode/PhraseDecodingTest.java       |   14 +-
 .../org/apache/joshua/system/KenLmTest.java     |    2 +-
 .../apache/joshua/system/LmOovFeatureTest.java  |   13 +-
 .../system/MultithreadedTranslationTests.java   |    4 +-
 .../joshua/system/StructuredOutputTest.java     |    4 +-
 .../system/StructuredTranslationTest.java       |    4 +-
 src/test/resources/berkeley_lm/lm               |   16 +
 src/test/resources/berkeley_lm/lm.berkeleylm    |  Bin 0 -> 4294 bytes
 src/test/resources/berkeley_lm/lm.berkeleylm.gz |  Bin 0 -> 1786 bytes
 src/test/resources/berkeley_lm/lm.gz            |  Bin 0 -> 162 bytes
 src/test/resources/grammar.glue                 |    4 +
 .../resources/kbest_extraction/glue-grammar     |    3 +
 src/test/resources/kbest_extraction/grammar     |   25 +
 .../resources/kbest_extraction/joshua.config    |   27 +
 src/test/resources/kbest_extraction/lm.gz       |  Bin 0 -> 2466496 bytes
 src/test/resources/kbest_extraction/output.gold | 3126 ++++++++++++++++++
 .../kbest_extraction/output.scores.gold         | 3126 ++++++++++++++++++
 src/test/resources/kenlm/oilers.kenlm           |  Bin 0 -> 49011 bytes
 src/test/resources/lm_oov/joshua.config         |   17 +
 src/test/resources/phrase_decoder/config        |   29 +
 .../resources/phrase_decoder/constrained.config |   28 +
 .../phrase_decoder/constrained.output.gold      |    5 +
 src/test/resources/phrase_decoder/lm.1.gz       |  Bin 0 -> 2235 bytes
 src/test/resources/phrase_decoder/output.gold   |    1 +
 src/test/resources/phrase_decoder/rules.1.gz    |  Bin 0 -> 2998042 bytes
 src/test/resources/wa_grammar                   |    3 +
 src/test/resources/wa_grammar.packed/config     |    2 +
 src/test/resources/wa_grammar.packed/encoding   |  Bin 0 -> 154 bytes
 .../wa_grammar.packed/slice_00000.alignments    |  Bin 0 -> 45 bytes
 .../wa_grammar.packed/slice_00000.features      |  Bin 0 -> 47 bytes
 .../wa_grammar.packed/slice_00000.source        |  Bin 0 -> 204 bytes
 .../wa_grammar.packed/slice_00000.target        |  Bin 0 -> 128 bytes
 .../wa_grammar.packed/slice_00000.target.lookup |  Bin 0 -> 32 bytes
 src/test/resources/wa_grammar.packed/vocabulary |  Bin 0 -> 238 bytes
 176 files changed, 7633 insertions(+), 7619 deletions(-)
----------------------------------------------------------------------