Merge pull request #339 from arielf/master

RunTests improvement + vw-varinfo undefined var fix

2 files changed, 11 insertions, 2 deletions

diff --git a/test/RunTests b/test/RunTests
index 7f498c16..b89ee3cf 100755
--- a/test/RunTests
+++ b/test/RunTests
@@ -402,8 +402,12 @@ sub diff_lenient_float($$) {
         while (<$sdiff>) {
             chomp;
             my ($line1, $line2) = split(/\s*\|\s*/, $_);
-            unless (defined $line2) {
-                warn "$0: test $TestNo: $outfile: no data. Can't compare\n";
+            unless (defined($line1) && defined($line2)) {
+                my $save_diff_file = "test-$TestNo.lenient-diff";
+                warn "$0: test $TestNo: $tmpf: line $.: fuzzy-match missing data on one of the sides. Can't compare\n$_\n";
+                warn "$0: test $TestNo: saving lenient diff in '$save_diff_file' for later inspection\n";
+                close $sdiff;
+                rename($tmpf, $save_diff_file);
                 return 1;
             }
             v(3, "line1: %s\n", $line1);
diff --git a/utl/vw-varinfo b/utl/vw-varinfo
index 9901d3e5..37860775 100755
--- a/utl/vw-varinfo
+++ b/utl/vw-varinfo
@@ -617,6 +617,11 @@ sub print_feature_report($$$$@) {
         if ($opt_O =~ /^a/i) {
             $normalized_score = abs($normalized_score);
         }
+
+        # On the fly generated (e.g. -q crossed features) don't have a min/max
+        $FeatureMin{$f} = 0 unless (exists $FeatureMin{$f});
+        $FeatureMax{$f} = 0 unless (exists $FeatureMax{$f});
+
         printf "%-*s\t%10u %8.2f %8.2f %+9.4f %9.2f%%\n",
                 $max_flen, $f,
                 $Feature2Hash{$f},