removed some quirks, less boost, prettier code, score_t

12 files changed, 20 insertions, 1 deletions

diff --git a/dtrain/test/cdec_toy/cdec.ini b/dtrain/test/cdec_toy/cdec.ini
index 3a6bab68..9eb34512 100644
--- a/dtrain/test/cdec_toy/cdec.ini
+++ b/dtrain/test/cdec_toy/cdec.ini
@@ -1,3 +1,4 @@
 formalism=scfg
 grammar=../dtrain/test/toy_cdec/grammar
 add_pass_through_rules=true
+weights=../dtrain/test/toy_cdec/weights
diff --git a/dtrain/test/example/cdec.ini b/dtrain/test/example/cdec.ini
new file mode 100644
index 00000000..cdc8a8bb
--- /dev/null
+++ b/dtrain/test/example/cdec.ini
@@ -0,0 +1,7 @@
+formalism=scfg
+add_pass_through_rules=true
+cubepruning_pop_limit=30
+scfg_max_span_limit=15
+feature_function=WordPenalty
+feature_function=KLanguageModel /home/pks/z/X/x/dtrain/test/example/nc-wmt11.en.srilm.gz
+#feature_function=RuleIdentityFeatures
diff --git a/dtrain/test/example/dtrain.ini b/dtrain/test/example/dtrain.ini
new file mode 100644
index 00000000..aee3c89e
--- /dev/null
+++ b/dtrain/test/example/dtrain.ini
@@ -0,0 +1,11 @@
+decoder_config=test/example/cdec.ini
+ksamples=100
+ngrams=3
+epochs=1000
+input=test/example/nc-1k.gz
+scorer=stupid_bleu
+output=test/example/weights.gz
+stop_after=10
+sample_from=kbest
+pair_sampling=all
+print_weights=Glue WordPenalty LanguageModel LanguageModel_OOV PhraseModel_0 PhraseModel_1 PhraseModel_2 PhraseModel_3 PhraseModel_4 PassThrough
diff --git a/dtrain/test/example/nc-1k-tabs.gz b/dtrain/test/example/nc-1k-tabs.gz
new file mode 100644
index 00000000..45496cd8
--- /dev/null
+++ b/dtrain/test/example/nc-1k-tabs.gz
diff --git a/dtrain/test/example/nc-1k.gz b/dtrain/test/example/nc-1k.gz
new file mode 100644
index 00000000..f638a166
--- /dev/null
+++ b/dtrain/test/example/nc-1k.gz
diff --git a/dtrain/test/example/nc-wmt11.en.srilm.gz b/dtrain/test/example/nc-wmt11.en.srilm.gz
new file mode 100644
index 00000000..7ce81057
--- /dev/null
+++ b/dtrain/test/example/nc-wmt11.en.srilm.gz
diff --git a/dtrain/test/example/weights.gz b/dtrain/test/example/weights.gz
new file mode 100644
index 00000000..21157427
--- /dev/null
+++ b/dtrain/test/example/weights.gz
diff --git a/dtrain/test/logreg/bin_class.cc b/dtrain/test/log_reg_dyer/bin_class.cc
index 19bcde25..19bcde25 100644
--- a/dtrain/test/logreg/bin_class.cc
+++ b/dtrain/test/log_reg_dyer/bin_class.cc
diff --git a/dtrain/test/logreg/bin_class.h b/dtrain/test/log_reg_dyer/bin_class.h
index 3466109a..3466109a 100644
--- a/dtrain/test/logreg/bin_class.h
+++ b/dtrain/test/log_reg_dyer/bin_class.h
diff --git a/dtrain/test/logreg/log_reg.cc b/dtrain/test/log_reg_dyer/log_reg.cc
index ec2331fe..ec2331fe 100644
--- a/dtrain/test/logreg/log_reg.cc
+++ b/dtrain/test/log_reg_dyer/log_reg.cc
diff --git a/dtrain/test/logreg/log_reg.h b/dtrain/test/log_reg_dyer/log_reg.h
index ecc560b8..ecc560b8 100644
--- a/dtrain/test/logreg/log_reg.h
+++ b/dtrain/test/log_reg_dyer/log_reg.h
diff --git a/dtrain/test/toy_example/dtrain.ini b/dtrain/test/toy_example/dtrain.ini
index 0cc222e1..3ab4f8d4 100644
--- a/dtrain/test/toy_example/dtrain.ini
+++ b/dtrain/test/toy_example/dtrain.ini
@@ -1,5 +1,5 @@
 decoder_config=test/toy_example/cdec.ini
-kbest=4
+ksamples=4
 ngrams=3
 epochs=2
 input=test/toy_example/toy.in