Changeset 122 for util/title_testharness

Timestamp:

10/23/06 00:25:16 (7 years ago)

Author:

max

Message:

Compare algorithms.

Files:

• util/title_testharness (modified) (5 diffs)

util/title_testharness

@@ -32 +32 @@
         'show_matches'          => \$opt->{show_matches},
         'test=s'                => \$opt->{test},
+        'compare=s'             => \$opt->{compare},
         'help'                  => \$opt->{help});
 
 printf "tiele-matching test harness\n";
-if (($opt->{help}) || (!defined $opt->{test}) && (!defined $opt->{create})) {
+if (($opt->{help}) || (!defined $opt->{test}) && (!defined $opt->{create}) && !defined $opt->{compare} ) {
         print "  usage:\n".
               "\t$0 --create (title_file) [FILE(s)]\n".
@@ -51 +52 @@
 
 @ARGV = ('-') if not @ARGV;
-
+$opt->{test} = $opt->{compare} if ($opt->{compare});
 &create_programme_lineup($opt->{create}) if ($opt->{create});
 &test_algorithms($opt->{test}) if ($opt->{test});
@@ -201 +202 @@
         }
 
+        &test_alg() if ($opt->{compare});
+
         printf STDERR "\n";
         printf STDERR "to see details on matches, use the --show_matches option.\n" unless $opt->{show_matches};
@@ -215 +218 @@
         my $alg_start = [gettimeofday];
 
+        my ($al1, $al2);
+        if ($opt->{compare} and $opt->{compare} =~ /(.*),(.*)/) {
+            if ($algorithms{$1} and $algorithms{$2}) {
+                ($al1, $al2) = ($1, $2);
+                print "Comparing $al1 to $al2.\n";
+            }
+        }
+            
         foreach my $timeslot (0..$#{$prog_lineup}) {
                 foreach my $source (0..$datafile_num) {
@@ -232 +243 @@
                                 foreach my $prog1 (@c1) {
                                         foreach my $prog2 (@c2) {
-                                                if ($algorithms{$alg}->($prog1,$prog2)) {
+
+                                                # No point comparing the same string, is there?
+                                                next if ($prog1 eq $prog2);
+
+                                                if ($al1 and $al2) {
+                                                    my $m1 = $algorithms{$al1}->($prog1,$prog2);
+                                                    my $m2 = $algorithms{$al2}->($prog1,$prog2);
+                                                    if ($m1 != $m2) {
+                                                        print "\"$prog1\" vs \"$prog2\": $al1 says " .
+                                                              ($m1 ? "MATCH" : "NON-MATCH") .
+                                                              " and $al2 says " .
+                                                              ($m2 ? "MATCH" : "NON-MATCH") . 
+                                                              ".\n";
+                                                    }
+                                                }
+                                                else {
+                                                    if ($algorithms{$alg}->($prog1,$prog2)) {
                                                         printf "algorithm $alg said '$prog1' and '$prog2' DO match\n" if ($opt->{show_matches});
                                                         $matches++;
-                                                } else {
+                                                    } else {
                                                         printf "algorithm $alg said '$prog1' and '$prog2' don't match\n" if ($opt->{show_non_matches});
                                                         $non_matches++;
+                                                    }
                                                 }
                                         }