more fixes

4 files changed, 7 insertions, 69 deletions

diff --git a/training/dtrain/examples/toy/cdec.ini b/training/dtrain/examples/toy/cdec.ini
index e6c19abe..b14f4819 100644
--- a/training/dtrain/examples/toy/cdec.ini
+++ b/training/dtrain/examples/toy/cdec.ini
@@ -1,4 +1,3 @@
 formalism=scfg
 add_pass_through_rules=true
 grammar=grammar.gz
-#add_extra_pass_through_features=6
diff --git a/training/dtrain/examples/toy/dtrain.ini b/training/dtrain/examples/toy/dtrain.ini
index 378224b8..140b3a75 100644
--- a/training/dtrain/examples/toy/dtrain.ini
+++ b/training/dtrain/examples/toy/dtrain.ini
@@ -1,8 +1,8 @@
-decoder_config=cdec.ini
 bitext=in
-output=weights
 k=4
 N=4
 iterations=2
 learning_rate=1
+output=weights
+decoder_conf=cdec.ini
 print_weights=logp shell_rule house_rule small_rule little_rule PassThrough PassThrough_1 PassThrough_2 PassThrough_3 PassThrough_4 PassThrough_5 PassThrough_6
diff --git a/training/dtrain/examples/toy/expected-output b/training/dtrain/examples/toy/expected-output
index 8c758d00..e69de29b 100644
--- a/training/dtrain/examples/toy/expected-output
+++ b/training/dtrain/examples/toy/expected-output
@@ -1,63 +0,0 @@
-dtrain
-Parameters:
-                       k 4
-                       N 4
-                       T 2
-           learning rate 1
-            error margin 0
-                  l1 reg 0
-            decoder conf 'cdec.ini'
-                   input 'in'
-                  output 'weights'
-(a dot per input)
-Iteration #1 of 2.
- ... 2
-WEIGHTS
-              logp = +0
-        shell_rule = +0
-        house_rule = +3
-        small_rule = +0
-       little_rule = +3
-       PassThrough = -15
-     PassThrough_1 = +0
-     PassThrough_2 = +0
-     PassThrough_3 = +0
-     PassThrough_4 = +0
-     PassThrough_5 = +0
-     PassThrough_6 = +0
-        ---
-       1best avg score: 0.40937 (+0.40937)
- 1best avg model score: 3
-           avg # pairs: 2.5
-   non-0 feature count: 4
-           avg list sz: 4
-           avg f count: 2.875
-(time 0 min, 0 s/S)
-
-Iteration #2 of 2.
- ... 2
-WEIGHTS
-              logp = +0
-        shell_rule = +0
-        house_rule = +3
-        small_rule = +0
-       little_rule = +3
-       PassThrough = -15
-     PassThrough_1 = +0
-     PassThrough_2 = +0
-     PassThrough_3 = +0
-     PassThrough_4 = +0
-     PassThrough_5 = +0
-     PassThrough_6 = +0
-        ---
-       1best avg score: 0.81873 (+0.40937)
- 1best avg model score: 6
-           avg # pairs: 0
-   non-0 feature count: 4
-           avg list sz: 4
-           avg f count: 3
-(time 0 min, 0 s/S)
-
----
-Best iteration: 2 [GOLD = 0.81873].
-This took 0 min.
diff --git a/training/dtrain/examples/toy/weights b/training/dtrain/examples/toy/weights
index f6f32772..5c1931ff 100644
--- a/training/dtrain/examples/toy/weights
+++ b/training/dtrain/examples/toy/weights
@@ -1,4 +1,6 @@
-house_rule 3
+house_rule 4
+shell_rule -2
+small_rule -1
 little_rule 3
-Glue -12
-PassThrough -15
+Glue -8
+PassThrough -10