Changeset 99

Timestamp:

10/18/06 20:23:20 (7 years ago)

Author:

max

Message:

Tweaked the numbers on intelli-random ordering.

Files:

• shepherd (modified) (5 diffs)
• status (modified) (1 diff)

shepherd

@@ -3 +3 @@
 # "Shepherd"
 
-my $version = '0.2.14';
+my $version = '0.2.15';
 
 # A wrapper for various Aussie TV guide data grabbers
@@ -29 +29 @@
 # 0.2.13  : revert 'alawys run' added in 0.2.12, --setorder bugfix
 # 0.2.14  : Changed online status file format
+# 0.2.15  : Intelli-random grabber ordering now kinda works
 
 #BEGIN { *CORE::GLOBAL::die = \&my_die; }
@@ -429 +430 @@
 sub score_grabbers
 {
-    my ($score, $total, $niceness, $granularity, $day, $hits, $cat, $dq, $mult);
+    my ($score, $total, $day, $hits, $cat, $catbonus, $dq, $dqbonus, $mult, $key);
 
     my $missing = detect_missing_data();
@@ -453 +454 @@
         $dq = query_config($grabber, 'quality');
 
+        if ($cat == 1)
+        {
+            $key = $missing_slice;
+            print "Grabber $grabber is Category 1: comparing capability to best timeslice.\n" if ($debug);
+        }
+        else
+        {
+            $key = $missing;
+            print "Grabber $grabber is Category 2: comparing capability to all wanted channels and days.\n" if ($debug);
+        }
+
         if ($grabber =~ /\[cache\]/)
         {
-            $hits = find_cache_hits($grabber, $missing);
-            $cat = 2;
+            $hits = find_cache_hits($grabber, $key);
         }
         else
         {
-            my $key;
-            if ($cat == 1)
-            {
-                $key = $missing_slice;
-                print "Grabber $grabber is Category 1: comparing capability to best timeslice.\n" if ($debug);
-            }
-            else
-            {
-                $key = $missing;
-                print "Grabber $grabber is Category 2: comparing capability to all wanted channels and days.\n" if ($debug);
-            }
             foreach my $day (sort keys %$key)
             {
@@ -489 +489 @@
         }
 
-        $mult = 1;
-        $mult += 2 if ($cat == 2);
-        $mult *= 2 ** ($dq-1);
+        $catbonus = 1;
+        $catbonus = 3 if ($cat == 2);
+        $catbonus = 2 if ($grabber =~ /\[cache\]/);
+
+        $dqbonus = 2 ** ($dq-1);
+
+        $mult = $dq ** $catbonus;
+
         $score = int($hits * $mult);
 
-        $score = int($hits * $mult);
-        print "Grabber $grabber can fill $hits slots with multiplier $mult (cat: $cat, dq: $dq): scoring $score pts.\n";
+        print "Grabber $grabber can fill $hits slots at x$mult (cat: $cat, DQ: $dq):$score pts.\n" if ($debug);
+
         $gscore->{$grabber} = $score;
         $total += $score;

status

@@ -1 @@
-shepherd:0.2.14:shepherd
+shepherd:0.2.15:shepherd
 grabber:rex:3.3.4
 grabber:oztivo:0.6.1-r1