[moses-smt/mosesdecoder] cce3f0: count bin feature

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

  Branch: refs/heads/master
  Home:   https://github.com/moses-smt/mosesdecoder
  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


Compare: https://github.com/moses-smt/mosesdecoder/compare/e7faa978b0df...ff79f9f054b8