added pro stuff,clean up

9 files changed, 18 insertions, 15 deletions

diff --git a/dtrain/test/example/cdec.ini b/dtrain/test/example/cdec.ini
index 31a205c7..ff99de7b 100644
--- a/dtrain/test/example/cdec.ini
+++ b/dtrain/test/example/cdec.ini
@@ -1,7 +1,8 @@
 formalism=scfg
 add_pass_through_rules=true
-cubepruning_pop_limit=30
 scfg_max_span_limit=15
+intersection_strategy=cube_pruning
+cubepruning_pop_limit=30
 feature_function=WordPenalty
 feature_function=KLanguageModel test/example/nc-wmt11.en.srilm.gz
-feature_function=RuleIdentityFeatures
+#feature_function=RuleIdentityFeatures
diff --git a/dtrain/test/example/dtrain.ini b/dtrain/test/example/dtrain.ini
index 0b066013..fab4d317 100644
--- a/dtrain/test/example/dtrain.ini
+++ b/dtrain/test/example/dtrain.ini
@@ -1,18 +1,20 @@
 decoder_config=test/example/cdec.ini
 k=100
 N=3
-gamma=0.001
-epochs=20
-input=test/example/nc-1k-tabs.gz
-scorer=smooth_bleu
-output=- #weights.gz
-stop_after=5
+learning_rate=0.0005
+gamma=0
+epochs=3
+input=test/example/nc-wmt11.1k.gz
+output=-
+scorer=stupid_bleu
 sample_from=forest
-pair_sampling=108010
-select_weights=VOID
+#filter=unique
+pair_sampling=5050
+select_weights=last
 print_weights=Glue WordPenalty LanguageModel LanguageModel_OOV PhraseModel_0 PhraseModel_1 PhraseModel_2 PhraseModel_3 PhraseModel_4 PassThrough
 tmp=/tmp
-#unit_weight_vector=
-keep_w=true
+stop_after=10
+#keep_w=
+#update_ok=
 #l1_reg=clip
-#l1_reg_strength=0.00001
+#l1_reg_strength=0.0001
diff --git a/dtrain/test/example/nc-1k.gz b/dtrain/test/example/nc-1k.gz
deleted file mode 100644
index f638a166..00000000
--- a/dtrain/test/example/nc-1k.gz
+++ /dev/null
diff --git a/dtrain/test/example/nc-1k-tabs.gz b/dtrain/test/example/nc-wmt11.1k.gz
index 45496cd8..45496cd8 100644
--- a/dtrain/test/example/nc-1k-tabs.gz
+++ b/dtrain/test/example/nc-wmt11.1k.gz
diff --git a/dtrain/test/log_reg_dyer/bin_class.cc b/dtrain/test/logreg_cd/bin_class.cc
index 19bcde25..19bcde25 100644
--- a/dtrain/test/log_reg_dyer/bin_class.cc
+++ b/dtrain/test/logreg_cd/bin_class.cc
diff --git a/dtrain/test/log_reg_dyer/bin_class.h b/dtrain/test/logreg_cd/bin_class.h
index 3466109a..3466109a 100644
--- a/dtrain/test/log_reg_dyer/bin_class.h
+++ b/dtrain/test/logreg_cd/bin_class.h
diff --git a/dtrain/test/log_reg_dyer/log_reg.cc b/dtrain/test/logreg_cd/log_reg.cc
index ec2331fe..ec2331fe 100644
--- a/dtrain/test/log_reg_dyer/log_reg.cc
+++ b/dtrain/test/logreg_cd/log_reg.cc
diff --git a/dtrain/test/log_reg_dyer/log_reg.h b/dtrain/test/logreg_cd/log_reg.h
index ecc560b8..ecc560b8 100644
--- a/dtrain/test/log_reg_dyer/log_reg.h
+++ b/dtrain/test/logreg_cd/log_reg.h
diff --git a/dtrain/test/toy/dtrain.ini b/dtrain/test/toy/dtrain.ini
index 5bfa5b2d..105c07df 100644
--- a/dtrain/test/toy/dtrain.ini
+++ b/dtrain/test/toy/dtrain.ini
@@ -3,7 +3,7 @@ k=4
 N=3
 epochs=2
 input=test/toy/in
-scorer=stupid_bleu
-sample_from=forest
 output=-
+scorer=stupid_bleu
+sample_from=kbest
 print_weights=logp use_shell use_house PassThrough