From e3d5769363912b7558ac7a0a5a1b7d928dfc584a Mon Sep 17 00:00:00 2001 From: ariel faigon <github.2009@yendor.com> Date: Thu, 10 Jul 2014 14:21:27 -0700 Subject: [PATCH 1/4] Quiet clang warning: no newline at end of file --- vowpalwabbit/searn_entityrelationtask.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vowpalwabbit/searn_entityrelationtask.cc b/vowpalwabbit/searn_entityrelationtask.cc index 7a32f594064..fcffc37b1e0 100644 --- a/vowpalwabbit/searn_entityrelationtask.cc +++ b/vowpalwabbit/searn_entityrelationtask.cc @@ -283,4 +283,5 @@ namespace EntityRelationTask { } delete hinfo; } -} \ No newline at end of file +} + From 52378a944dfd6973ab20e9c3497d283c11bdcf45 Mon Sep 17 00:00:00 2001 From: ariel faigon <github.2009@yendor.com> Date: Fri, 11 Jul 2014 18:19:06 -0700 Subject: [PATCH 2/4] vw-hypersearch: add support for --lrq ab<N> --- utl/vw-hypersearch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utl/vw-hypersearch b/utl/vw-hypersearch index eece72e1a70..e3585614e45 100755 --- a/utl/vw-hypersearch +++ b/utl/vw-hypersearch @@ -471,6 +471,7 @@ sub is_integer_option($) { |holdout_(?:period|after) |initial_pass_length |lda + |lrq |nn |oaa |ect @@ -535,7 +536,7 @@ sub process_args { # Some vw option arguments must be integers, if we want to # optimize those, we must bisect while rounding to an integer - my ($option_before_pct) = ($vw_command_line =~ /(\S+)\s+%/); + my ($option_before_pct) = ($vw_command_line =~ /(\S+)\s+\S*%/); $IntegerOpt = is_integer_option($option_before_pct); if ($vw_command_line =~ /--passes/ and From da39277d7ac4aca062343169ec79d0c026fd9f29 Mon Sep 17 00:00:00 2001 From: ariel faigon <github.2009@yendor.com> Date: Fri, 11 Jul 2014 18:25:39 -0700 Subject: [PATCH 3/4] vw-hypersearch: added autolink to integer expecting options --- utl/vw-hypersearch | 1 + 1 file changed, 1 insertion(+) diff --git a/utl/vw-hypersearch b/utl/vw-hypersearch index e3585614e45..c130de2d29e 100755 --- a/utl/vw-hypersearch +++ b/utl/vw-hypersearch @@ -463,6 +463,7 @@ sub is_integer_option($) { my $expects_integer = ($opt =~ qr{^-* bs? + |autolink |batch_sz |bootstrap|B |(?:csoaa|wap)(?:_ldf)? From 0007de7507e23635fd2b7d0062121ca1ebac41a7 Mon Sep 17 00:00:00 2001 From: ariel faigon <github.2009@yendor.com> Date: Fri, 11 Jul 2014 18:30:13 -0700 Subject: [PATCH 4/4] vw-hypersearch: add (log_multi cbify search top) to integer expecting options --- utl/vw-hypersearch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utl/vw-hypersearch b/utl/vw-hypersearch index c130de2d29e..0946b2efcda 100755 --- a/utl/vw-hypersearch +++ b/utl/vw-hypersearch @@ -467,11 +467,12 @@ sub is_integer_option($) { |batch_sz |bootstrap|B |(?:csoaa|wap)(?:_ldf)? - |cb + |cb(?:ify)? |num_children |holdout_(?:period|after) |initial_pass_length |lda + |log_multi |lrq |nn |oaa @@ -481,7 +482,9 @@ sub is_integer_option($) { |ring_size |examples |searn + |search |total + |top |ngram |skips $}x);