[moses-smt/mosesdecoder] 9340f9: Update incremental search

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/moses-smt/mosesdecoder
  Commit: 9340f9f465a29e7653f9285963bcad0fe4a60ec6
      https://github.com/moses-smt/mosesdecoder/commit/9340f9f465a29e7653f9285963bcad0fe4a60ec6
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M moses/ChartCellLabel.h
    R moses/Incremental/Fill.cpp
    R moses/Incremental/Fill.h
    M moses/Incremental/Manager.cpp
    M search/Jamfile
    A search/applied.hh
    M search/config.hh
    M search/context.hh
    M search/edge_generator.cc
    M search/edge_generator.hh
    R search/final.hh
    M search/header.hh
    A search/nbest.cc
    A search/nbest.hh
    R search/note.hh
    M search/rule.cc
    M search/rule.hh
    M search/types.hh
    M search/vertex.cc
    M search/vertex.hh
    M search/vertex_generator.cc
    M search/vertex_generator.hh
    R search/weights.cc
    R search/weights.hh
    R search/weights_test.cc

  Log Message:
  -----------
  Update incremental search


  Commit: 6a3fdcd8c043148769736d113562fc8c92e917ca
      https://github.com/moses-smt/mosesdecoder/commit/6a3fdcd8c043148769736d113562fc8c92e917ca
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M moses-chart-cmd/Main.cpp
    A moses/Incremental.cpp
    A moses/Incremental.h
    R moses/Incremental/Manager.cpp
    R moses/Incremental/Manager.h
    M moses/Jamfile
    M moses/LM/Ken.cpp

  Log Message:
  -----------
  Rename Incremental/Manager.cpp to just Incremental.cpp


  Commit: 2df57b6b092b6e713814ab5c19fdc7d0525fb945
      https://github.com/moses-smt/mosesdecoder/commit/2df57b6b092b6e713814ab5c19fdc7d0525fb945
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M moses-chart-cmd/IOWrapper.cpp
    M moses-chart-cmd/IOWrapper.h
    M moses-chart-cmd/Main.cpp
    M moses/Incremental.cpp
    M moses/Incremental.h

  Log Message:
  -----------
  Expose k-best lists from incremental search


  Commit: 4f3afbf41ff52fa1398b74ba62a5f15ef3fea8f2
      https://github.com/moses-smt/mosesdecoder/commit/4f3afbf41ff52fa1398b74ba62a5f15ef3fea8f2
  Author: Kenneth Heafield <gi...@kh...>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M contrib/python/README.md
    M contrib/python/example.py
    M contrib/python/moses/dictree.cpp
    M contrib/python/moses/dictree.pyx
    M contrib/server/mosesserver.cpp
    M lm/max_order.hh
    M misc/processPhraseTable.cpp
    M moses-chart-cmd/IOWrapper.cpp
    M moses-chart-cmd/IOWrapper.h
    M moses-chart-cmd/Main.cpp
    M moses/ChartTrellisPath.h
    M moses/DummyScoreProducers.h
    M moses/PhraseDictionaryTree.cpp
    M moses/TargetPhrase.cpp
    M moses/TranslationOptionCollection.cpp
    M phrase-extract/ScoreFeature.cpp
    M phrase-extract/score-main.cpp
    M scripts/ems/experiment.perl
    M scripts/training/filter-model-given-input.pl
    M scripts/training/train-model.perl

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

Conflicts:
	moses-chart-cmd/IOWrapper.cpp
	moses-chart-cmd/Main.cpp


Compare: https://github.com/moses-smt/mosesdecoder/compare/454037b6b7bb...4f3afbf41ff5