diff --git a/python/tests/test_vwconfig.py b/python/tests/test_vwconfig.py index 9987fe07f19..0fd5bb7a680 100644 --- a/python/tests/test_vwconfig.py +++ b/python/tests/test_vwconfig.py @@ -47,4 +47,4 @@ def test_vw_get_all_options(): for name, config_group in config.items(): cmd_str_list.add(name) - assert len(cmd_str_list) >= 74 \ No newline at end of file + assert len(cmd_str_list) >= 74 diff --git a/test/pred-sets/ref/override_epsilon.stderr b/test/pred-sets/ref/override_epsilon.stderr index 0dff2f84232..61cdeb73520 100644 --- a/test/pred-sets/ref/override_epsilon.stderr +++ b/test/pred-sets/ref/override_epsilon.stderr @@ -9,9 +9,9 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features --1.700000 -1.700000 1 1.0 known 0:0.85... 4 --0.850000 0.000000 2 2.0 known 0:0.85... 4 --0.850000 -0.850000 4 4.0 known 0:0.85... 4 +-1.700000 -1.700000 1 1.0 0:-1:0.5 0:0.85... 4 +-0.850000 0.000000 2 2.0 0:0:0.5 0:0.85... 4 +-0.850000 -0.850000 4 4.0 0:0:0.5 0:0.85... 4 finished run number of examples = 4 diff --git a/test/train-sets/ref/cb_adf_crash1.stderr b/test/train-sets/ref/cb_adf_crash1.stderr index 9a6320e0bbe..a9ce4fd7024 100644 --- a/test/train-sets/ref/cb_adf_crash1.stderr +++ b/test/train-sets/ref/cb_adf_crash1.stderr @@ -9,7 +9,7 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features --7.500000 -7.500000 1 1.0 known 0:0.5... 4 +-7.500000 -7.500000 1 1.0 0:-3:0.2 0:0.5... 4 finished run number of examples = 1 diff --git a/test/train-sets/ref/cb_as_ccb.cb.stderr b/test/train-sets/ref/cb_as_ccb.cb.stderr index 72585d55e09..42ddac5cd13 100644 --- a/test/train-sets/ref/cb_as_ccb.cb.stderr +++ b/test/train-sets/ref/cb_as_ccb.cb.stderr @@ -10,7 +10,7 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features --2.500000 -2.500000 1 1.0 known 0:0.5... 4 +-2.500000 -2.500000 1 1.0 1:-1:0.2 0:0.5... 4 finished run number of examples = 1 diff --git a/test/train-sets/ref/cb_zero_feature_vals.stderr b/test/train-sets/ref/cb_zero_feature_vals.stderr index 384b369ce0b..723b80166c8 100644 --- a/test/train-sets/ref/cb_zero_feature_vals.stderr +++ b/test/train-sets/ref/cb_zero_feature_vals.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 3 -0.333333 0.000000 2 2.0 known 0:0.5... 8 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 3 +0.333333 0.000000 2 2.0 1:0:0.5 0:0.5... 8 finished run number of examples = 3 diff --git a/test/train-sets/ref/cb_zero_feature_vals_dsjson.stderr b/test/train-sets/ref/cb_zero_feature_vals_dsjson.stderr index 35504dd56a7..38056f5fe86 100644 --- a/test/train-sets/ref/cb_zero_feature_vals_dsjson.stderr +++ b/test/train-sets/ref/cb_zero_feature_vals_dsjson.stderr @@ -10,8 +10,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features --1.000000 -1.000000 1 1.0 known 0:0.5... 2 --1.000000 -1.000000 2 2.0 known 0:0.5... 2 +-1.000000 -1.000000 1 1.0 0:-1:0.5 0:0.5... 2 +-1.000000 -1.000000 2 2.0 0:-1:0.5 0:0.5... 2 finished run number of examples = 2 diff --git a/test/train-sets/ref/cbe_adf_bag.stderr b/test/train-sets/ref/cbe_adf_bag.stderr index 14ea4595469..ffe26cb857b 100644 --- a/test/train-sets/ref/cbe_adf_bag.stderr +++ b/test/train-sets/ref/cbe_adf_bag.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_bag, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 0:0.5... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 0:0.5... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_cover.stderr b/test/train-sets/ref/cbe_adf_cover.stderr index ed1772350b9..543177dfda3 100644 --- a/test/train-sets/ref/cbe_adf_cover.stderr +++ b/test/train-sets/ref/cbe_adf_cover.stderr @@ -10,8 +10,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 0:0.5... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 0:0.5... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_cover_dr.json.stderr b/test/train-sets/ref/cbe_adf_cover_dr.json.stderr index 6080c943601..9667a2de871 100644 --- a/test/train-sets/ref/cbe_adf_cover_dr.json.stderr +++ b/test/train-sets/ref/cbe_adf_cover_dr.json.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 0:0.5... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 0:0.5... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_cover_dr.stderr b/test/train-sets/ref/cbe_adf_cover_dr.stderr index 7addf4b35ad..d0c93604f01 100644 --- a/test/train-sets/ref/cbe_adf_cover_dr.stderr +++ b/test/train-sets/ref/cbe_adf_cover_dr.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 0:0.5... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 0:0.5... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_cover_dr256.json.stderr b/test/train-sets/ref/cbe_adf_cover_dr256.json.stderr index d72a80843e3..81159df9d2b 100644 --- a/test/train-sets/ref/cbe_adf_cover_dr256.json.stderr +++ b/test/train-sets/ref/cbe_adf_cover_dr256.json.stderr @@ -9,15 +9,15 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 0:0.5... 6 -0.333333 0.333333 4 4.0 known 1:0.591752... 6 -0.297761 0.262189 8 8.0 known 1:0.666667... 6 -0.237339 0.176917 16 16.0 known 1:0.666667... 6 -0.179808 0.122276 32 32.0 known 1:0.666667... 6 -0.132652 0.085496 64 64.0 known 1:0.666667... 6 -0.096385 0.060119 128 128.0 known 1:0.666667... 6 -0.069389 0.042393 256 256.0 known 1:0.666667... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 0:0.5... 6 +0.333333 0.333333 4 4.0 1:0:0.5 1:0.591752... 6 +0.297761 0.262189 8 8.0 1:0:0.5 1:0.666667... 6 +0.237339 0.176917 16 16.0 1:0:0.5 1:0.666667... 6 +0.179808 0.122276 32 32.0 1:0:0.5 1:0.666667... 6 +0.132652 0.085496 64 64.0 1:0:0.5 1:0.666667... 6 +0.096385 0.060119 128 128.0 1:0:0.5 1:0.666667... 6 +0.069389 0.042393 256 256.0 1:0:0.5 1:0.666667... 6 finished run number of examples = 260 diff --git a/test/train-sets/ref/cbe_adf_cover_e_dec.stderr b/test/train-sets/ref/cbe_adf_cover_e_dec.stderr index de02d49df46..20111d37b09 100644 --- a/test/train-sets/ref/cbe_adf_cover_e_dec.stderr +++ b/test/train-sets/ref/cbe_adf_cover_e_dec.stderr @@ -10,10 +10,10 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 0:0.5... 6 -0.444444 0.666667 4 4.0 known 0:0.333333... 9 -0.318447 0.192450 8 8.0 known 1:0.683772... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 0:0.5... 6 +0.444444 0.666667 4 4.0 0:1:0.5 0:0.333333... 9 +0.318447 0.192450 8 8.0 1:0:0.5 1:0.683772... 6 finished run number of examples = 15 diff --git a/test/train-sets/ref/cbe_adf_cover_e_dec_predict.stderr b/test/train-sets/ref/cbe_adf_cover_e_dec_predict.stderr index f8016271df4..9b5b4a9cb46 100644 --- a/test/train-sets/ref/cbe_adf_cover_e_dec_predict.stderr +++ b/test/train-sets/ref/cbe_adf_cover_e_dec_predict.stderr @@ -11,10 +11,10 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.365148 0.365148 1 1.0 known 2:0.634852... 9 -0.182574 0.000000 2 2.0 known 1:0.666667... 6 -0.243432 0.365148 4 4.0 known 2:0.634852... 9 -0.182574 0.121716 8 8.0 known 1:0.666667... 6 +0.365148 0.365148 1 1.0 0:1:0.5 2:0.634852... 9 +0.182574 0.000000 2 2.0 1:0:0.5 1:0.666667... 6 +0.243432 0.365148 4 4.0 0:1:0.5 2:0.634852... 9 +0.182574 0.121716 8 8.0 1:0:0.5 1:0.666667... 6 finished run number of examples = 15 diff --git a/test/train-sets/ref/cbe_adf_cover_e_fixed.stderr b/test/train-sets/ref/cbe_adf_cover_e_fixed.stderr index 8111b82c50c..7e9d3f27289 100644 --- a/test/train-sets/ref/cbe_adf_cover_e_fixed.stderr +++ b/test/train-sets/ref/cbe_adf_cover_e_fixed.stderr @@ -10,10 +10,10 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 12 -0.333333 0.000000 2 2.0 known 1:0.75... 8 -0.333333 0.333333 4 4.0 known 1:0.666667... 12 -0.222222 0.111111 8 8.0 known 1:0.75... 8 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 12 +0.333333 0.000000 2 2.0 1:0:0.5 1:0.75... 8 +0.333333 0.333333 4 4.0 0:1:0.5 1:0.666667... 12 +0.222222 0.111111 8 8.0 1:0:0.5 1:0.75... 8 finished run number of examples = 15 diff --git a/test/train-sets/ref/cbe_adf_cover_e_fixed_predict.stderr b/test/train-sets/ref/cbe_adf_cover_e_fixed_predict.stderr index 2878add7fa6..239374e4dca 100644 --- a/test/train-sets/ref/cbe_adf_cover_e_fixed_predict.stderr +++ b/test/train-sets/ref/cbe_adf_cover_e_fixed_predict.stderr @@ -11,10 +11,10 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.333333 0.333333 1 1.0 known 1:0.555556... 12 -0.166667 0.000000 2 2.0 known 1:0.666667... 8 -0.222222 0.333333 4 4.0 known 1:0.555556... 12 -0.166667 0.111111 8 8.0 known 1:0.666667... 8 +0.333333 0.333333 1 1.0 0:1:0.5 1:0.555556... 12 +0.166667 0.000000 2 2.0 1:0:0.5 1:0.666667... 8 +0.222222 0.333333 4 4.0 0:1:0.5 1:0.555556... 12 +0.166667 0.111111 8 8.0 1:0:0.5 1:0.666667... 8 finished run number of examples = 15 diff --git a/test/train-sets/ref/cbe_adf_dsjson.stderr b/test/train-sets/ref/cbe_adf_dsjson.stderr index f3a62c4061a..55cf087a57d 100644 --- a/test/train-sets/ref/cbe_adf_dsjson.stderr +++ b/test/train-sets/ref/cbe_adf_dsjson.stderr @@ -11,9 +11,9 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features --0.102041 -0.102041 1 1.0 known 0:0.0833333... 361 --0.051020 0.000000 2 2.0 known 6:0.816667... 361 --0.040816 -0.020408 3 3.0 known 6:0.816667... 361 +-0.102041 -0.102041 1 1.0 9:-1:0.82 0:0.0833333... 361 +-0.051020 0.000000 2 2.0 9:0:0.82 6:0.816667... 361 +-0.040816 -0.020408 3 3.0 9:-1:0.82 6:0.816667... 361 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_dsjson_chain_hash.stderr b/test/train-sets/ref/cbe_adf_dsjson_chain_hash.stderr index 59056c357ed..077b650573e 100644 --- a/test/train-sets/ref/cbe_adf_dsjson_chain_hash.stderr +++ b/test/train-sets/ref/cbe_adf_dsjson_chain_hash.stderr @@ -1,4 +1,4 @@ -creating quadratic features for pairs: GT +creating quadratic features for pairs: GT predictions = cbe_adf_dsjson_chain_hash.predict Num weight bits = 18 learning rate = 0.5 @@ -10,9 +10,9 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features --0.102041 -0.102041 1 1.0 known 0:0.0833333... 361 --0.051020 0.000000 2 2.0 known 6:0.816667... 361 --0.040816 -0.020408 3 3.0 known 6:0.816667... 361 +-0.102041 -0.102041 1 1.0 9:-1:0.82 0:0.0833333... 361 +-0.051020 0.000000 2 2.0 9:0:0.82 6:0.816667... 361 +-0.040816 -0.020408 3 3.0 9:-1:0.82 6:0.816667... 361 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_epsilon.stderr b/test/train-sets/ref/cbe_adf_epsilon.stderr index d4cd4254fe0..c7b5ac3f503 100644 --- a/test/train-sets/ref/cbe_adf_epsilon.stderr +++ b/test/train-sets/ref/cbe_adf_epsilon.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 1:0.95... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 1:0.95... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_first.stderr b/test/train-sets/ref/cbe_adf_first.stderr index 6ee02f6256b..e2fd720016d 100644 --- a/test/train-sets/ref/cbe_adf_first.stderr +++ b/test/train-sets/ref/cbe_adf_first.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_first, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 1:0.5... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 1:0.5... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_nonewline.stderr b/test/train-sets/ref/cbe_adf_nonewline.stderr index 15c5f62e780..6a14bbf3c7f 100644 --- a/test/train-sets/ref/cbe_adf_nonewline.stderr +++ b/test/train-sets/ref/cbe_adf_nonewline.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 1:0.95... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 1:0.95... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_rnd.stderr b/test/train-sets/ref/cbe_adf_rnd.stderr index 2d43abdb643..30963ca3f17 100644 --- a/test/train-sets/ref/cbe_adf_rnd.stderr +++ b/test/train-sets/ref/cbe_adf_rnd.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_rnd, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.719921 0.719921 1 1.0 known 0:0.35996... 9 -0.359960 0.000000 2 2.0 known 1:0.932997... 6 +0.719921 0.719921 1 1.0 0:1:0.5 0:0.35996... 9 +0.359960 0.000000 2 2.0 1:0:0.5 1:0.932997... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_softmax.stderr b/test/train-sets/ref/cbe_adf_softmax.stderr index 9ff22b96d29..8223939e11a 100644 --- a/test/train-sets/ref/cbe_adf_softmax.stderr +++ b/test/train-sets/ref/cbe_adf_softmax.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_softmax, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 1:0.559575... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 1:0.559575... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_softmax_biglambda.stderr b/test/train-sets/ref/cbe_adf_softmax_biglambda.stderr index ec0cc8b9e4d..d6ee0f1e6dc 100644 --- a/test/train-sets/ref/cbe_adf_softmax_biglambda.stderr +++ b/test/train-sets/ref/cbe_adf_softmax_biglambda.stderr @@ -9,8 +9,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_softmax, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.666667 0.666667 1 1.0 known 0:0.333333... 9 -0.333333 0.000000 2 2.0 known 1:1... 6 +0.666667 0.666667 1 1.0 0:1:0.5 0:0.333333... 9 +0.333333 0.000000 2 2.0 1:0:0.5 1:1... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_adf_synthcover.stderr b/test/train-sets/ref/cbe_adf_synthcover.stderr index e47a1803375..ed0d49f88af 100644 --- a/test/train-sets/ref/cbe_adf_synthcover.stderr +++ b/test/train-sets/ref/cbe_adf_synthcover.stderr @@ -13,8 +13,8 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_synthcover, shared_feature_merger average since example example current current current loss last counter weight label predict features -0.660000 0.660000 1 1.0 known 2:0.34... 9 -0.330000 0.000000 2 2.0 known 1:0.995... 6 +0.660000 0.660000 1 1.0 0:1:0.5 2:0.34... 9 +0.330000 0.000000 2 2.0 1:0:0.5 1:0.995... 6 finished run number of examples = 3 diff --git a/test/train-sets/ref/cbe_cover_e_dec.stderr b/test/train-sets/ref/cbe_cover_e_dec.stderr index 425ca73e64a..219c042ef95 100644 --- a/test/train-sets/ref/cbe_cover_e_dec.stderr +++ b/test/train-sets/ref/cbe_cover_e_dec.stderr @@ -11,10 +11,10 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger, cb_to_cbadf average since example example current current current loss last counter weight label predict features -0.000000 0.000000 1 1.0 known 0:0.5... 6 -0.500000 1.000000 2 2.0 known 0:0.5... 6 -0.658248 0.816497 4 4.0 known 1:0.591752... 6 -0.590289 0.522329 8 8.0 known 0:0.666667... 6 +0.000000 0.000000 1 1.0 0:0:0.5 0:0.5... 6 +0.500000 1.000000 2 2.0 1:1:0.5 0:0.5... 6 +0.658248 0.816497 4 4.0 0:2:0.5 1:0.591752... 6 +0.590289 0.522329 8 8.0 1:1:0.5 0:0.666667... 6 finished run number of examples = 8 diff --git a/test/train-sets/ref/cbe_cover_e_dec_predict.stderr b/test/train-sets/ref/cbe_cover_e_dec_predict.stderr index 24aec2dd10d..a2d6efc1132 100644 --- a/test/train-sets/ref/cbe_cover_e_dec_predict.stderr +++ b/test/train-sets/ref/cbe_cover_e_dec_predict.stderr @@ -11,10 +11,10 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger, cb_to_cbadf average since example example current current current loss last counter weight label predict features -0.000000 0.000000 1 1.0 known 1:0.75... 6 -0.250000 0.500000 2 2.0 known 0:0.75... 6 -0.375000 0.500000 4 4.0 known 1:0.75... 6 -0.437500 0.500000 8 8.0 known 0:0.75... 6 +0.000000 0.000000 1 1.0 0:0:0.5 1:0.75... 6 +0.250000 0.500000 2 2.0 1:1:0.5 0:0.75... 6 +0.375000 0.500000 4 4.0 0:2:0.5 1:0.75... 6 +0.437500 0.500000 8 8.0 1:1:0.5 0:0.75... 6 finished run number of examples = 8 diff --git a/test/train-sets/ref/cbe_cover_e_fixed.stderr b/test/train-sets/ref/cbe_cover_e_fixed.stderr index ead4ce21a44..ffbd2483127 100644 --- a/test/train-sets/ref/cbe_cover_e_fixed.stderr +++ b/test/train-sets/ref/cbe_cover_e_fixed.stderr @@ -10,10 +10,10 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger, cb_to_cbadf average since example example current current current loss last counter weight label predict features -0.000000 0.000000 1 1.0 known 0:0.5... 6 -0.500000 1.000000 2 2.0 known 0:0.5... 6 -0.500000 0.500000 4 4.0 known 1:0.75... 6 -0.520833 0.541667 8 8.0 known 0:0.666667... 6 +0.000000 0.000000 1 1.0 0:0:0.5 0:0.5... 6 +0.500000 1.000000 2 2.0 1:1:0.5 0:0.5... 6 +0.500000 0.500000 4 4.0 0:2:0.5 1:0.75... 6 +0.520833 0.541667 8 8.0 1:1:0.5 0:0.666667... 6 finished run number of examples = 8 diff --git a/test/train-sets/ref/cbe_cover_e_fixed_predict.stderr b/test/train-sets/ref/cbe_cover_e_fixed_predict.stderr index f0376286427..777ed51ee97 100644 --- a/test/train-sets/ref/cbe_cover_e_fixed_predict.stderr +++ b/test/train-sets/ref/cbe_cover_e_fixed_predict.stderr @@ -11,10 +11,10 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_cover, shared_feature_merger, cb_to_cbadf average since example example current current current loss last counter weight label predict features -0.000000 0.000000 1 1.0 known 1:0.75... 6 -0.250000 0.500000 2 2.0 known 0:0.75... 6 -0.375000 0.500000 4 4.0 known 1:0.75... 6 -0.437500 0.500000 8 8.0 known 0:0.75... 6 +0.000000 0.000000 1 1.0 0:0:0.5 1:0.75... 6 +0.250000 0.500000 2 2.0 1:1:0.5 0:0.75... 6 +0.375000 0.500000 4 4.0 0:2:0.5 1:0.75... 6 +0.437500 0.500000 8 8.0 1:1:0.5 0:0.75... 6 finished run number of examples = 8 diff --git a/test/train-sets/ref/rcv1_raw_cb_explore.stderr b/test/train-sets/ref/rcv1_raw_cb_explore.stderr index b6aac95e396..95790b5ee85 100644 --- a/test/train-sets/ref/rcv1_raw_cb_explore.stderr +++ b/test/train-sets/ref/rcv1_raw_cb_explore.stderr @@ -11,16 +11,16 @@ num sources = 1 Enabled reductions: gd, scorer, csoaa_ldf, cb_adf, cb_explore_adf_greedy, shared_feature_merger, cb_to_cbadf average since example example current current current loss last counter weight label predict features -1.000000 1.000000 1 1.0 known 0:0.5... 560 -0.500000 0.000000 2 2.0 known 1:0.975... 1196 -0.250000 0.000000 4 4.0 known 1:0.975... 1568 -0.131250 0.012500 8 8.0 known 1:0.975... 1700 -0.559375 0.987500 16 16.0 known 1:0.975... 236 -0.407812 0.256250 32 32.0 known 0:0.975... 332 -0.366406 0.325000 64 64.0 known 0:0.975... 680 -0.267187 0.167969 128 128.0 known 1:0.975... 1220 -0.227539 0.187891 256 256.0 known 1:0.975... 1424 -0.229980 0.232422 512 512.0 known 0:0.975... 848 +1.000000 1.000000 1 1.0 0:1:0.5 0:0.5... 560 +0.500000 0.000000 2 2.0 0:0:0.5 1:0.975... 1196 +0.250000 0.000000 4 4.0 0:0:0.5 1:0.975... 1568 +0.131250 0.012500 8 8.0 0:0:0.5 1:0.975... 1700 +0.559375 0.987500 16 16.0 0:1:0.5 1:0.975... 236 +0.407812 0.256250 32 32.0 0:0:0.5 0:0.975... 332 +0.366406 0.325000 64 64.0 1:1:0.5 0:0.975... 680 +0.267187 0.167969 128 128.0 0:1:0.5 1:0.975... 1220 +0.227539 0.187891 256 256.0 1:0:0.5 1:0.975... 1424 +0.229980 0.232422 512 512.0 1:1:0.5 0:0.975... 848 finished run number of examples = 1000 diff --git a/vowpalwabbit/cb_explore_adf_common.h b/vowpalwabbit/cb_explore_adf_common.h index 7af48a25e81..cfc70fd35c8 100644 --- a/vowpalwabbit/cb_explore_adf_common.h +++ b/vowpalwabbit/cb_explore_adf_common.h @@ -185,7 +185,10 @@ void cb_explore_adf_base::output_example(vw& all, multi_ex& ec_seq) all.print_text_by_ref(all.raw_prediction.get(), outputStringStream.str(), ec.tag); } - CB::print_update(all, !labeled_example, ec, &ec_seq, true, nullptr); + if (labeled_example) + CB::print_update(all, !labeled_example, ec, &ec_seq, true, &_known_cost); + else + CB::print_update(all, !labeled_example, ec, &ec_seq, true, nullptr); } template