merge upstream/master

1 files changed, 127 insertions, 125 deletions

diff --git a/.gitignore b/.gitignore
index 4c40fe81..aa2e64eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,128 @@
-*.log
-*.bbl
+*.a
 *.aux
+*.bbl
 *.blg
+*.dvi
 *.idx
+*.log
+*.o
 *.pdf
-*.dvi
 *.ps
-*.toc
-*.so
 *.pyc
+*.so
+*.toc
 *swp
-*.o
-*.a
 *~
 .*
 ./cdec/
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.guess
+config.h
+config.h.in
+config.h.in~
+config.log
+config.status
+config.sub
+configure
+decoder/Makefile
+decoder/Makefile.in
 decoder/bin/
+decoder/cdec
+decoder/dict_test
+decoder/ff_test
+decoder/grammar_test
+decoder/hg_test
+decoder/logval_test
+decoder/parser_test
+decoder/rule_lexer.cc
+decoder/small_vector_test
+decoder/trule_test
+decoder/weights_test
+depcomp
+dist
+dpmert/Makefile
+dpmert/Makefile.in
+dpmert/fast_score
+dpmert/lo_test
+dpmert/mr_dpmert_generate_mapper_input
+dpmert/mr_dpmert_map
+dpmert/mr_dpmert_reduce
+dpmert/scorer_test
+dpmert/sentclient
+dpmert/sentserver
+dpmert/union_forests
+dtrain/dtrain
+extools/build_lexical_translation
+extools/extractor
+extools/extractor_monolingual
+extools/featurize_grammar
+extools/filter_grammar
+extools/filter_score_grammar
+extools/mr_stripe_rule_reduce
+extools/score_grammar
+extools/sg_lexer.cc
+gi/clda/src/clda
+gi/markov_al/ml
+gi/pf/align-lexonly
+gi/pf/align-lexonly-pyp
 gi/pf/align-tl
 gi/pf/bayes_lattice_score
+gi/pf/brat
+gi/pf/cbgi
+gi/pf/condnaive
+gi/pf/dpnaive
+gi/pf/itg
+gi/pf/learn_cfg
 gi/pf/nuisance_test
 gi/pf/pf_test
+gi/pf/pfbrat
+gi/pf/pfdist
+gi/pf/pfnaive
 gi/pf/pyp_lm
+gi/posterior-regularisation/prjava/build/
+gi/posterior-regularisation/prjava/lib/*.jar
+gi/posterior-regularisation/prjava/lib/prjava-20100713.jar
+gi/posterior-regularisation/prjava/lib/prjava-20100715.jar
+gi/posterior-regularisation/prjava/prjava.jar
+gi/pyp-topics/src/contexts_lexer.cc
+gi/pyp-topics/src/pyp-contexts-train
+gi/pyp-topics/src/pyp-topics-train
+install-sh
 jam-files/bjam
 jam-files/engine/bin.*
 jam-files/engine/bootstrap/
 klm/lm/bin/
+klm/lm/build_binary
 klm/lm/query
 klm/util/bin/
+libtool
+ltmain.sh
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+minrisk/minrisk_optimize
+mira/kbest_mira
+missing
 mteval/bin/
+mteval/fast_score
+mteval/mbr_kbest
+mteval/scorer_test
+phrasinator/gibbs_train_plm
+phrasinator/gibbs_train_plm_notables
+previous.sh
+pro-train/mr_pro_map
+pro-train/mr_pro_reduce
+python/setup.py
 rampion/rampion_cccp
 rst_parser/mst_train
+rst_parser/random_tree
 rst_parser/rst_parse
 rst_parser/rst_train
-training/liblbfgs/bin/
-training/liblbfgs/ll_test
-utils/atools
-utils/bin/
-utils/crp_test
-mira/kbest_mira
-utils/m_test
 sa-extract/calignment.c
 sa-extract/cdat.c
 sa-extract/cfloatlist.c
@@ -52,126 +136,44 @@ sa-extract/precomputation.c
 sa-extract/rule.c
 sa-extract/rulefactory.c
 sa-extract/sym.c
-training/lbl_model
-training/mpi_flex_optimize
-training/test_ngram
-utils/dict_test
-utils/logval_test
-utils/mfcr_test
-utils/phmt
-utils/small_vector_test
-utils/ts
-utils/weights_test
-pro-train/mr_pro_map
-pro-train/mr_pro_reduce
-utils/reconstruct_weights
+stamp-h1
+tests/system_tests/hmm/foo.src
+training/Makefile
+training/Makefile.in
+training/atools
 training/augment_grammar
+training/cllh_filter_grammar
+training/collapse_weights
+training/grammar_convert
+training/lbfgs_test
+training/lbl_model
+training/liblbfgs/bin/
+training/liblbfgs/ll_test
+training/model1
 training/mpi_batch_optimize
 training/mpi_compute_cllh
 training/mpi_em_optimize
 training/mpi_extract_features
 training/mpi_extract_reachable
-klm/lm/build_binary
-extools/extractor_monolingual
-gi/pf/learn_cfg
-gi/pf/brat
-gi/pf/cbgi
-gi/pf/dpnaive
-gi/pf/itg
-gi/pf/pfbrat
-gi/pf/pfdist
-gi/pf/pfnaive
-gi/markov_al/ml
-gi/posterior-regularisation/prjava/lib/*.jar
-tests/system_tests/hmm/foo.src
-training/cllh_filter_grammar
-mteval/fast_score
-mteval/mbr_kbest
+training/mpi_flex_optimize
 training/mpi_online_optimize
-dpmert/sentserver
-dpmert/sentclient
-gi/pyp-topics/src/contexts_lexer.cc
-config.guess
-config.sub
-libtool
-ltmain.sh
-config.h.in~
-decoder/ff_test
-decoder/grammar_test
-decoder/hg_test
-decoder/parser_test
-decoder/small_vector_test
-decoder/rule_lexer.cc
-training/atools
-training/collapse_weights
-training/lbfgs_test
-training/mr_optimize_reduce
 training/mr_em_adapted_reduce
 training/mr_em_map_adapter
+training/mr_optimize_reduce
 training/mr_reduce_to_weights
 training/optimize_test
 training/plftools
-dpmert/fast_score
-dpmert/lo_test
-dpmert/mr_dpmert_map
-dpmert/mr_dpmert_reduce
-dpmert/scorer_test
-dpmert/union_forests
-minrisk/minrisk_optimize
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache/
-config.h
-config.h.in
-config.log
-config.status
-configure
-depcomp
-install-sh
-missing
-extools/extractor
-extools/mr_stripe_rule_reduce
-decoder/Makefile
-decoder/Makefile.in
-decoder/cdec
-decoder/dict_test
-decoder/trule_test
-decoder/weights_test
-stamp-h1
-training/Makefile
-training/Makefile.in
-training/grammar_convert
-training/model1
-dpmert/Makefile
-dpmert/Makefile.in
-dpmert/mr_dpmert_generate_mapper_input
-decoder/logval_test
-dtrain/dtrain
-extools/build_lexical_translation
-extools/filter_grammar
-extools/score_grammar
-gi/clda/src/clda
-gi/pyp-topics/src/pyp-topics-train
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-extools/featurize_grammar
-extools/filter_score_grammar
-gi/posterior-regularisation/prjava/build/
-gi/posterior-regularisation/prjava/lib/prjava-20100713.jar
-gi/posterior-regularisation/prjava/prjava.jar
-gi/pyp-topics/src/pyp-contexts-train
-extools/sg_lexer.cc
-gi/posterior-regularisation/prjava/lib/prjava-20100715.jar
-gi/pf/align-lexonly
-gi/pf/align-lexonly-pyp
-gi/pf/condnaive
-mteval/scorer_test
-phrasinator/gibbs_train_plm
-phrasinator/gibbs_train_plm_notables
-previous.sh
-dist
-python/build/
+training/test_ngram
+utils/atools
+utils/bin/
+utils/crp_test
+utils/dict_test
+utils/logval_test
+utils/m_test
+utils/mfcr_test
+utils/phmt
+utils/reconstruct_weights
+utils/small_vector_test
+utils/ts
+utils/weights_test
+utils/unigram_pyp_lm