Thread: [moses-smt/mosesdecoder] 75e038: create namespace for all classes

Brought to you by: bhaddow, bojar, callison-burch, chardmeier, and 7 others

mosesdecoder-commits

[moses-smt/mosesdecoder] 75e038: create namespace for all classes

From: GitHub <no...@gi...> - 2012-07-02 19:09:56

  Branch: refs/heads/master
  Home:   https://github.com/moses-smt/mosesdecoder
  Commit: 75e038f4cf99c76751c479cd30607489a61bbf3b
      https://github.com/moses-smt/mosesdecoder/commit/75e038f4cf99c76751c479cd30607489a61bbf3b
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M mert/pro.cpp
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses-chart-cmd/src/Main.h
    M moses-cmd/src/IOWrapper.cpp
    M moses-cmd/src/IOWrapper.h
    M moses-cmd/src/LatticeMBR.cpp
    M moses-cmd/src/LatticeMBR.h
    M moses-cmd/src/LatticeMBRGrid.cpp
    M moses-cmd/src/Main.cpp
    M phrase-extract/XmlException.h
    M phrase-extract/statistics.cpp

  Log Message:
  -----------
  create namespace for all classes


  Commit: c0140ba2e92f8265c62843bef26f0c23ab784ad7
      https://github.com/moses-smt/mosesdecoder/commit/c0140ba2e92f8265c62843bef26f0c23ab784ad7
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M moses/src/AlignmentInfo.h
    M moses/src/AlignmentInfoCollection.h
    M moses/src/ChartCell.cpp
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartHypothesisCollection.h

  Log Message:
  -----------
  more comments


  Commit: dea9e778a256e99086d77d764e2a88336f96f7ab
      https://github.com/moses-smt/mosesdecoder/commit/dea9e778a256e99086d77d764e2a88336f96f7ab
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M scripts/ems/experiment.perl

  Log Message:
  -----------
  bug creating filtering script when using factored model


  Commit: 5d5ee9e6b1145038d7c21eb974cf40cf2e08232c
      https://github.com/moses-smt/mosesdecoder/commit/5d5ee9e6b1145038d7c21eb974cf40cf2e08232c
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M jam-files/sanity.jam
    M moses/src/Hypothesis.cpp
    M moses/src/Hypothesis.h
    M moses/src/LM/Base.h
    M moses/src/LM/Jamfile
    M moses/src/LM/LDHT.cpp
    M moses/src/LMList.h
    M moses/src/Parameter.cpp
    M moses/src/PhraseDictionaryMemory.cpp
    M moses/src/Search.cpp
    M moses/src/SearchNormal.h
    A moses/src/SearchNormalBatch.cpp
    A moses/src/SearchNormalBatch.h
    M moses/src/TypeDef.h

  Log Message:
  -----------
  Merge branch 'master' of github.com:moses-smt/mosesdecoder


  Commit: 6327721ae277c30778e9548a5a004fa873fe7785
      https://github.com/moses-smt/mosesdecoder/commit/6327721ae277c30778e9548a5a004fa873fe7785
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M mert/pro.cpp
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses-chart-cmd/src/Main.h
    M moses-cmd/src/IOWrapper.cpp
    M moses-cmd/src/IOWrapper.h
    M moses-cmd/src/LatticeMBR.cpp
    M moses-cmd/src/LatticeMBR.h
    M moses-cmd/src/LatticeMBRGrid.cpp
    M moses-cmd/src/Main.cpp
    M moses/src/AlignmentInfo.h
    M moses/src/AlignmentInfoCollection.h
    M moses/src/ChartCell.cpp
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartHypothesisCollection.h
    M phrase-extract/XmlException.h
    M phrase-extract/statistics.cpp

  Log Message:
  -----------
  Merge https://github.com/hieuhoang/mosesdecoder


Compare: https://github.com/moses-smt/mosesdecoder/compare/f5d54a4db02e...6327721ae277

[moses-smt/mosesdecoder] 75e038: create namespace for all classes

From: GitHub <no...@gi...> - 2012-07-07 00:56:42

  Branch: refs/heads/damt_phrase
  Home:   https://github.com/moses-smt/mosesdecoder
  Commit: 75e038f4cf99c76751c479cd30607489a61bbf3b
      https://github.com/moses-smt/mosesdecoder/commit/75e038f4cf99c76751c479cd30607489a61bbf3b
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M mert/pro.cpp
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses-chart-cmd/src/Main.h
    M moses-cmd/src/IOWrapper.cpp
    M moses-cmd/src/IOWrapper.h
    M moses-cmd/src/LatticeMBR.cpp
    M moses-cmd/src/LatticeMBR.h
    M moses-cmd/src/LatticeMBRGrid.cpp
    M moses-cmd/src/Main.cpp
    M phrase-extract/XmlException.h
    M phrase-extract/statistics.cpp

  Log Message:
  -----------
  create namespace for all classes


  Commit: c0140ba2e92f8265c62843bef26f0c23ab784ad7
      https://github.com/moses-smt/mosesdecoder/commit/c0140ba2e92f8265c62843bef26f0c23ab784ad7
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M moses/src/AlignmentInfo.h
    M moses/src/AlignmentInfoCollection.h
    M moses/src/ChartCell.cpp
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartHypothesisCollection.h

  Log Message:
  -----------
  more comments


  Commit: dea9e778a256e99086d77d764e2a88336f96f7ab
      https://github.com/moses-smt/mosesdecoder/commit/dea9e778a256e99086d77d764e2a88336f96f7ab
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M scripts/ems/experiment.perl

  Log Message:
  -----------
  bug creating filtering script when using factored model


  Commit: 5d5ee9e6b1145038d7c21eb974cf40cf2e08232c
      https://github.com/moses-smt/mosesdecoder/commit/5d5ee9e6b1145038d7c21eb974cf40cf2e08232c
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M jam-files/sanity.jam
    M moses/src/Hypothesis.cpp
    M moses/src/Hypothesis.h
    M moses/src/LM/Base.h
    M moses/src/LM/Jamfile
    M moses/src/LM/LDHT.cpp
    M moses/src/LMList.h
    M moses/src/Parameter.cpp
    M moses/src/PhraseDictionaryMemory.cpp
    M moses/src/Search.cpp
    M moses/src/SearchNormal.h
    A moses/src/SearchNormalBatch.cpp
    A moses/src/SearchNormalBatch.h
    M moses/src/TypeDef.h

  Log Message:
  -----------
  Merge branch 'master' of github.com:moses-smt/mosesdecoder


  Commit: 6327721ae277c30778e9548a5a004fa873fe7785
      https://github.com/moses-smt/mosesdecoder/commit/6327721ae277c30778e9548a5a004fa873fe7785
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M mert/pro.cpp
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses-chart-cmd/src/Main.h
    M moses-cmd/src/IOWrapper.cpp
    M moses-cmd/src/IOWrapper.h
    M moses-cmd/src/LatticeMBR.cpp
    M moses-cmd/src/LatticeMBR.h
    M moses-cmd/src/LatticeMBRGrid.cpp
    M moses-cmd/src/Main.cpp
    M moses/src/AlignmentInfo.h
    M moses/src/AlignmentInfoCollection.h
    M moses/src/ChartCell.cpp
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartHypothesisCollection.h
    M phrase-extract/XmlException.h
    M phrase-extract/statistics.cpp

  Log Message:
  -----------
  Merge https://github.com/hieuhoang/mosesdecoder


  Commit: e7faa978b0dfaa04974682b1915ff7c8a8b8222e
      https://github.com/moses-smt/mosesdecoder/commit/e7faa978b0dfaa04974682b1915ff7c8a8b8222e
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M moses/src/SearchNormalBatch.cpp

  Log Message:
  -----------
  comment out include to google profiler


  Commit: cce3f03f7500012a1a430c6ecb203bf7b450e9d5
      https://github.com/moses-smt/mosesdecoder/commit/cce3f03f7500012a1a430c6ecb203bf7b450e9d5
  Author: phikoehn <pk...@in...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M scripts/ems/experiment.perl

  Log Message:
  -----------
  count bin feature


  Commit: ce65a47f0d1395c9c7305396260318fbc6036e5a
      https://github.com/moses-smt/mosesdecoder/commit/ce65a47f0d1395c9c7305396260318fbc6036e5a
  Author: phikoehn <pk...@in...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M phrase-extract/consolidate.cpp
    M scripts/training/train-model.perl

  Log Message:
  -----------
  count bin feature


  Commit: ff79f9f054b8447919ee495412e9cc37157adbae
      https://github.com/moses-smt/mosesdecoder/commit/ff79f9f054b8447919ee495412e9cc37157adbae
  Author: phikoehn <pk...@in...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M OnDiskPt/OnDiskWrapper.h
    M OnDiskPt/Phrase.h
    M OnDiskPt/PhraseNode.h
    M OnDiskPt/SourcePhrase.h
    M OnDiskPt/TargetPhrase.h
    M OnDiskPt/TargetPhraseCollection.h
    M OnDiskPt/Vocab.h
    M OnDiskPt/Word.h
    M contrib/other-builds/lm.xcodeproj/project.pbxproj
    M contrib/other-builds/moses.xcodeproj/project.pbxproj
    M contrib/tmcombine/tmcombine.py
    M jam-files/sanity.jam
    M lm/Jamfile
    M lm/binary_format.cc
    M lm/build_binary.cc
    M lm/config.cc
    M lm/config.hh
    M lm/left.hh
    M lm/left_test.cc
    M lm/model.cc
    M lm/model.hh
    M lm/model_test.cc
    M lm/model_type.hh
    M lm/ngram_query.cc
    M lm/ngram_query.hh
    M lm/quantize.cc
    M lm/quantize.hh
    M lm/read_arpa.cc
    M lm/read_arpa.hh
    M lm/return.hh
    M lm/search_hashed.cc
    M lm/search_hashed.hh
    M lm/search_trie.cc
    M lm/search_trie.hh
    A lm/state.hh
    M lm/trie.cc
    M lm/trie.hh
    A lm/value.hh
    A lm/value_build.cc
    A lm/value_build.hh
    M lm/vocab.cc
    M lm/vocab.hh
    M lm/weights.hh
    M mert/BleuScorer.cpp
    M mert/BleuScorer.h
    M mert/BleuScorerTest.cpp
    M mert/CderScorer.cpp
    M mert/CderScorer.h
    M mert/Data.cpp
    M mert/Data.h
    M mert/DataTest.cpp
    M mert/Fdstream.h
    M mert/FeatureArray.cpp
    M mert/FeatureArray.h
    M mert/FeatureData.cpp
    M mert/FeatureData.h
    M mert/FeatureDataIterator.cpp
    M mert/FeatureDataIterator.h
    M mert/FeatureDataTest.cpp
    M mert/FeatureStats.cpp
    M mert/FeatureStats.h
    M mert/HypPackEnumerator.cpp
    M mert/HypPackEnumerator.h
    M mert/InterpolatedScorer.cpp
    M mert/InterpolatedScorer.h
    M mert/MergeScorer.cpp
    M mert/MergeScorer.h
    M mert/MiraFeatureVector.cpp
    M mert/MiraFeatureVector.h
    M mert/MiraWeightVector.cpp
    M mert/MiraWeightVector.h
    M mert/Ngram.h
    M mert/NgramTest.cpp
    M mert/Optimizer.cpp
    M mert/Optimizer.h
    M mert/OptimizerFactory.cpp
    M mert/OptimizerFactory.h
    M mert/OptimizerFactoryTest.cpp
    M mert/PerScorer.cpp
    M mert/PerScorer.h
    M mert/Permutation.cpp
    M mert/Permutation.h
    M mert/PermutationScorer.cpp
    M mert/PermutationScorer.h
    M mert/Point.cpp
    M mert/Point.h
    M mert/PointTest.cpp
    M mert/PreProcessFilter.cpp
    M mert/PreProcessFilter.h
    M mert/Reference.h
    M mert/ReferenceTest.cpp
    M mert/ScopedVector.h
    M mert/ScoreArray.cpp
    M mert/ScoreArray.h
    M mert/ScoreData.cpp
    M mert/ScoreData.h
    M mert/ScoreDataIterator.cpp
    M mert/ScoreDataIterator.h
    M mert/ScoreStats.cpp
    M mert/ScoreStats.h
    M mert/Scorer.cpp
    M mert/Scorer.h
    M mert/ScorerFactory.cpp
    M mert/ScorerFactory.h
    M mert/SemposOverlapping.cpp
    M mert/SemposOverlapping.h
    M mert/SemposScorer.cpp
    M mert/SemposScorer.h
    M mert/SentenceLevelScorer.cpp
    M mert/SentenceLevelScorer.h
    M mert/Singleton.h
    M mert/SingletonTest.cpp
    M mert/StatisticsBasedScorer.cpp
    M mert/StatisticsBasedScorer.h
    M mert/TerScorer.cpp
    M mert/TerScorer.h
    M mert/Timer.cpp
    M mert/Timer.h
    M mert/TimerTest.cpp
    M mert/Types.h
    M mert/Util.cpp
    M mert/Util.h
    M mert/UtilTest.cpp
    M mert/Vocabulary.cpp
    M mert/VocabularyTest.cpp
    M mert/evaluator.cpp
    M mert/extractor.cpp
    M mert/kbmira.cpp
    M mert/mert.cpp
    M mert/pro.cpp
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses-chart-cmd/src/Main.h
    M moses-chart-cmd/src/TranslationAnalysis.h
    M moses-cmd/src/IOWrapper.cpp
    M moses-cmd/src/IOWrapper.h
    M moses-cmd/src/LatticeMBR.cpp
    M moses-cmd/src/LatticeMBR.h
    M moses-cmd/src/LatticeMBRGrid.cpp
    M moses-cmd/src/Main.cpp
    M moses/src/AlignmentInfo.h
    M moses/src/AlignmentInfoCollection.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerCYKPlus.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.h
    M moses/src/CYKPlusParser/DotChart.h
    M moses/src/CYKPlusParser/DotChartInMemory.h
    M moses/src/CYKPlusParser/DotChartOnDisk.h
    M moses/src/ChartCell.cpp
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartHypothesisCollection.h
    M moses/src/DynSAInclude/RandLMCache.h
    M moses/src/DynSAInclude/RandLMFilter.h
    M moses/src/DynSAInclude/file.h
    M moses/src/DynSAInclude/hash.h
    M moses/src/DynSAInclude/onlineRLM.h
    M moses/src/DynSAInclude/params.h
    M moses/src/DynSAInclude/perfectHash.h
    M moses/src/DynSAInclude/quantizer.h
    M moses/src/DynSAInclude/utils.h
    M moses/src/DynSAInclude/vocab.h
    M moses/src/Hypothesis.cpp
    M moses/src/Hypothesis.h
    M moses/src/LM/Base.h
    M moses/src/LM/IRST.h
    M moses/src/LM/Implementation.h
    M moses/src/LM/Jamfile
    M moses/src/LM/Joint.h
    M moses/src/LM/Ken.cpp
    M moses/src/LM/Ken.h
    M moses/src/LM/LDHT.cpp
    M moses/src/LM/MultiFactor.h
    M moses/src/LM/ORLM.h
    M moses/src/LM/ParallelBackoff.h
    M moses/src/LM/Remote.h
    M moses/src/LM/SRI.h
    M moses/src/LMList.h
    M moses/src/NonTerminal.h
    M moses/src/OutputCollector.h
    M moses/src/PCNTools.h
    M moses/src/PDTAimp.h
    M moses/src/Parameter.cpp
    M moses/src/Parameter.h
    M moses/src/PartialTranslOptColl.h
    M moses/src/Phrase.h
    M moses/src/PhraseDictionaryDynSuffixArray.h
    M moses/src/PhraseDictionaryMemory.cpp
    M moses/src/PhraseDictionaryNode.h
    M moses/src/PhraseDictionaryTree.h
    M moses/src/PhraseDictionaryTreeAdaptor.h
    M moses/src/PrefixTree.h
    M moses/src/PrefixTreeMap.h
    M moses/src/ReorderingConstraint.h
    M moses/src/ReorderingStack.h
    M moses/src/RuleCube.h
    M moses/src/RuleCubeItem.h
    M moses/src/RuleCubeQueue.h
    M moses/src/RuleTable/Loader.h
    M moses/src/RuleTable/LoaderCompact.h
    M moses/src/RuleTable/LoaderFactory.h
    M moses/src/RuleTable/LoaderHiero.h
    M moses/src/RuleTable/LoaderStandard.h
    M moses/src/RuleTable/PhraseDictionaryALSuffixArray.h
    M moses/src/RuleTable/PhraseDictionaryNodeSCFG.h
    M moses/src/RuleTable/PhraseDictionaryOnDisk.h
    M moses/src/RuleTable/PhraseDictionarySCFG.h
    M moses/src/RuleTable/Trie.h
    M moses/src/RuleTable/UTrie.h
    M moses/src/RuleTable/UTrieNode.h
    M moses/src/Scope3Parser/ApplicableRuleTrie.h
    M moses/src/Scope3Parser/IntermediateVarSpanNode.h
    M moses/src/Scope3Parser/Parser.h
    M moses/src/Scope3Parser/StackLattice.h
    M moses/src/Scope3Parser/StackLatticeBuilder.h
    M moses/src/Scope3Parser/VarSpanNode.h
    M moses/src/Scope3Parser/VarSpanTrieBuilder.h
    M moses/src/ScoreIndexManager.h
    M moses/src/Search.cpp
    M moses/src/Search.h
    M moses/src/SearchCubePruning.h
    M moses/src/SearchNormal.h
    A moses/src/SearchNormalBatch.cpp
    A moses/src/SearchNormalBatch.h
    M moses/src/Sentence.h
    M moses/src/SentenceStats.h
    M moses/src/SquareMatrix.h
    M moses/src/StaticData.h
    M moses/src/ThreadPool.h
    M moses/src/Timer.h
    M moses/src/TranslationOptionCollection.h
    M moses/src/TranslationOptionCollectionConfusionNet.h
    M moses/src/TranslationOptionCollectionText.h
    M moses/src/TranslationOptionList.h
    M moses/src/TreeInput.h
    M moses/src/TrellisPath.h
    M moses/src/TrellisPathCollection.h
    M moses/src/TrellisPathList.h
    M moses/src/TypeDef.h
    M moses/src/UniqueObject.h
    M moses/src/UserMessage.h
    M moses/src/Util.h
    M moses/src/Word.h
    M moses/src/WordLattice.h
    M phrase-extract/AlignmentPhrase.cpp
    M phrase-extract/AlignmentPhrase.h
    M phrase-extract/ExtractedRule.cpp
    M phrase-extract/ExtractedRule.h
    M phrase-extract/Hole.h
    M phrase-extract/HoleCollection.cpp
    M phrase-extract/HoleCollection.h
    M phrase-extract/PhraseAlignment.cpp
    M phrase-extract/PhraseAlignment.h
    M phrase-extract/RuleExist.h
    M phrase-extract/RuleExtractionOptions.h
    M phrase-extract/SentenceAlignment.cpp
    M phrase-extract/SentenceAlignment.h
    M phrase-extract/SentenceAlignmentWithSyntax.cpp
    M phrase-extract/SentenceAlignmentWithSyntax.h
    M phrase-extract/SyntaxTree.cpp
    M phrase-extract/SyntaxTree.h
    M phrase-extract/XmlException.h
    M phrase-extract/XmlTree.cpp
    M phrase-extract/XmlTree.h
    M phrase-extract/extract-ghkm/XmlTreeParser.cpp
    M phrase-extract/extract-ghkm/XmlTreeParser.h
    M phrase-extract/extract-lex.cpp
    M phrase-extract/extract-lex.h
    M phrase-extract/extract-rules.cpp
    M phrase-extract/extract.cpp
    M phrase-extract/extract.xcodeproj/project.pbxproj
    M phrase-extract/hierarchical.h
    M phrase-extract/pcfg-common/xml_tree_parser.cc
    M phrase-extract/pcfg-common/xml_tree_parser.h
    M phrase-extract/relax-parse.cpp
    M phrase-extract/relax-parse.h
    M phrase-extract/score.cpp
    M phrase-extract/score.h
    M phrase-extract/statistics.cpp
    M phrase-extract/tables-core.cpp
    M phrase-extract/tables-core.h
    M scripts/Jamfile
    M scripts/ems/experiment.perl
    M scripts/tokenizer/tokenizer.perl
    M scripts/training/mert-moses.pl
    M util/Jamfile
    M util/bit_packing.hh
    M util/ersatz_progress.cc
    M util/ersatz_progress.hh
    M util/file.cc
    M util/file_piece.cc
    M util/have.hh
    M util/mmap.cc
    M util/murmur_hash.cc
    M util/murmur_hash.hh
    M util/probing_hash_table.hh
    A util/usage.cc
    A util/usage.hh

  Log Message:
  -----------
  fix conflict
Merge branch 'master' of git://github.com/moses-smt/mosesdecoder

Conflicts:
	scripts/ems/experiment.perl


  Commit: c8b2e8957363b37b6d7077bce927f88ba89fd0c3
      https://github.com/moses-smt/mosesdecoder/commit/c8b2e8957363b37b6d7077bce927f88ba89fd0c3
  Author: phikoehn <pk...@in...>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M scripts/ems/experiment.meta
    M scripts/ems/experiment.perl
    A scripts/ems/support/build-sparse-lexical-features.perl
    M scripts/ems/support/reuse-weights.perl
    M scripts/training/train-model.perl

  Log Message:
  -----------
  integrated sparse lexical features into experiment.perl, needs some more testing.


  Commit: b9d4cc9af37ef9c3b72a28d74022d5e4556439bf
      https://github.com/moses-smt/mosesdecoder/commit/b9d4cc9af37ef9c3b72a28d74022d5e4556439bf
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M jam-files/sanity.jam

  Log Message:
  -----------
  Alexander Fraser: Boost thread depends on Boost system.


  Commit: 624196e67e0cf6a5e73dc797fafbc9d34d6e727b
      https://github.com/moses-smt/mosesdecoder/commit/624196e67e0cf6a5e73dc797fafbc9d34d6e727b
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M phrase-extract/consolidate.cpp
    M scripts/ems/experiment.meta
    M scripts/ems/experiment.perl
    A scripts/ems/support/build-sparse-lexical-features.perl
    M scripts/ems/support/reuse-weights.perl
    M scripts/training/train-model.perl

  Log Message:
  -----------
  Merge branch 'master' of github.com:moses-smt/mosesdecoder


  Commit: 1088bdcb86996609e0cfe473e529bd951ccfc975
      https://github.com/moses-smt/mosesdecoder/commit/1088bdcb86996609e0cfe473e529bd951ccfc975
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M contrib/other-builds/moses.xcodeproj/project.pbxproj
    M moses/src/ChartCell.cpp
    M moses/src/ChartCell.h
    M moses/src/ChartCellLabel.h
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h
    M moses/src/ChartRuleLookupManager.h

  Log Message:
  -----------
  more comments


  Commit: 7dd3a57802a6a66737a38ffe709e6929d90a9959
      https://github.com/moses-smt/mosesdecoder/commit/7dd3a57802a6a66737a38ffe709e6929d90a9959
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M jam-files/sanity.jam
    M phrase-extract/consolidate.cpp
    M scripts/ems/experiment.meta
    M scripts/ems/experiment.perl
    A scripts/ems/support/build-sparse-lexical-features.perl
    M scripts/ems/support/reuse-weights.perl
    M scripts/training/train-model.perl

  Log Message:
  -----------
  Merge branch 'master' of github.com:moses-smt/mosesdecoder


  Commit: 34c07e0ca8d539b227a783ab61fe1aa9b5580976
      https://github.com/moses-smt/mosesdecoder/commit/34c07e0ca8d539b227a783ab61fe1aa9b5580976
  Author: phikoehn <pk...@in...>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M scripts/ems/experiment.perl

  Log Message:
  -----------
  bug fix


  Commit: 6146cf7595d83b3e55fe812ec0aecb692381e247
      https://github.com/moses-smt/mosesdecoder/commit/6146cf7595d83b3e55fe812ec0aecb692381e247
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M moses/src/ChartManager.h

  Log Message:
  -----------
  Fix Hieu's compile error


  Commit: 81b916a9630b421f03ae57c72e83935f1c1fac00
      https://github.com/moses-smt/mosesdecoder/commit/81b916a9630b421f03ae57c72e83935f1c1fac00
  Author: U-Hieu-PC\Hieu <Hieu@Hieu-PC.(none)>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M contrib/other-builds/kenlm.vcxproj
    M contrib/other-builds/moses-chart-cmd.vcxproj
    M contrib/other-builds/moses.vcxproj
    A contrib/other-builds/query.sln
    A contrib/other-builds/query.vcxproj

  Log Message:
  -----------
  visual studio project files


  Commit: addb1f06454c6461d552028d6bd920db12a395b7
      https://github.com/moses-smt/mosesdecoder/commit/addb1f06454c6461d552028d6bd920db12a395b7
  Author: U-Hieu-PC\Hieu <Hieu@Hieu-PC.(none)>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M OnDiskPt/OnDiskWrapper.h
    M OnDiskPt/Phrase.h
    M OnDiskPt/PhraseNode.h
    M OnDiskPt/SourcePhrase.h
    M OnDiskPt/TargetPhrase.h
    M OnDiskPt/TargetPhraseCollection.h
    M OnDiskPt/Vocab.h
    M OnDiskPt/Word.h
    M contrib/other-builds/lm.xcodeproj/project.pbxproj
    M contrib/other-builds/moses.xcodeproj/project.pbxproj
    M contrib/tmcombine/tmcombine.py
    M jam-files/sanity.jam
    M mert/BleuScorer.cpp
    M mert/BleuScorer.h
    M mert/BleuScorerTest.cpp
    M mert/CderScorer.cpp
    M mert/CderScorer.h
    M mert/Data.cpp
    M mert/Data.h
    M mert/DataTest.cpp
    M mert/Fdstream.h
    M mert/FeatureArray.cpp
    M mert/FeatureArray.h
    M mert/FeatureData.cpp
    M mert/FeatureData.h
    M mert/FeatureDataIterator.cpp
    M mert/FeatureDataIterator.h
    M mert/FeatureDataTest.cpp
    M mert/FeatureStats.cpp
    M mert/FeatureStats.h
    M mert/HypPackEnumerator.cpp
    M mert/HypPackEnumerator.h
    M mert/InterpolatedScorer.cpp
    M mert/InterpolatedScorer.h
    M mert/MergeScorer.cpp
    M mert/MergeScorer.h
    M mert/MiraFeatureVector.cpp
    M mert/MiraFeatureVector.h
    M mert/MiraWeightVector.cpp
    M mert/MiraWeightVector.h
    M mert/Ngram.h
    M mert/NgramTest.cpp
    M mert/Optimizer.cpp
    M mert/Optimizer.h
    M mert/OptimizerFactory.cpp
    M mert/OptimizerFactory.h
    M mert/OptimizerFactoryTest.cpp
    M mert/PerScorer.cpp
    M mert/PerScorer.h
    M mert/Permutation.cpp
    M mert/Permutation.h
    M mert/PermutationScorer.cpp
    M mert/PermutationScorer.h
    M mert/Point.cpp
    M mert/Point.h
    M mert/PointTest.cpp
    M mert/PreProcessFilter.cpp
    M mert/PreProcessFilter.h
    M mert/Reference.h
    M mert/ReferenceTest.cpp
    M mert/ScopedVector.h
    M mert/ScoreArray.cpp
    M mert/ScoreArray.h
    M mert/ScoreData.cpp
    M mert/ScoreData.h
    M mert/ScoreDataIterator.cpp
    M mert/ScoreDataIterator.h
    M mert/ScoreStats.cpp
    M mert/ScoreStats.h
    M mert/Scorer.cpp
    M mert/Scorer.h
    M mert/ScorerFactory.cpp
    M mert/ScorerFactory.h
    M mert/SemposOverlapping.cpp
    M mert/SemposOverlapping.h
    M mert/SemposScorer.cpp
    M mert/SemposScorer.h
    M mert/SentenceLevelScorer.cpp
    M mert/SentenceLevelScorer.h
    M mert/Singleton.h
    M mert/SingletonTest.cpp
    M mert/StatisticsBasedScorer.cpp
    M mert/StatisticsBasedScorer.h
    M mert/TerScorer.cpp
    M mert/TerScorer.h
    M mert/Timer.cpp
    M mert/Timer.h
    M mert/TimerTest.cpp
    M mert/Types.h
    M mert/Util.cpp
    M mert/Util.h
    M mert/UtilTest.cpp
    M mert/Vocabulary.cpp
    M mert/VocabularyTest.cpp
    M mert/evaluator.cpp
    M mert/extractor.cpp
    M mert/kbmira.cpp
    M mert/mert.cpp
    M mert/pro.cpp
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses-chart-cmd/src/Main.h
    M moses-chart-cmd/src/TranslationAnalysis.h
    M moses-cmd/src/IOWrapper.cpp
    M moses-cmd/src/IOWrapper.h
    M moses-cmd/src/LatticeMBR.cpp
    M moses-cmd/src/LatticeMBR.h
    M moses-cmd/src/LatticeMBRGrid.cpp
    M moses-cmd/src/Main.cpp
    M moses/src/AlignmentInfo.h
    M moses/src/AlignmentInfoCollection.h
    M moses/src/ChartCell.cpp
    M moses/src/ChartCell.h
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartCellLabel.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartHypothesisCollection.h
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h
    M moses/src/ChartRuleLookupManager.h
    M moses/src/Hypothesis.cpp
    M moses/src/Hypothesis.h
    M moses/src/LM/Base.h
    M moses/src/LM/Jamfile
    M moses/src/LM/LDHT.cpp
    M moses/src/LMList.h
    M moses/src/Parameter.cpp
    M moses/src/PhraseDictionaryMemory.cpp
    M moses/src/Search.cpp
    M moses/src/SearchNormal.h
    A moses/src/SearchNormalBatch.cpp
    A moses/src/SearchNormalBatch.h
    M moses/src/TypeDef.h
    M phrase-extract/AlignmentPhrase.cpp
    M phrase-extract/AlignmentPhrase.h
    M phrase-extract/ExtractedRule.cpp
    M phrase-extract/ExtractedRule.h
    M phrase-extract/Hole.h
    M phrase-extract/HoleCollection.cpp
    M phrase-extract/HoleCollection.h
    M phrase-extract/PhraseAlignment.cpp
    M phrase-extract/PhraseAlignment.h
    M phrase-extract/RuleExist.h
    M phrase-extract/RuleExtractionOptions.h
    M phrase-extract/SentenceAlignment.cpp
    M phrase-extract/SentenceAlignment.h
    M phrase-extract/SentenceAlignmentWithSyntax.cpp
    M phrase-extract/SentenceAlignmentWithSyntax.h
    M phrase-extract/SyntaxTree.cpp
    M phrase-extract/SyntaxTree.h
    M phrase-extract/XmlException.h
    M phrase-extract/XmlTree.cpp
    M phrase-extract/XmlTree.h
    M phrase-extract/consolidate.cpp
    M phrase-extract/extract-ghkm/XmlTreeParser.cpp
    M phrase-extract/extract-ghkm/XmlTreeParser.h
    M phrase-extract/extract-lex.cpp
    M phrase-extract/extract-lex.h
    M phrase-extract/extract-rules.cpp
    M phrase-extract/extract.cpp
    M phrase-extract/extract.xcodeproj/project.pbxproj
    M phrase-extract/hierarchical.h
    M phrase-extract/pcfg-common/xml_tree_parser.cc
    M phrase-extract/pcfg-common/xml_tree_parser.h
    M phrase-extract/relax-parse.cpp
    M phrase-extract/relax-parse.h
    M phrase-extract/score.cpp
    M phrase-extract/score.h
    M phrase-extract/statistics.cpp
    M phrase-extract/tables-core.cpp
    M phrase-extract/tables-core.h
    M scripts/ems/experiment.meta
    M scripts/ems/experiment.perl
    A scripts/ems/support/build-sparse-lexical-features.perl
    M scripts/ems/support/reuse-weights.perl
    M scripts/tokenizer/tokenizer.perl
    M scripts/training/train-model.perl

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/hieuhoang/mosesdecoder


  Commit: a8b7e40cecb3655671b06a5beadc56b6d73acb91
      https://github.com/moses-smt/mosesdecoder/commit/a8b7e40cecb3655671b06a5beadc56b6d73acb91
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M moses/src/ChartManager.h
    M scripts/ems/experiment.perl

  Log Message:
  -----------
  Merge branch 'master' of github.com:moses-smt/mosesdecoder


  Commit: 278ec106039089e49392c5e9f99cdbc9b720a4e0
      https://github.com/moses-smt/mosesdecoder/commit/278ec106039089e49392c5e9f99cdbc9b720a4e0
  Author: Barry Haddow <bar...@gm...>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M scripts/training/mert-moses-multi.pl

  Log Message:
  -----------
  Add warning


  Commit: afd654eb74974ecdc0e1da62a6d21ee1f47bd8b5
      https://github.com/moses-smt/mosesdecoder/commit/afd654eb74974ecdc0e1da62a6d21ee1f47bd8b5
  Author: Barry Haddow <bar...@gm...>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M contrib/other-builds/kenlm.vcxproj
    M contrib/other-builds/moses-chart-cmd.vcxproj
    M contrib/other-builds/moses.vcxproj
    M contrib/other-builds/moses.xcodeproj/project.pbxproj
    A contrib/other-builds/query.sln
    A contrib/other-builds/query.vcxproj
    M jam-files/sanity.jam
    M mert/MiraFeatureVector.h
    M mert/kbmira.cpp
    M mert/pro.cpp
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses-chart-cmd/src/Main.h
    M moses-cmd/src/IOWrapper.cpp
    M moses-cmd/src/IOWrapper.h
    M moses-cmd/src/LatticeMBR.cpp
    M moses-cmd/src/LatticeMBR.h
    M moses-cmd/src/LatticeMBRGrid.cpp
    M moses-cmd/src/Main.cpp
    M moses/src/AlignmentInfo.h
    M moses/src/AlignmentInfoCollection.h
    M moses/src/ChartCell.cpp
    M moses/src/ChartCell.h
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartCellLabel.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartHypothesisCollection.h
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h
    M moses/src/ChartRuleLookupManager.h
    M moses/src/Hypothesis.cpp
    M moses/src/Hypothesis.h
    M moses/src/LM/Base.h
    M moses/src/LM/Jamfile
    M moses/src/LM/LDHT.cpp
    M moses/src/LMList.h
    M moses/src/Parameter.cpp
    M moses/src/PhraseDictionaryMemory.cpp
    M moses/src/Search.cpp
    M moses/src/SearchNormal.h
    A moses/src/SearchNormalBatch.cpp
    A moses/src/SearchNormalBatch.h
    M moses/src/TypeDef.h
    M phrase-extract/XmlException.h
    M phrase-extract/consolidate.cpp
    M phrase-extract/statistics.cpp
    M scripts/ems/experiment.meta
    M scripts/ems/experiment.perl
    A scripts/ems/support/build-sparse-lexical-features.perl
    M scripts/ems/support/reuse-weights.perl
    M scripts/training/train-model.perl

  Log Message:
  -----------
  Merge branch 'master' of github.com:moses-smt/mosesdecoder


  Commit: 51589a25e7c8e10028b3ccaa375e3a260b49ad98
      https://github.com/moses-smt/mosesdecoder/commit/51589a25e7c8e10028b3ccaa375e3a260b49ad98
  Author: phikoehn <pk...@in...>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M scripts/generic/multi-bleu.perl

  Log Message:
  -----------
  fix for leading, trailing, and multiple spaces, suggested by Yang Gao


  Commit: 61b9d91b2203a1f6e76a62010bf4091c44a0afb0
      https://github.com/moses-smt/mosesdecoder/commit/61b9d91b2203a1f6e76a62010bf4091c44a0afb0
  Author: phikoehn <pk...@in...>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M contrib/other-builds/kenlm.vcxproj
    M contrib/other-builds/moses-chart-cmd.vcxproj
    M contrib/other-builds/moses.vcxproj
    A contrib/other-builds/query.sln
    A contrib/other-builds/query.vcxproj
    M moses/src/ChartManager.h
    M scripts/training/mert-moses-multi.pl

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/moses-smt/mosesdecoder


  Commit: 8d57651d0f775be8db4a120994976671e0e33a7b
      https://github.com/moses-smt/mosesdecoder/commit/8d57651d0f775be8db4a120994976671e0e33a7b
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    A contrib/mert-moses-multi.pl
    R scripts/training/mert-moses-multi.pl

  Log Message:
  -----------
  move mert-moses-multi.pl


  Commit: 07eabb6f2d5c0c16682177929fc3bfa349726807
      https://github.com/moses-smt/mosesdecoder/commit/07eabb6f2d5c0c16682177929fc3bfa349726807
  Author: Oliver Wilson <oli...@ed...>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M moses/src/LM/Base.h
    M moses/src/LM/LDHT.cpp
    M moses/src/SearchNormalBatch.cpp
    M moses/src/SearchNormalBatch.h
    M moses/src/TargetPhrase.h
    M moses/src/TranslationOptionCollection.cpp
    M moses/src/TranslationOptionCollection.h

  Log Message:
  -----------
  Fix up LM request batching and asynchronousely score TranslationOptions
too.


  Commit: 19d8afe7df1564f1032a637fa150ec4420b15f8e
      https://github.com/moses-smt/mosesdecoder/commit/19d8afe7df1564f1032a637fa150ec4420b15f8e
  Author: Ales Tamchyna <a.t...@gm...>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    A scripts/training/reduce-topt-count.pl

  Log Message:
  -----------
  adding reduce-topt-count.pl, filters translation options that will be discarded by the decoder


  Commit: 0594a7706d5320dbffb752b3fdbc4dc7902d2349
      https://github.com/moses-smt/mosesdecoder/commit/0594a7706d5320dbffb752b3fdbc4dc7902d2349
  Author: Ales Tamchyna <a.t...@gm...>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M scripts/training/reduce-topt-count.pl

  Log Message:
  -----------
  fixed off-by-one bug


  Commit: dcf19443f7b04183af5fe60347ea53e35e3eaa3f
      https://github.com/moses-smt/mosesdecoder/commit/dcf19443f7b04183af5fe60347ea53e35e3eaa3f
  Author: Ales Tamchyna <a.t...@gm...>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    A contrib/mert-moses-multi.pl
    M contrib/other-builds/kenlm.vcxproj
    M contrib/other-builds/moses-chart-cmd.vcxproj
    M contrib/other-builds/moses.vcxproj
    M contrib/other-builds/moses.xcodeproj/project.pbxproj
    A contrib/other-builds/query.sln
    A contrib/other-builds/query.vcxproj
    M jam-files/sanity.jam
    M mert/pro.cpp
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses-chart-cmd/src/Main.h
    M moses-cmd/src/IOWrapper.cpp
    M moses-cmd/src/IOWrapper.h
    M moses-cmd/src/LatticeMBR.cpp
    M moses-cmd/src/LatticeMBR.h
    M moses-cmd/src/LatticeMBRGrid.cpp
    M moses-cmd/src/Main.cpp
    M moses/src/AlignmentInfo.h
    M moses/src/AlignmentInfoCollection.h
    M moses/src/ChartCell.cpp
    M moses/src/ChartCell.h
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartCellLabel.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartHypothesisCollection.cpp
    M moses/src/ChartHypothesisCollection.h
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h
    M moses/src/ChartRuleLookupManager.h
    M moses/src/LM/Base.h
    M moses/src/LM/LDHT.cpp
    M moses/src/SearchNormalBatch.cpp
    M moses/src/SearchNormalBatch.h
    M moses/src/TargetPhrase.h
    M moses/src/TranslationOptionCollection.cpp
    M moses/src/TranslationOptionCollection.h
    M phrase-extract/XmlException.h
    M phrase-extract/consolidate.cpp
    M phrase-extract/statistics.cpp
    M scripts/ems/experiment.meta
    M scripts/ems/experiment.perl
    A scripts/ems/support/build-sparse-lexical-features.perl
    M scripts/ems/support/reuse-weights.perl
    M scripts/generic/multi-bleu.perl
    R scripts/training/mert-moses-multi.pl
    A scripts/training/reduce-topt-count.pl
    M scripts/training/train-model.perl

  Log Message:
  -----------
  Merge branch 'master' of github.com:moses-smt/mosesdecoder into damt_phrase


  Commit: 568b609abea6d342de963f21323d8f4df79c92fb
      https://github.com/moses-smt/mosesdecoder/commit/568b609abea6d342de963f21323d8f4df79c92fb
  Author: Ales Tamchyna <a.t...@gm...>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M moses/src/PSDScoreProducer.cpp

  Log Message:
  -----------
  psd bug fix


Compare: https://github.com/moses-smt/mosesdecoder/compare/438b5c081d70...568b609abea6