[moses-smt/mosesdecoder] 4faab6: Extract kenlm into a submodule, referencing lazy

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

  Branch: refs/heads/miramerge
  Home:   https://github.com/moses-smt/mosesdecoder
  Commit: 4faab6c68fb47c79e101c5fc9146636f3173e50d
      https://github.com/moses-smt/mosesdecoder/commit/4faab6c68fb47c79e101c5fc9146636f3173e50d
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M .gitmodules
    M Jamroot
    M jam-files/sanity.jam
    A lazy
    R lm/COPYING
    R lm/COPYING.LESSER
    R lm/Jamfile
    R lm/LICENSE
    R lm/README
    R lm/bhiksha.cc
    R lm/bhiksha.hh
    R lm/binary_format.cc
    R lm/binary_format.hh
    R lm/blank.hh
    R lm/build_binary.cc
    R lm/clean.sh
    R lm/compile.sh
    R lm/config.cc
    R lm/config.hh
    R lm/enumerate_vocab.hh
    R lm/facade.hh
    R lm/left.hh
    R lm/left_test.cc
    R lm/lm_exception.cc
    R lm/lm_exception.hh
    R lm/max_order.cc
    R lm/model.cc
    R lm/model.hh
    R lm/model_test.cc
    R lm/model_type.hh
    R lm/ngram_query.cc
    R lm/ngram_query.hh
    R lm/quantize.cc
    R lm/quantize.hh
    R lm/read_arpa.cc
    R lm/read_arpa.hh
    R lm/return.hh
    R lm/search_hashed.cc
    R lm/search_hashed.hh
    R lm/search_trie.cc
    R lm/search_trie.hh
    R lm/state.hh
    R lm/test.arpa
    R lm/test.sh
    R lm/test_nounk.arpa
    R lm/trie.cc
    R lm/trie.hh
    R lm/trie_sort.cc
    R lm/trie_sort.hh
    R lm/value.hh
    R lm/value_build.cc
    R lm/value_build.hh
    R lm/virtual_interface.cc
    R lm/virtual_interface.hh
    R lm/vocab.cc
    R lm/vocab.hh
    R lm/weights.hh
    R lm/word_index.hh
    M mert/Jamfile
    M moses/src/DynSAInclude/Jamfile
    M moses/src/Jamfile
    M moses/src/LM/Jamfile
    R util/COPYING
    R util/COPYING.LESSER
    R util/Jamfile
    R util/LICENSE
    R util/bit_packing.cc
    R util/bit_packing.hh
    R util/bit_packing_test.cc
    R util/check.hh
    R util/ersatz_progress.cc
    R util/ersatz_progress.hh
    R util/exception.cc
    R util/exception.hh
    R util/file.cc
    R util/file.hh
    R util/file_piece.cc
    R util/file_piece.hh
    R util/file_piece_test.cc
    R util/getopt.c
    R util/getopt.hh
    R util/have.hh
    R util/joint_sort.hh
    R util/joint_sort_test.cc
    R util/mmap.cc
    R util/mmap.hh
    R util/murmur_hash.cc
    R util/murmur_hash.hh
    R util/probing_hash_table.hh
    R util/probing_hash_table_test.cc
    R util/proxy_iterator.hh
    R util/scoped.hh
    R util/sized_iterator.hh
    R util/sorted_uniform.hh
    R util/sorted_uniform_test.cc
    R util/string_piece.hh
    R util/tokenize_piece.hh
    R util/tokenize_piece_test.cc
    R util/usage.cc
    R util/usage.hh
    R util/util.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Extract kenlm into a submodule, referencing lazy


  Commit: f6cb255daae07cbda6347ff97992b701a375ec6b
      https://github.com/moses-smt/mosesdecoder/commit/f6cb255daae07cbda6347ff97992b701a375ec6b
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M phrase-extract/PhraseAlignment.h
    M phrase-extract/score.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 36137829d3d4fd3ca933b30a0b5a9fe5fb6e934a
      https://github.com/moses-smt/mosesdecoder/commit/36137829d3d4fd3ca933b30a0b5a9fe5fb6e934a
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M moses/src/ChartTranslationOption.cpp
    M moses/src/RuleCubeItem.cpp
    M moses/src/Scope3Parser/StackLatticeSearcher.h
    M moses/src/StackVec.h

  Log Message:
  -----------
  Genericize StackVec to const void *


  Commit: b47f7b15adfcf00a4e20e5418a70e36440abe905
      https://github.com/moses-smt/mosesdecoder/commit/b47f7b15adfcf00a4e20e5418a70e36440abe905
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M OnDiskPt/TargetPhrase.cpp
    M OnDiskPt/Word.cpp
    M OnDiskPt/Word.h
    M contrib/other-builds/moses.xcodeproj/project.pbxproj
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses/src/ChartCell.cpp
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartHypothesis.h
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h
    R moses/src/ChartTranslationOption.cpp
    R moses/src/ChartTranslationOption.h
    R moses/src/ChartTranslationOptionCollection.cpp
    R moses/src/ChartTranslationOptionCollection.h
    M moses/src/ChartTranslationOptionList.cpp
    M moses/src/ChartTranslationOptionList.h
    A moses/src/ChartTranslationOptions.cpp
    A moses/src/ChartTranslationOptions.h
    M moses/src/InputType.cpp
    M moses/src/InputType.h
    M moses/src/Jamfile
    M moses/src/RuleCube.cpp
    M moses/src/RuleCube.h
    M moses/src/RuleCubeItem.cpp
    M moses/src/RuleCubeItem.h
    M moses/src/TargetPhrase.h
    M moses/src/TreeInput.cpp
    M moses/src/TreeInput.h
    M scripts/recaser/train-recaser.perl

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 32e46c716adccf34df5990d53995b9561d7c2edf
      https://github.com/moses-smt/mosesdecoder/commit/32e46c716adccf34df5990d53995b9561d7c2edf
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M moses/src/CYKPlusParser/ChartRuleLookupManagerCYKPlus.cpp

  Log Message:
  -----------
  Simplify call


  Commit: 3d8e1274b190e2c9c8947eb584b6fdf2e5947d0b
      https://github.com/moses-smt/mosesdecoder/commit/3d8e1274b190e2c9c8947eb584b6fdf2e5947d0b
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M moses/src/ChartCellLabel.h

  Log Message:
  -----------
  Abstract ChartCellLabel


  Commit: 080585b5c47251b6dc5a3be3d6f608487572d8fd
      https://github.com/moses-smt/mosesdecoder/commit/080585b5c47251b6dc5a3be3d6f608487572d8fd
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    A moses/src/Incremental/List.h

  Log Message:
  -----------
  Start hacking


  Commit: 9c990ee3a8e484df04c4d29918152087d967baa8
      https://github.com/moses-smt/mosesdecoder/commit/9c990ee3a8e484df04c4d29918152087d967baa8
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M jam-files/sanity.jam
    M moses/src/CompactPT/Jamfile
    M moses/src/LM/Jamfile
    M regression-testing/tests

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'

Conflicts:
	moses/src/LM/Jamfile


  Commit: fec0cb75955e67770d476bf98e56d8dd9b50231a
      https://github.com/moses-smt/mosesdecoder/commit/fec0cb75955e67770d476bf98e56d8dd9b50231a
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M moses/src/CYKPlusParser/ChartRuleLookupManagerCYKPlus.cpp
    M moses/src/ChartCell.cpp
    M moses/src/ChartCellLabel.h
    M moses/src/ChartCellLabelSet.h
    M moses/src/ChartTranslationOptions.cpp
    M moses/src/Incremental/List.h
    M moses/src/RuleCubeItem.cpp
    M moses/src/Scope3Parser/StackLatticeBuilder.cpp
    M moses/src/Scope3Parser/StackLatticeSearcher.h
    M moses/src/StackVec.h

  Log Message:
  -----------
  Change StackVec to contain ChartCellLabel*


  Commit: 1e3f85b96a0756fa01422cadce891140173dc44d
      https://github.com/moses-smt/mosesdecoder/commit/1e3f85b96a0756fa01422cadce891140173dc44d
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M .gitmodules
    M scripts/ems/web/analysis.php
    M scripts/ems/web/analysis_diff.php
    A scripts/ems/web/base64.js
    A scripts/ems/web/favicon.ico
    M scripts/ems/web/index.php
    M scripts/ems/web/lib.php
    M scripts/ems/web/overview.php
    A scripts/ems/web/sgviz.js
    A scripts/ems/web/sgviz.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitmodules


  Commit: bdaffe337940f6a17550a8b3893f2a39354e2069
      https://github.com/moses-smt/mosesdecoder/commit/bdaffe337940f6a17550a8b3893f2a39354e2069
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M BUILD-INSTRUCTIONS.txt
    M scripts/generic/moses-parallel.pl
    M scripts/generic/qsub-wrapper.pl
    M scripts/training/absolutize_moses_model.pl

  Log Message:
  -----------
  Merge remote branch 'upstream/master'

Conflicts:
	lm/Jamfile
	lm/bhiksha.cc
	lm/bhiksha.hh
	lm/binary_format.cc
	lm/binary_format.hh
	lm/build_binary.cc
	lm/left.hh
	lm/max_order.cc
	lm/model.cc
	lm/model.hh
	lm/quantize.hh
	lm/read_arpa.cc
	lm/search_hashed.hh
	lm/search_trie.cc
	lm/search_trie.hh
	lm/state.hh
	lm/trie.cc
	lm/trie.hh
	lm/trie_sort.cc
	lm/trie_sort.hh
	lm/vocab.cc
	lm/vocab.hh
	util/ersatz_progress.cc
	util/ersatz_progress.hh
	util/exception.cc
	util/exception.hh
	util/file.cc
	util/file.hh
	util/file_piece.cc
	util/probing_hash_table.hh


  Commit: b7a280064ea16bd4078218164eaab3522cddddf6
      https://github.com/moses-smt/mosesdecoder/commit/b7a280064ea16bd4078218164eaab3522cddddf6
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M moses/src/Hypothesis.cpp
    R moses/src/hash.cpp
    R moses/src/hash.h

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: 60f725f604a4f900bf6c53b5d6dba1924a742b24
      https://github.com/moses-smt/mosesdecoder/commit/60f725f604a4f900bf6c53b5d6dba1924a742b24
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
    M moses/src/ChartManager.cpp
    M moses/src/ChartRuleLookupManager.h
    M moses/src/Scope3Parser/Parser.cpp
    M moses/src/Scope3Parser/StackLatticeBuilder.cpp
    M moses/src/Scope3Parser/StackLatticeBuilder.h

  Log Message:
  -----------
  Restrict access to ChartCell


  Commit: a9524f079f6afe541f6690963eee3a87b339a5e7
      https://github.com/moses-smt/mosesdecoder/commit/a9524f079f6afe541f6690963eee3a87b339a5e7
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M moses/src/ChartCell.cpp
    M moses/src/ChartCell.h

  Log Message:
  -----------
  Splitting ChartCell into cube v non-cube


  Commit: 542502e6fde84901ed1be61331686229633c045b
      https://github.com/moses-smt/mosesdecoder/commit/542502e6fde84901ed1be61331686229633c045b
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M moses/src/ChartCell.cpp
    M moses/src/ChartCell.h
    M moses/src/ChartCellCollection.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/ChartRuleLookupManager.h

  Log Message:
  -----------
  Abstract ChartCellCollection, extract source labels


  Commit: 0d86844a33d9d35eba3a169be00e7352a7496914
      https://github.com/moses-smt/mosesdecoder/commit/0d86844a33d9d35eba3a169be00e7352a7496914
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M moses/src/ChartRuleLookupManager.h

  Log Message:
  -----------
  Base class switcheroo


  Commit: 1354d5c5f487a1bf42c5a5df364971d085d79fd5
      https://github.com/moses-smt/mosesdecoder/commit/1354d5c5f487a1bf42c5a5df364971d085d79fd5
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M moses/src/PhraseDictionary.h

  Log Message:
  -----------
  Remove unused forward declaration


  Commit: 7a2f0d19bd38f82428ff69173502151ea8302fe8
      https://github.com/moses-smt/mosesdecoder/commit/7a2f0d19bd38f82428ff69173502151ea8302fe8
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M moses/src/CYKPlusParser/ChartRuleLookupManagerCYKPlus.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerCYKPlus.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.h
    A moses/src/ChartParserCallback.h
    M moses/src/ChartRuleLookupManager.h
    M moses/src/ChartTranslationOptionList.h
    M moses/src/Scope3Parser/Parser.cpp
    M moses/src/Scope3Parser/Parser.h

  Log Message:
  -----------
  Extract base class for ChartTranslationOptionList


  Commit: 56dc2152e269a1f2d036bec494997efe9b1b1399
      https://github.com/moses-smt/mosesdecoder/commit/56dc2152e269a1f2d036bec494997efe9b1b1399
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M contrib/relent-filter/scripts/prunePT.pl
    M scripts/ems/experiment.perl

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: 9f460dd62a881755b80503dfd38a3f15726d50b7
      https://github.com/moses-smt/mosesdecoder/commit/9f460dd62a881755b80503dfd38a3f15726d50b7
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
    M moses/src/ChartTranslationOptionList.cpp
    M moses/src/ChartTranslationOptionList.h

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: 71c4d0c2ffa3f049a9375bd240efe8a0140c18b3
      https://github.com/moses-smt/mosesdecoder/commit/71c4d0c2ffa3f049a9375bd240efe8a0140c18b3
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M lazy

  Log Message:
  -----------
  Update lazy


  Commit: 16833737b449422114f6a78b607abb3cca00acf1
      https://github.com/moses-smt/mosesdecoder/commit/16833737b449422114f6a78b607abb3cca00acf1
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M moses/src/ChartCell.h
    M moses/src/ChartCellLabel.h
    M moses/src/ChartCellLabelSet.h
    M moses/src/ChartParserCallback.h
    M moses/src/Incremental/List.h

  Log Message:
  -----------
  Useful methods for me, remove stale ones


  Commit: 92d19401dca34e9058cbbd48dc560988956d62fe
      https://github.com/moses-smt/mosesdecoder/commit/92d19401dca34e9058cbbd48dc560988956d62fe
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M contrib/python/README.md
    M contrib/python/binpt/binpt.cpp
    M contrib/python/binpt/binpt.pyx
    M contrib/python/setup.py
    M phrase-extract/extract-ghkm/ExtractGHKM.cpp
    M phrase-extract/extract-ghkm/Options.h
    M scripts/ems/experiment.meta

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: e3af51f3a44de52e5074e7c709e8387afe9f052f
      https://github.com/moses-smt/mosesdecoder/commit/e3af51f3a44de52e5074e7c709e8387afe9f052f
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M contrib/other-builds/moses-cmd.xcodeproj/project.pbxproj
    M contrib/other-builds/moses.xcodeproj/project.pbxproj
    M jam-files/sanity.jam
    M moses/src/Jamfile
    M moses/src/StaticData.cpp
    M regression-testing/tests

  Log Message:
  -----------
  Merge remote branch 'upstream/master'

Conflicts:
	jam-files/sanity.jam


  Commit: cb972b37d6d92acf239552ddee3a2c6f640ca23f
      https://github.com/moses-smt/mosesdecoder/commit/cb972b37d6d92acf239552ddee3a2c6f640ca23f
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-05 (Fri, 05 Oct 2012)

  Changed paths:
    M misc/queryPhraseTableMin.cpp
    M moses-chart-cmd/src/Main.cpp
    M moses-cmd/src/Main.cpp
    M moses/src/FactorCollection.cpp
    M regression-testing/Jamfile
    M regression-testing/tests
    M scripts/generic/multi-bleu.perl

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: 09b134ad67a4dfe75df72287e77e6e4ae8f9810d
      https://github.com/moses-smt/mosesdecoder/commit/09b134ad67a4dfe75df72287e77e6e4ae8f9810d
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-05 (Fri, 05 Oct 2012)

  Changed paths:
    M lazy
    A moses/src/Incremental/Edge.h
    A moses/src/Incremental/Fill.cpp
    A moses/src/Incremental/Fill.h
    R moses/src/Incremental/List.h
    M moses/src/TargetPhrase.h

  Log Message:
  -----------
  Partly written Moses-side search


  Commit: 240d663ae38257fa4c94b6405063c1461c777c68
      https://github.com/moses-smt/mosesdecoder/commit/240d663ae38257fa4c94b6405063c1461c777c68
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    A contrib/other-builds/moses-chart-cmd/.cproject
    A contrib/other-builds/moses-chart-cmd/.project
    M contrib/other-builds/moses-cmd/.cproject
    M contrib/other-builds/moses-cmd/.project
    M contrib/other-builds/moses/.cproject
    M contrib/other-builds/moses/.project
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses/src/AlignmentInfo.cpp
    M moses/src/AlignmentInfo.h
    M moses/src/ChartHypothesis.cpp
    M moses/src/ChartTrellisNode.cpp
    M moses/src/LM/Implementation.cpp
    M moses/src/LM/Ken.cpp
    M moses/src/RuleTable/PhraseDictionarySCFG.cpp
    M moses/src/TargetPhrase.cpp
    M moses/src/TargetPhrase.h
    M scripts/training/wrappers/parse-de-bitpar.perl

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: fce4bfbc25f6fa737450924699c20601888825d0
      https://github.com/moses-smt/mosesdecoder/commit/fce4bfbc25f6fa737450924699c20601888825d0
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M moses/src/Incremental/Edge.h
    M moses/src/Incremental/Fill.cpp
    M moses/src/Incremental/Fill.h
    A moses/src/Incremental/Jamfile

  Log Message:
  -----------
  Untested code for parser callback


  Commit: 6808d4f085321bca8a32a267d32c589cd8d81d91
      https://github.com/moses-smt/mosesdecoder/commit/6808d4f085321bca8a32a267d32c589cd8d81d91
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M moses/src/LM/Base.cpp
    M moses/src/LM/Base.h

  Log Message:
  -----------
  Start hack to get raw model out of LM classes


  Commit: 4bc4101def8420e71022a2cfe6afa2075246aaa1
      https://github.com/moses-smt/mosesdecoder/commit/4bc4101def8420e71022a2cfe6afa2075246aaa1
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M lazy
    M moses/src/ChartCellLabel.h
    M moses/src/ChartCellLabelSet.h
    M moses/src/ChartTranslationOptions.cpp
    M moses/src/Incremental/Edge.h
    M moses/src/Incremental/Fill.cpp
    M moses/src/Incremental/Fill.h
    A moses/src/Incremental/Owner.h
    M moses/src/RuleCubeItem.cpp

  Log Message:
  -----------
  Write hypothesis routing


  Commit: 650ad22c9c5929c4566d9205495377560af275c9
      https://github.com/moses-smt/mosesdecoder/commit/650ad22c9c5929c4566d9205495377560af275c9
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    R contrib/fuzzy-match/Makefile
    R contrib/fuzzy-match/Match.h
    R contrib/fuzzy-match/SentenceAlignment.h
    R contrib/fuzzy-match/SuffixArray.cpp
    R contrib/fuzzy-match/SuffixArray.h
    R contrib/fuzzy-match/Util.cpp
    R contrib/fuzzy-match/Util.h
    R contrib/fuzzy-match/Vocabulary.cpp
    R contrib/fuzzy-match/Vocabulary.h
    R contrib/fuzzy-match/fuzzy-match2.cpp
    R contrib/fuzzy-match/fuzzy-match2.h
    R contrib/fuzzy-match/make-xml-from-match.perl
    R contrib/fuzzy-match/old/fuzzy-match.cpp
    R contrib/fuzzy-match/old/get-multiple-translations-for-uniq-sources.perl
    R contrib/fuzzy-match/old/make-pt-from-tm.perl
    R contrib/fuzzy-match/old/make-pt-from-tm2.perl
    R contrib/fuzzy-match/old/make-xml-from-match-multiple.perl
    R contrib/fuzzy-match/suffix-test.cpp
    M contrib/other-builds/lm.xcodeproj/project.pbxproj
    M jam-files/sanity.jam
    M mert/PermutationScorer.cpp
    M moses/src/RuleTable/PhraseDictionaryFuzzyMatch.cpp
    M moses/src/fuzzy-match/FuzzyMatchWrapper.cpp
    M moses/src/fuzzy-match/FuzzyMatchWrapper.h
    M regression-testing/Jamfile
    M regression-testing/tests

  Log Message:
  -----------
  Merge remote branch 'upstream/master'

Conflicts:
	util/file.cc
	util/file.hh


  Commit: 1cf74f7b72254f3763ba71830b108ab239444c2e
      https://github.com/moses-smt/mosesdecoder/commit/1cf74f7b72254f3763ba71830b108ab239444c2e
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M lazy

  Log Message:
  -----------
  Update lazy


  Commit: 4991adfac1050c9ce0a320f5279c6e8b7741b695
      https://github.com/moses-smt/mosesdecoder/commit/4991adfac1050c9ce0a320f5279c6e8b7741b695
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M lazy

  Log Message:
  -----------
  Update lazy pointer...


  Commit: c83fb459ac701159c0de544e05592cc3773471a7
      https://github.com/moses-smt/mosesdecoder/commit/c83fb459ac701159c0de544e05592cc3773471a7
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M contrib/other-builds/moses/.cproject
    M moses/src/RuleTable/PhraseDictionaryFuzzyMatch.cpp
    M moses/src/fuzzy-match/FuzzyMatchWrapper.cpp
    M regression-testing/tests

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: 56be96cfaa067fc21ff87acfc13c48ffd3ddd1c3
      https://github.com/moses-smt/mosesdecoder/commit/56be96cfaa067fc21ff87acfc13c48ffd3ddd1c3
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M contrib/other-builds/OnDiskPt/.cproject
    M contrib/other-builds/moses-chart-cmd/.cproject
    M contrib/other-builds/moses-cmd/.cproject
    M contrib/other-builds/moses/.cproject
    M contrib/other-builds/util/.cproject
    M moses/src/PhraseDictionary.cpp
    M moses/src/RuleTable/PhraseDictionaryFuzzyMatch.cpp
    M moses/src/fuzzy-match/FuzzyMatchWrapper.cpp
    M moses/src/fuzzy-match/FuzzyMatchWrapper.h
    M scripts/training/clone_moses_model.pl

  Log Message:
  -----------
  Merge remote branch 'upstream/master'

Conflicts:
	lm/binary_format.cc
	lm/search_hashed.cc
	lm/search_hashed.hh


  Commit: e060a77c0ff7c697370e8243d2495a4879290a31
      https://github.com/moses-smt/mosesdecoder/commit/e060a77c0ff7c697370e8243d2495a4879290a31
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M lazy

  Log Message:
  -----------
  Update lazy


  Commit: a6c161c69727ef93b60b186504177e818762b1e5
      https://github.com/moses-smt/mosesdecoder/commit/a6c161c69727ef93b60b186504177e818762b1e5
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h

  Log Message:
  -----------
  Split off unknown word class from ChartManager


  Commit: ba1915bcf7e71b6e3a54ddac7f611802c3147246
      https://github.com/moses-smt/mosesdecoder/commit/ba1915bcf7e71b6e3a54ddac7f611802c3147246
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h

  Log Message:
  -----------
  Split off ChartParser class


  Commit: 7a5976b7213cdcaab86d9c34a2950748aad93805
      https://github.com/moses-smt/mosesdecoder/commit/7a5976b7213cdcaab86d9c34a2950748aad93805
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M lazy
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h
    M moses/src/ChartParserCallback.h
    M moses/src/ChartTranslationOptionList.h
    M moses/src/Incremental/Fill.h

  Log Message:
  -----------
  Make ChartParser accept ChartParserCallback


  Commit: b1ace96f09ef515da80e350a00bff8192827e191
      https://github.com/moses-smt/mosesdecoder/commit/b1ace96f09ef515da80e350a00bff8192827e191
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h
    A moses/src/ChartParser.cpp
    A moses/src/ChartParser.h

  Log Message:
  -----------
  Split off ChartParser.cpp from ChartManager.cpp


  Commit: 0a37050b1df870728d44e19a4e00f9e9efc1cbce
      https://github.com/moses-smt/mosesdecoder/commit/0a37050b1df870728d44e19a4e00f9e9efc1cbce
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M moses/src/ChartParser.cpp
    M moses/src/ChartParser.h
    M moses/src/CompactPT/PhraseDictionaryCompact.h
    M moses/src/PhraseDictionary.h
    M moses/src/PhraseDictionaryDynSuffixArray.cpp
    M moses/src/PhraseDictionaryDynSuffixArray.h
    M moses/src/PhraseDictionaryMemory.h
    M moses/src/PhraseDictionaryTreeAdaptor.h
    M moses/src/RuleTable/PhraseDictionaryFuzzyMatch.cpp
    M moses/src/RuleTable/PhraseDictionaryFuzzyMatch.h
    M moses/src/RuleTable/PhraseDictionaryOnDisk.cpp
    M moses/src/RuleTable/PhraseDictionaryOnDisk.h
    M moses/src/RuleTable/PhraseDictionarySCFG.cpp
    M moses/src/RuleTable/PhraseDictionarySCFG.h
    M moses/src/RuleTable/UTrie.cpp
    M moses/src/RuleTable/UTrie.h

  Log Message:
  -----------
  Rule lookup only needs ChartCellCollectionBase


  Commit: abd8f9d36bec3249dd1640214620a5312179cbb5
      https://github.com/moses-smt/mosesdecoder/commit/abd8f9d36bec3249dd1640214620a5312179cbb5
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M moses/src/CYKPlusParser/ChartRuleLookupManagerCYKPlus.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.h
    M moses/src/ChartCellCollection.h
    M moses/src/Incremental/Fill.h
    M moses/src/Incremental/Jamfile
    A moses/src/Incremental/Manager.cpp
    A moses/src/Incremental/Manager.h
    M moses/src/Jamfile
    M moses/src/LM/Base.cpp
    M moses/src/LM/Base.h
    M moses/src/LM/Jamfile
    M moses/src/LM/Ken.cpp
    M moses/src/Scope3Parser/Parser.h

  Log Message:
  -----------
  Add Manager for incremental.  More ChartCellCollectionBase


  Commit: e5c8cbd0c1b8661dc5785f4b15e6826c41a94194
      https://github.com/moses-smt/mosesdecoder/commit/e5c8cbd0c1b8661dc5785f4b15e6826c41a94194
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M moses-chart-cmd/src/IOWrapper.cpp
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M scripts/ems/experiment.perl

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: 6f9db664a53bb633bcdf68aebe7860a66192526e
      https://github.com/moses-smt/mosesdecoder/commit/6f9db664a53bb633bcdf68aebe7860a66192526e
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M lazy
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses/src/ChartCellCollection.h
    M moses/src/Incremental/Fill.cpp
    M moses/src/Incremental/Manager.cpp
    M moses/src/Incremental/Manager.h
    M moses/src/LM/Ken.cpp
    M moses/src/TypeDef.h

  Log Message:
  -----------
  Work Master all the way up to main


  Commit: 3291083be72068ff078dc772ea89d76657aca44b
      https://github.com/moses-smt/mosesdecoder/commit/3291083be72068ff078dc772ea89d76657aca44b
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M moses-chart-cmd/src/Main.cpp
    M moses/src/StaticData.cpp

  Log Message:
  -----------
  Fix some conflations of search algorithm with model


  Commit: e75b51bb73bb8fe5beb6b77cee5d2b2364b18c1f
      https://github.com/moses-smt/mosesdecoder/commit/e75b51bb73bb8fe5beb6b77cee5d2b2364b18c1f
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M contrib/server/mosesserver.cpp
    M lazy
    M moses-chart-cmd/src/Main.cpp
    M moses/src/Sentence.cpp
    M moses/src/StaticData.cpp
    M moses/src/StaticData.h

  Log Message:
  -----------
  Fix more conflations, update lazy


  Commit: e33e0ffd61973b786f0b6e3526ff25416b47c3cf
      https://github.com/moses-smt/mosesdecoder/commit/e33e0ffd61973b786f0b6e3526ff25416b47c3cf
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M moses-chart-cmd/src/Main.cpp
    M moses/src/Incremental/Manager.cpp

  Log Message:
  -----------
  It works!


  Commit: deaae35ed89f3560cfa98c58962e426a5982c1c1
      https://github.com/moses-smt/mosesdecoder/commit/deaae35ed89f3560cfa98c58962e426a5982c1c1
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M moses/src/Incremental/Manager.cpp

  Log Message:
  -----------
  Add hack to show model score


  Commit: a2758a1ea022cb48e32620956e91183ba1e93186
      https://github.com/moses-smt/mosesdecoder/commit/a2758a1ea022cb48e32620956e91183ba1e93186
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M lazy
    M moses/src/ChartParser.cpp
    M moses/src/ChartParserCallback.h
    M moses/src/ChartTranslationOptionList.cpp
    M moses/src/ChartTranslationOptionList.h
    M moses/src/Incremental/Fill.cpp
    M moses/src/Incremental/Fill.h

  Log Message:
  -----------
  Fix the -100 score and save some memory


  Commit: a1d040be11a14dfc203f92eea4fda0cbd7f4d7e1
      https://github.com/moses-smt/mosesdecoder/commit/a1d040be11a14dfc203f92eea4fda0cbd7f4d7e1
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M lazy
    M moses/src/Incremental/Fill.cpp

  Log Message:
  -----------
  Update moses side for edges without scores.


  Commit: 0a08ed416fd7fc0c1cc17a3376c8a22b9dcb5048
      https://github.com/moses-smt/mosesdecoder/commit/0a08ed416fd7fc0c1cc17a3376c8a22b9dcb5048
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M moses/src/LM/Ken.cpp

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: c55671b38e71d04cee70780fdbcffdcd4f4580e5
      https://github.com/moses-smt/mosesdecoder/commit/c55671b38e71d04cee70780fdbcffdcd4f4580e5
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M moses/src/LM/Ken.cpp

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: 1f77801c243cfb840594f6b9b53e9d45d6480505
      https://github.com/moses-smt/mosesdecoder/commit/1f77801c243cfb840594f6b9b53e9d45d6480505
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M moses/src/Incremental/Fill.cpp

  Log Message:
  -----------
  Use newfangled score given in phrase.  Fix bug for OOVs.


  Commit: 0fd784968f83fb313c72ad5b5e82f87b39b5ca2e
      https://github.com/moses-smt/mosesdecoder/commit/0fd784968f83fb313c72ad5b5e82f87b39b5ca2e
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M moses/src/Incremental/Fill.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:kpu/moses-lazy


  Commit: 42f009d86df3dc295c6eaa475b5a610cf91a3329
      https://github.com/moses-smt/mosesdecoder/commit/42f009d86df3dc295c6eaa475b5a610cf91a3329
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M moses/src/Incremental/Fill.cpp
    M moses/src/Incremental/Owner.h

  Log Message:
  -----------
  Hacky intermediate state


  Commit: 8ed542cf29ca80ef8ad8572f9a46d69f2daabfe2
      https://github.com/moses-smt/mosesdecoder/commit/8ed542cf29ca80ef8ad8572f9a46d69f2daabfe2
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M moses/src/TargetPhrase.cpp
    M moses/src/TargetPhrase.h

  Log Message:
  -----------
  Merge remote branch 'upstream/master'

Conflicts:
	moses/src/TargetPhrase.h


  Commit: 64f91af29d02129b0e8d57d928fc0e659ac768ff
      https://github.com/moses-smt/mosesdecoder/commit/64f91af29d02129b0e8d57d928fc0e659ac768ff
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M lazy
    R moses/src/Incremental/Edge.h
    M moses/src/Incremental/Fill.cpp
    M moses/src/Incremental/Fill.h
    M moses/src/Incremental/Manager.cpp
    M moses/src/Incremental/Owner.h

  Log Message:
  -----------
  Refactor to streamline edge creation


  Commit: 0be55e477301e919814ff99b24df38c2a219d21c
      https://github.com/moses-smt/mosesdecoder/commit/0be55e477301e919814ff99b24df38c2a219d21c
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M regression-testing/tests

  Log Message:
  -----------
  Update tests


  Commit: 031995d897579e44cdb4a4b7c81cc74374cb126e
      https://github.com/moses-smt/mosesdecoder/commit/031995d897579e44cdb4a4b7c81cc74374cb126e
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M moses/src/Incremental/Fill.cpp

  Log Message:
  -----------
  Insert blanks properly


  Commit: 0995fa52a84e3ef35f26ffe2a867e4ff59a792bd
      https://github.com/moses-smt/mosesdecoder/commit/0995fa52a84e3ef35f26ffe2a867e4ff59a792bd
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M moses/src/Incremental/Fill.cpp

  Log Message:
  -----------
  Use non-terminal alignments


  Commit: a0ce62e79550c709e869568665cd79543351b957
      https://github.com/moses-smt/mosesdecoder/commit/a0ce62e79550c709e869568665cd79543351b957
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M moses/src/Phrase.cpp
    M moses/src/Phrase.h
    M moses/src/RuleTable/LoaderStandard.cpp
    M moses/src/Word.cpp
    M moses/src/Word.h
    M util/Jamfile
    A util/string_piece.cc

  Log Message:
  -----------
  Got tired of waiting for loading.


  Commit: f3ec76ac560ad90c36f767a3e9a28f77abc13219
      https://github.com/moses-smt/mosesdecoder/commit/f3ec76ac560ad90c36f767a3e9a28f77abc13219
  Author: Hieu Hoang <hie...@gm...>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M regression-testing/tests
    M scripts/generic/trainlm-irst.perl

  Log Message:
  -----------
  minor change to calling irst training


  Commit: 44eee4dcd29f1364bc6d53f73ea53fa8fc1b4724
      https://github.com/moses-smt/mosesdecoder/commit/44eee4dcd29f1364bc6d53f73ea53fa8fc1b4724
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M moses/src/RuleTable/Loader.h
    M moses/src/RuleTable/LoaderCompact.cpp
    M moses/src/RuleTable/LoaderCompact.h
    M moses/src/RuleTable/LoaderHiero.cpp
    M moses/src/RuleTable/LoaderHiero.h
    M moses/src/RuleTable/LoaderStandard.cpp
    M moses/src/RuleTable/LoaderStandard.h
    M moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
    M moses/src/RuleTable/Trie.cpp

  Log Message:
  -----------
  FilePieceify LoaderStandard.


  Commit: 3817742b21e0db410d08fbfc97b47ee377fd9cf1
      https://github.com/moses-smt/mosesdecoder/commit/3817742b21e0db410d08fbfc97b47ee377fd9cf1
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M regression-testing/tests
    M scripts/generic/trainlm-irst.perl

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


  Commit: d8eae3f8861c6f0433289a210e21016b52a790b9
      https://github.com/moses-smt/mosesdecoder/commit/d8eae3f8861c6f0433289a210e21016b52a790b9
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M regression-testing/tests

  Log Message:
  -----------
  Hieu, stop reverting the tests pointer!


  Commit: 0265725c0356a2520e70a457d818ec0371570ba0
      https://github.com/moses-smt/mosesdecoder/commit/0265725c0356a2520e70a457d818ec0371570ba0
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M lazy
    M moses/src/Phrase.cpp
    M moses/src/Phrase.h
    M moses/src/RuleTable/Loader.h
    M moses/src/RuleTable/LoaderCompact.cpp
    M moses/src/RuleTable/LoaderCompact.h
    M moses/src/RuleTable/LoaderHiero.cpp
    M moses/src/RuleTable/LoaderHiero.h
    M moses/src/RuleTable/LoaderStandard.cpp
    M moses/src/RuleTable/LoaderStandard.h
    M moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
    M moses/src/RuleTable/Trie.cpp
    M moses/src/Word.cpp
    M moses/src/Word.h
    M scripts/generic/trainlm-irst.perl

  Log Message:
  -----------
  Merge


  Commit: ed00315c8cf4c0b0f8ebc535cf676139b25ab087
      https://github.com/moses-smt/mosesdecoder/commit/ed00315c8cf4c0b0f8ebc535cf676139b25ab087
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M moses/src/Incremental/Fill.cpp
    M moses/src/Incremental/Fill.h
    M moses/src/Incremental/Manager.cpp
    M moses/src/Incremental/Manager.h
    R moses/src/Incremental/Owner.h

  Log Message:
  -----------
  Remove Owner class


  Commit: 0eb98df0fe32a8e31188fa107f789afd73d81ccf
      https://github.com/moses-smt/mosesdecoder/commit/0eb98df0fe32a8e31188fa107f789afd73d81ccf
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M .gitmodules
    M Jamroot
    R lazy
    A lm/Jamfile
    A lm/bhiksha.cc
    A lm/bhiksha.hh
    A lm/binary_format.cc
    A lm/binary_format.hh
    A lm/blank.hh
    A lm/build_binary.cc
    A lm/config.cc
    A lm/config.hh
    A lm/enumerate_vocab.hh
    A lm/facade.hh
    A lm/fragment.cc
    A lm/left.hh
    A lm/left_test.cc
    A lm/lm_exception.cc
    A lm/lm_exception.hh
    A lm/max_order.cc
    A lm/max_order.hh
    A lm/model.cc
    A lm/model.hh
    A lm/model_test.cc
    A lm/model_type.hh
    A lm/ngram_query.cc
    A lm/ngram_query.hh
    A lm/partial.hh
    A lm/partial_test.cc
    A lm/quantize.cc
    A lm/quantize.hh
    A lm/read_arpa.cc
    A lm/read_arpa.hh
    A lm/return.hh
    A lm/search_hashed.cc
    A lm/search_hashed.hh
    A lm/search_trie.cc
    A lm/search_trie.hh
    A lm/state.hh
    A lm/test.arpa
    A lm/test_nounk.arpa
    A lm/trie.cc
    A lm/trie.hh
    A lm/trie_sort.cc
    A lm/trie_sort.hh
    A lm/value.hh
    A lm/value_build.cc
    A lm/value_build.hh
    A lm/virtual_interface.cc
    A lm/virtual_interface.hh
    A lm/vocab.cc
    A lm/vocab.hh
    A lm/weights.hh
    A lm/word_index.hh
    M mert/Jamfile
    M moses/src/DynSAInclude/Jamfile
    M moses/src/Incremental/Jamfile
    M moses/src/Jamfile
    M moses/src/LM/Jamfile
    A search/Jamfile
    A search/arity.hh
    A search/config.hh
    A search/context.hh
    A search/edge.hh
    A search/edge_generator.cc
    A search/edge_generator.hh
    A search/edge_queue.cc
    A search/edge_queue.hh
    A search/final.hh
    A search/note.hh
    A search/rule.cc
    A search/rule.hh
    A search/source.hh
    A search/types.hh
    A search/vertex.cc
    A search/vertex.hh
    A search/vertex_generator.cc
    A search/vertex_generator.hh
    A search/weights.cc
    A search/weights.hh
    A search/weights_test.cc
    A util/Jamfile
    A util/bit_packing.cc
    A util/bit_packing.hh
    A util/bit_packing_test.cc
    A util/check.hh
    A util/ersatz_progress.cc
    A util/ersatz_progress.hh
    A util/exception.cc
    A util/exception.hh
    A util/file.cc
    A util/file.hh
    A util/file_piece.cc
    A util/file_piece.hh
    A util/file_piece_test.cc
    A util/getopt.c
    A util/getopt.hh
    A util/have.hh
    A util/joint_sort.hh
    A util/joint_sort_test.cc
    A util/mmap.cc
    A util/mmap.hh
    A util/murmur_hash.cc
    A util/murmur_hash.hh
    A util/probing_hash_table.hh
    A util/probing_hash_table_test.cc
    A util/proxy_iterator.hh
    A util/scoped.hh
    A util/sized_iterator.hh
    A util/sorted_uniform.hh
    A util/sorted_uniform_test.cc
    A util/string_piece.cc
    A util/string_piece.hh
    A util/tokenize_piece.hh
    A util/tokenize_piece_test.cc
    A util/usage.cc
    A util/usage.hh

  Log Message:
  -----------
  Submodules are evil.  Undo it.


  Commit: 365e68011521fee9d9e8f22801e58891c5fa5f0b
      https://github.com/moses-smt/mosesdecoder/commit/365e68011521fee9d9e8f22801e58891c5fa5f0b
  Author: Barry Haddow <bar...@gm...>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M Jamroot
    M contrib/server/mosesserver.cpp
    M jam-files/sanity.jam
    R lm/COPYING
    R lm/COPYING.LESSER
    M lm/Jamfile
    R lm/LICENSE
    R lm/README
    R lm/clean.sh
    R lm/compile.sh
    A lm/fragment.cc
    M lm/max_order.hh
    A lm/partial.hh
    A lm/partial_test.cc
    M lm/state.hh
    R lm/test.sh
    M lm/word_index.hh
    M moses-chart-cmd/src/IOWrapper.h
    M moses-chart-cmd/src/Main.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerCYKPlus.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerCYKPlus.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemory.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.h
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
    M moses/src/CYKPlusParser/ChartRuleLookupManagerOnDisk.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/ChartCellLabelSet.h
    M moses/src/ChartManager.cpp
    M moses/src/ChartManager.h
    A moses/src/ChartParser.cpp
    A moses/src/ChartParser.h
    A moses/src/ChartParserCallback.h
    M moses/src/ChartRuleLookupManager.h
    M moses/src/ChartTranslationOptionList.cpp
    M moses/src/ChartTranslationOptionList.h
    M moses/src/ChartTranslationOptions.cpp
    M moses/src/CompactPT/PhraseDictionaryCompact.h
    A moses/src/Incremental/Fill.cpp
    A moses/src/Incremental/Fill.h
    A moses/src/Incremental/Jamfile
    A moses/src/Incremental/Manager.cpp
    A moses/src/Incremental/Manager.h
    M moses/src/Jamfile
    M moses/src/LM/Base.cpp
    M moses/src/LM/Base.h
    M moses/src/LM/Jamfile
    M moses/src/LM/Ken.cpp
    M moses/src/Phrase.cpp
    M moses/src/Phrase.h
    M moses/src/PhraseDictionary.h
    M moses/src/PhraseDictionaryDynSuffixArray.cpp
    M moses/src/PhraseDictionaryDynSuffixArray.h
    M moses/src/PhraseDictionaryMemory.h
    M moses/src/PhraseDictionaryTreeAdaptor.h
    M moses/src/RuleCubeItem.cpp
    M moses/src/RuleTable/Loader.h
    M moses/src/RuleTable/LoaderCompact.cpp
    M moses/src/RuleTable/LoaderCompact.h
    M moses/src/RuleTable/LoaderHiero.cpp
    M moses/src/RuleTable/LoaderHiero.h
    M moses/src/RuleTable/LoaderStandard.cpp
    M moses/src/RuleTable/LoaderStandard.h
    M moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
    M moses/src/RuleTable/PhraseDictionaryFuzzyMatch.cpp
    M moses/src/RuleTable/PhraseDictionaryFuzzyMatch.h
    M moses/src/RuleTable/PhraseDictionaryOnDisk.cpp
    M moses/src/RuleTable/PhraseDictionaryOnDisk.h
    M moses/src/RuleTable/PhraseDictionarySCFG.cpp
    M moses/src/RuleTable/PhraseDictionarySCFG.h
    M moses/src/RuleTable/Trie.cpp
    M moses/src/RuleTable/UTrie.cpp
    M moses/src/RuleTable/UTrie.h
    M moses/src/Scope3Parser/Parser.cpp
    M moses/src/Scope3Parser/Parser.h
    M moses/src/Scope3Parser/StackLatticeBuilder.cpp
    M moses/src/Scope3Parser/StackLatticeBuilder.h
    M moses/src/Scope3Parser/StackLatticeSearcher.h
    M moses/src/Sentence.cpp
    M moses/src/StackVec.h
    M moses/src/StaticData.cpp
    M moses/src/StaticData.h
    M moses/src/TypeDef.h
    M moses/src/Word.cpp
    M moses/src/Word.h
    M scripts/generic/trainlm-irst.perl
    A search/Jamfile
    A search/arity.hh
    A search/config.hh
    A search/context.hh
    A search/edge.hh
    A search/edge_generator.cc
    A search/edge_generator.hh
    A search/edge_queue.cc
    A search/edge_queue.hh
    A search/final.hh
    A search/note.hh
    A search/rule.cc
    A search/rule.hh
    A search/source.hh
    A search/types.hh
    A search/vertex.cc
    A search/vertex.hh
    A search/vertex_generator.cc
    A search/vertex_generator.hh
    A search/weights.cc
    A search/weights.hh
    A search/weights_test.cc
    R util/COPYING
    R util/COPYING.LESSER
    M util/Jamfile
    R util/LICENSE
    M util/have.hh
    A util/string_piece.cc
    R util/util.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into miramerge

NB Untested

Conflicts:
	Jamroot
	moses-chart-cmd/src/Main.cpp
	moses/src/ChartManager.cpp
	moses/src/RuleTable/LoaderStandard.cpp
	moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
	moses/src/Word.cpp


Compare: https://github.com/moses-smt/mosesdecoder/compare/61ae24aa5d1d...365e68011521