Merge branch 'master' of github.com:redpony/cdec

1 files changed, 18 insertions, 71 deletions

diff --git a/.gitignore b/.gitignore
index 943e6dc5..571360ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,19 @@
+*.log
+*.bbl
+*.aux
+*.blg
+*.idx
+*.pdf
+*.dvi
+*.ps
+*.toc
+*.so
+*.pyc
+*swp
+*.o
+*.a
+*~
+.*
 ./cdec/
 decoder/bin/
 gi/pf/align-tl
@@ -6,21 +22,17 @@ gi/pf/nuisance_test
 gi/pf/pf_test
 gi/pf/pyp_lm
 jam-files/bjam
-jam-files/engine/bin.linuxx86_64/
+jam-files/engine/bin.*
 jam-files/engine/bootstrap/
 klm/lm/bin/
-klm/lm/libkenlm.so
-klm/lm/libkenutil.so
 klm/lm/query
 klm/util/bin/
 mteval/bin/
 rampion/rampion_cccp
-rst_parser/librst.a
 rst_parser/mst_train
 rst_parser/rst_parse
 rst_parser/rst_train
 training/liblbfgs/bin/
-training/liblbfgs/liblbfgs.a
 training/liblbfgs/ll_test
 utils/atools
 utils/bin/
@@ -28,38 +40,18 @@ utils/crp_test
 mira/kbest_mira
 utils/m_test
 sa-extract/calignment.c
-sa-extract/calignment.so
 sa-extract/cdat.c
-sa-extract/cdat.so
 sa-extract/cfloatlist.c
-sa-extract/cfloatlist.so
 sa-extract/cintlist.c
-sa-extract/cintlist.so
 sa-extract/clex.c
-sa-extract/clex.so
-sa-extract/cn.pyc
-sa-extract/context_model.pyc
 sa-extract/cstrmap.c
-sa-extract/cstrmap.so
 sa-extract/csuf.c
-sa-extract/csuf.so
 sa-extract/cveb.c
-sa-extract/cveb.so
 sa-extract/lcp.c
-sa-extract/lcp.so
-sa-extract/log.pyc
-sa-extract/manager.pyc
-sa-extract/model.pyc
-sa-extract/monitor.pyc
 sa-extract/precomputation.c
-sa-extract/precomputation.so
 sa-extract/rule.c
-sa-extract/rule.so
 sa-extract/rulefactory.c
-sa-extract/rulefactory.so
-sa-extract/sgml.pyc
 sa-extract/sym.c
-sa-extract/sym.so
 training/lbl_model
 training/mpi_flex_optimize
 training/test_ngram
@@ -70,11 +62,9 @@ utils/phmt
 utils/small_vector_test
 utils/ts
 utils/weights_test
-pro-train/.deps
 pro-train/mr_pro_map
 pro-train/mr_pro_reduce
 utils/reconstruct_weights
-decoder/.libs
 training/augment_grammar
 training/mpi_batch_optimize
 training/mpi_compute_cllh
@@ -83,34 +73,21 @@ training/mpi_extract_features
 training/mpi_extract_reachable
 klm/lm/build_binary
 extools/extractor_monolingual
-gi/pf/.deps
 gi/pf/learn_cfg
 gi/pf/brat
 gi/pf/cbgi
 gi/pf/dpnaive
 gi/pf/itg
-gi/pf/libpf.a
 gi/pf/pfbrat
 gi/pf/pfdist
 gi/pf/pfnaive
-gi/markov_al/.deps
 gi/markov_al/ml
 gi/posterior-regularisation/prjava/lib/*.jar
-klm/lm/libklm.a
-klm/util/.deps
-klm/util/libklm_util.a
-mteval/.deps/
 tests/system_tests/hmm/foo.src
 training/cllh_filter_grammar
-klm/lm/.deps
 mteval/fast_score
-mteval/libmteval.a
 mteval/mbr_kbest
 training/mpi_online_optimize
-utils/.deps/
-utils/libutils.a
-*swp
-*.o
 dpmert/sentserver
 dpmert/sentclient
 gi/pyp-topics/src/contexts_lexer.cc
@@ -128,7 +105,6 @@ decoder/rule_lexer.cc
 training/atools
 training/collapse_weights
 training/lbfgs_test
-training/libtraining.a
 training/mr_optimize_reduce
 training/mr_em_adapted_reduce
 training/mr_em_map_adapter
@@ -141,6 +117,7 @@ dpmert/mr_dpmert_map
 dpmert/mr_dpmert_reduce
 dpmert/scorer_test
 dpmert/union_forests
+minrisk/minrisk_optimize
 Makefile
 Makefile.in
 aclocal.m4
@@ -153,48 +130,29 @@ configure
 depcomp
 install-sh
 missing
-extools/.deps/
-extools/*.o
 extools/extractor
 extools/mr_stripe_rule_reduce
-decoder/.deps/
-decoder/*.o
 decoder/Makefile
 decoder/Makefile.in
 decoder/cdec
 decoder/dict_test
-decoder/libcdec.a
 decoder/trule_test
 decoder/weights_test
 stamp-h1
-training/.deps/
 training/Makefile
 training/Makefile.in
-training/*.o
 training/grammar_convert
 training/model1
-dpmert/.deps/
 dpmert/Makefile
 dpmert/Makefile.in
 dpmert/mr_dpmert_generate_mapper_input
-dpmert/*.o
 decoder/logval_test
 dtrain/dtrain
-dtrain/*.o
 extools/build_lexical_translation
 extools/filter_grammar
 extools/score_grammar
-gi/clda/src/.deps/
 gi/clda/src/clda
-gi/clda/src/clda.o
-gi/pyp-topics/src/.deps/
-gi/pyp-topics/src/corpus.o
-gi/pyp-topics/src/gammadist.o
-gi/pyp-topics/src/gzstream.o
-gi/pyp-topics/src/mt19937ar.o
 gi/pyp-topics/src/pyp-topics-train
-gi/pyp-topics/src/pyp-topics.o
-gi/pyp-topics/src/train.o
 m4/libtool.m4
 m4/ltoptions.m4
 m4/ltsugar.m4
@@ -208,22 +166,11 @@ 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
-*.log
-*.bbl
-*.aux
-*.blg
-*.idx
-*.pdf
-*.dvi
-*.ps
-*.toc
-*~
 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