diff options
author | Vaclav Petricek <vpetricek@eharmony.com> | 2013-11-08 09:14:54 +0400 |
---|---|---|
committer | Vaclav Petricek <vpetricek@eharmony.com> | 2013-11-08 09:14:54 +0400 |
commit | 1aeee763a7bcf024c9cf07c444322ece6876d7f3 (patch) | |
tree | 65a68c0dab261d0a3677c4c7c6636868317a9e4e /test/RunTests | |
parent | c5e90468ad614774b9e8452b8696da4f07d4427f (diff) | |
parent | d6537c09d1e5b5b3aaffa052e33f1ea43574af1c (diff) |
catch up with master
Diffstat (limited to 'test/RunTests')
-rwxr-xr-x | test/RunTests | 43 |
1 files changed, 7 insertions, 36 deletions
diff --git a/test/RunTests b/test/RunTests index 48045cf6..75e43f7e 100755 --- a/test/RunTests +++ b/test/RunTests @@ -14,7 +14,6 @@ my $Epsilon = 1e-4; my $VW; my $LDA; -my $RECOMMEND; # External utilities we use. See init() for Windows specific actions. my $Diff = 'diff'; @@ -45,20 +44,6 @@ sub usage(@) { } # -# which recommend executable to test against -# -sub which_recommend() { - foreach my $dir ('.', '..', '../library', split(':', $ENV{PATH})) { - my $exe = "$dir/recommend"; - if (-x $exe) { - printf STDERR "Testing recommend: %s\n", $exe; - return $exe; - } - } - usage("can't find a 'recommend' executable to test on"); -} - -# # which vw executable to test against # sub which_vw() { @@ -146,7 +131,6 @@ sub init() { $VW = which_vw(); $LDA = which_lda(); - $RECOMMEND = which_recommend(); } sub copy_file { @@ -203,12 +187,6 @@ sub next_test() { } next; } - if ($line =~ /{RECOMMEND}/) { - # The command line - $cmd = trim_spaces($line); - $cmd =~ s/{RECOMMEND}/$RECOMMEND/; - next; - } if ($line =~ /{LDA}/) { # The command line $cmd = trim_spaces($line); @@ -235,7 +213,6 @@ sub next_test() { printf STDERR "Unrecognized test spec line:\n\t%s\n", $line; print STDERR "Test lines must match one of the following patterns:\n"; print STDERR "\tCommand to run: {VW}\n"; - print STDERR "\tCommand to run: {RECOMMEND}\n"; print STDERR "\tstdout reference: *.stdout\n"; print STDERR "\tstderr reference: *.stderr\n"; print STDERR "\tpredict reference: *.predict\n"; @@ -748,26 +725,20 @@ __DATA__ train-sets/ref/bs.prvote.stderr train-sets/ref/bs.prvote.predict -# Test 29: train --l1 regularized model +# Test 29: affix features +{VW} -d train-sets/affix_test.dat -k -c --passes 40 --holdout_after 4 --affix -2 + train-sets/ref/affix_test.stdout + train-sets/ref/affix_test.stderr + +# Test 30: train --l1 regularized model {VW} -d train-sets/0001.dat -f models/mask.model --invert_hash mask.predict --l1 0.01 train-sets/ref/mask.stdout train-sets/ref/mask.stderr train-sets/ref/mask.predict -# Test 30: train model using --feature_mask +# Test 31: train model using --feature_mask {VW} -d train-sets/0001.dat --invert_hash remask.predict --feature_mask models/mask.model train-sets/ref/remask.stdout train-sets/ref/remask.stderr train-sets/ref/remask.predict -# Test 31: train model for recommendations -{VW} -d train-sets/recommend-purchases.vw -b 10 --passes 10 -q ui --holdout_off -f models/recommend.model --cache_file recommend.cache - train-sets/ref/recommendtrain.stdout - train-sets/ref/recommendtrain.stderr - train-sets/ref/recommendtrain.predict - -# Test 32: make recommendations -{RECOMMEND} --topk 2 --vwparams "-i models/recommend.model" --blacklist train-sets/recommend-blacklist.vw --bf_bits 10 --users train-sets/recommend-users.vw --items train-sets/recommend-items.vw - train-sets/ref/recommendtest.stdout - train-sets/ref/recommendtest.stderr - train-sets/ref/recommendtest.predict |