routesearch: correct elim algorithms

[ypp-sc-tools.main.git] / yarrg / rssearch.c

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 881d5de4ba7d0550cd9533056d7bf863291b64d7..b05a27566bcbbb8d9038ba81951c897e4c0dc871 100644 (file)
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -43,7 +43,7 @@ static Bucket ***buckets_base[GRANUS];
 
 static double process_route(int nports, int totaldist,
                            double overestimate_excepting_tail) {
-  int i, ap;
+  int i, ap, granui;
   int leagues_divisor= totaldist + nports;
 
   ctr_routes_considered++;
@@ -79,12 +79,15 @@ static double process_route(int nports, int totaldist,
       return guess[A];
     }
 
-    if (guess[A] <= highscores[granus-1][A][0].value &&
-       guess[P] <= highscores[granus-1][P][0].value) {
-      ctr_routes_quickelim++;
-      debugf(" QELIM %f %f\n", guess[A], guess[P]);
-      return guess[A];
+    for (granui=0; granui<granus; granui++) {
+      if (guess[A] > highscores[granui][A][0].value ||
+         guess[P] > highscores[granui][P][0].value)
+       goto not_quickelim;
     }
+    ctr_routes_quickelim++;
+    debugf(" QELIM %f %f\n", guess[A], guess[P]);
+    return guess[A];
+  not_quickelim:;
   }
 
   int finisle= ports[nports-1];
@@ -94,7 +97,6 @@ static double process_route(int nports, int totaldist,
   int midarch= route2midarch(ports,nports);
 
   Bucket *buckets[GRANUS];
-  int granui;
   for (granui=0; granui<granus; granui++) {
     Bucket **buckets_fin;
     int mid, fin;
@@ -109,12 +111,15 @@ static double process_route(int nports, int totaldist,
   }
 
   if (nports>=2) {
-    if (guess[A] <= buckets[0]->prs[A].value[A] &&
-       guess[P] <= buckets[0]->prs[P].value[P]) {
-      ctr_routes_bucketelim++;
-      debugf(" ELIM %f %f\n", guess[A], guess[P]);
-      return guess[A];
+    for (granui=0; granui<granus; granui++) {
+      if (guess[A] > buckets[granui]->prs[A].value[A] ||
+         guess[P] > buckets[granui]->prs[P].value[P])
+       goto not_bucketelim;
     }
+    ctr_routes_bucketelim++;
+    debugf(" ELIM %f %f\n", guess[A], guess[P]);
+    return guess[A];
+  not_bucketelim:
     debugf(" COMPUTE %f %f\n", guess[A], guess[P]);
   }