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

1 files changed, 43 insertions, 43 deletions

diff --git a/training/dtrain/examples/standard/expected-output b/training/dtrain/examples/standard/expected-output
index 7cd09dbf..21f91244 100644
--- a/training/dtrain/examples/standard/expected-output
+++ b/training/dtrain/examples/standard/expected-output
@@ -4,14 +4,14 @@ Reading ./nc-wmt11.en.srilm.gz
 ----5---10---15---20---25---30---35---40---45---50---55---60---65---70---75---80---85---90---95--100
 ****************************************************************************************************
   Example feature: Shape_S00000_T00000
-Seeding random number sequence to 2679584485
+Seeding random number sequence to 970626287
 
 dtrain
 Parameters:
                        k 100
                        N 4
                        T 2
-                  scorer 'stupid_bleu'
+                  scorer 'fixed_stupid_bleu'
              sample from 'kbest'
                   filter 'uniq'
            learning rate 1
@@ -34,58 +34,58 @@ Iteration #1 of 2.
  . 10
 Stopping after 10 input sentences.
 WEIGHTS
-              Glue = -576
-       WordPenalty = +417.79
-     LanguageModel = +5117.5
- LanguageModel_OOV = -1307
-     PhraseModel_0 = -1612
-     PhraseModel_1 = -2159.6
-     PhraseModel_2 = -677.36
-     PhraseModel_3 = +2663.8
-     PhraseModel_4 = -1025.9
-     PhraseModel_5 = -8
-     PhraseModel_6 = +70
-       PassThrough = -1455
+              Glue = -614
+       WordPenalty = +1256.8
+     LanguageModel = +5610.5
+ LanguageModel_OOV = -1449
+     PhraseModel_0 = -2107
+     PhraseModel_1 = -4666.1
+     PhraseModel_2 = -2713.5
+     PhraseModel_3 = +4204.3
+     PhraseModel_4 = -1435.8
+     PhraseModel_5 = +916
+     PhraseModel_6 = +190
+       PassThrough = -2527
         ---
-       1best avg score: 0.27697 (+0.27697)
- 1best avg model score: -47918 (-47918)
-           avg # pairs: 581.9 (meaningless)
-        avg # rank err: 581.9
+       1best avg score: 0.17874 (+0.17874)
+ 1best avg model score: 88399 (+88399)
+           avg # pairs: 798.2 (meaningless)
+        avg # rank err: 798.2
      avg # margin viol: 0
-    non0 feature count: 703
-           avg list sz: 90.9
-           avg f count: 100.09
-(time 0.25 min, 1.5 s/S)
+    non0 feature count: 887
+           avg list sz: 91.3
+           avg f count: 126.85
+(time 0.33 min, 2 s/S)
 
 Iteration #2 of 2.
  . 10
 WEIGHTS
-              Glue = -622
-       WordPenalty = +898.56
-     LanguageModel = +8066.2
- LanguageModel_OOV = -2590
-     PhraseModel_0 = -4335.8
-     PhraseModel_1 = -5864.4
-     PhraseModel_2 = -1729.8
-     PhraseModel_3 = +2831.9
-     PhraseModel_4 = -5384.8
-     PhraseModel_5 = +1449
-     PhraseModel_6 = +480
-       PassThrough = -2578
+              Glue = -1025
+       WordPenalty = +1751.5
+     LanguageModel = +10059
+ LanguageModel_OOV = -4490
+     PhraseModel_0 = -2640.7
+     PhraseModel_1 = -3757.4
+     PhraseModel_2 = -1133.1
+     PhraseModel_3 = +1837.3
+     PhraseModel_4 = -3534.3
+     PhraseModel_5 = +2308
+     PhraseModel_6 = +1677
+       PassThrough = -6222
         ---
-       1best avg score: 0.37119 (+0.094226)
- 1best avg model score: -1.3174e+05 (-83822)
-           avg # pairs: 584.1 (meaningless)
-        avg # rank err: 584.1
+       1best avg score: 0.30764 (+0.12891)
+ 1best avg model score: -2.5042e+05 (-3.3882e+05)
+           avg # pairs: 725.9 (meaningless)
+        avg # rank err: 725.9
      avg # margin viol: 0
-    non0 feature count: 1115
+    non0 feature count: 1499
            avg list sz: 91.3
-           avg f count: 90.755
-(time 0.3 min, 1.8 s/S)
+           avg f count: 114.34
+(time 0.32 min, 1.9 s/S)
 
 Writing weights file to '-' ...
 done
 
 ---
-Best iteration: 2 [SCORE 'stupid_bleu'=0.37119].
-This took 0.55 min.
+Best iteration: 2 [SCORE 'fixed_stupid_bleu'=0.30764].
+This took 0.65 min.