X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Frssearch.c;h=1dd29e5bfa2dc23293b640b41a44186851f96b3f;hp=fd2e66a16072723ea762e0bd662e4a6af27c298f;hb=8cbcdefaf39ea525ea12957a115b8d78d88566c4;hpb=85fced6311966d8533ce8186f4f98ff8b6303619

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index fd2e66a..1dd29e5 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -38,12 +38,12 @@ static Neighbour *get_neighbours(int isle) {
 }
 
 
-static PotentialResult ***strat_base;
+static Bucket ***buckets_base[GRANUS];
 
 
 static double process_route(int nports, int totaldist,
 			    double overestimate_excepting_tail) {
-  int i;
+  int i, ap, granui;
   int leagues_divisor= totaldist + nports;
 
   ctr_routes_considered++;
@@ -55,12 +55,12 @@ static double process_route(int nports, int totaldist,
     debugf(" %d",ports[i]);
   debugf("\n");
 
-  double guess_absolute=0, guess_perleague=0;
+  double guess[AP]={0,0};
   if (nports>=2) {
     int pair[2], i;
     pair[1]= ports[nports-1];
-    guess_absolute= overestimate_excepting_tail;
-    
+    guess[A]= overestimate_excepting_tail;
+
     for (i=0; i<nports; i++) {
       pair[0]= ports[i];
       IslandPair *ip= ipair_get_maybe(pair[0], pair[1]);
@@ -69,91 +69,127 @@ static double process_route(int nports, int totaldist,
 	ctr_subroute_tails_valued++;
 	ip->route_tail_value= value_route(2, pair, pair[0]!=pair[1]);
       }
-      guess_absolute += ip->route_tail_value;
+      guess[A] += ip->route_tail_value;
     }
-    guess_perleague= guess_absolute / leagues_divisor;
+    guess[P]= guess[A] / leagues_divisor;
 
     if (wrong_final) {
       ctr_routes_wrongfinalelim++;
       debugf(" WFELIM\n");
-      return guess_absolute;
+      return guess[A];
     }
 
-    if (guess_absolute <= highscores_absolute[0].value &&
-	guess_perleague <= highscores_perleague[0].value) {
-      ctr_routes_quickelim++;
-      debugf(" QELIM %f %f\n", guess_absolute, guess_perleague);
-      return guess_absolute;
+    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]; int finarch= isle2arch(finisle);
+  int finisle= ports[nports-1];
+  int finarch= isle2arch(finisle);
+
+  int midisle= ports[nports/2];
   int midarch= route2midarch(ports,nports);
 
-  PotentialResult **strat_fin= ONDEMAND(strat_base[finarch], narches);
-  PotentialResult *strat= ONDEMAND(strat_fin[midarch], 1);
+  Bucket *buckets[GRANUS];
+  for (granui=0; granui<granus; granui++) {
+    Bucket **buckets_fin;
+    int mid, fin;
+    switch (granui) {
+    case 0: fin=finarch; mid=midarch; break;
+    case 1: fin=finisle; mid=midarch; break;
+    case 2: fin=finisle; mid=midisle; break;
+    default: abort();
+    }
+    buckets_fin= ONDEMAND(buckets_base[granui][fin], granusz_mid[granui]);
+    buckets[granui]= ONDEMAND(buckets_fin[mid], 1);
+  }
 
   if (nports>=2) {
-    if (guess_absolute <= strat->absolute &&
-	guess_perleague <= strat->perleague) {
-      ctr_routes_stratelim++;
-      debugf(" ELIM %f %f\n", guess_absolute, guess_perleague);
-      return guess_absolute;
-    }
-    debugf(" COMPUTE %f %f\n", guess_absolute, guess_perleague);
+    for (granui=0; granui<granus; granui++)
+      for (ap=0; ap<AP; ap++)
+	if (guess[ap] > buckets[granui]->prs[ap].value[ap] &&
+	    guess[ap] > highscores[granui][ap][0].value)
+	  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]);
   }
 
   ctr_routes_valued++;
 
-  double absolute= value_route(nports, ports, 0);
-  double perleague= absolute / leagues_divisor;
+  double value[AP];
+  value[A]= value_route(nports, ports, 0);
+  value[P]= value[A] / leagues_divisor;
 
   if (wrong_final) {
     ctr_routes_wrongfinal++;
-    return absolute;
+    return value[0];
   }
 
-  if (absolute <= strat->absolute &&
-      perleague <= strat->perleague)
-    return absolute;
-
-  debugf(" SOMEHOW BEST\n");
-
-  fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);
-
-#define CHK(absperl)							      \
-  fildebugf(#absperl " %15f", absperl);					      \
-  if (absperl < strat->absperl) {					      \
-    debugf("      ");							      \
-  } else {								      \
-    int pos;								      \
-    ctr_newbests_strat_##absperl++;					      \
-    strat->absperl= absperl;						      \
-    memcpy(strat->absperl##_ports, ports, sizeof(*ports) * nports);	      \
-    if (nports < MAX_ROUTELEN-1) strat->absperl##_ports[nports]= -1;	      \
-    fildebugf("** ");							      \
-    for (pos=0; pos < nhighscores_##absperl; pos++)			      \
-      if (highscores_##absperl[pos].pr == strat) goto found_##absperl;	      \
-    /* not found */							      \
-    pos= -1;								      \
-   found_##absperl:							      \
-    for (;;) {								      \
-      pos++;								      \
-      if (pos >= nhighscores_##absperl-1) break; /* new top */		      \
-      if (highscores_##absperl[pos].value >= absperl) break; /* found spot */ \
-      if (pos>0)							      \
-	highscores_##absperl[pos-1]= highscores_##absperl[pos];		      \
-    }									      \
-    pos--;								      \
-    if (pos>0) {							      \
-      highscores_##absperl[pos].value= absperl;				      \
-      highscores_##absperl[pos].pr= strat;				      \
-    }									      \
-    fildebugf("@%2d", pos);						      \
-  }
-
-  CHK(absolute)
-  CHK(perleague)
+  for (granui=granus-1; granui>=0; granui--) {
+    Bucket *bucket= buckets[granui];
+
+    if (value[A] <= bucket->prs[A].value[A] &&
+	value[P] <= bucket->prs[P].value[P])
+      continue;
+
+    debugf(" SOMEHOW %d BEST\n",granui);
+
+    fildebugf("granu %d f%d:%3d mid%d:%3d ",granui,
+	      finarch,finisle,midarch,midisle);
+
+    for (ap=0; ap<AP; ap++) {
+      HighScoreEntry *scores= highscores[granui][ap];
+      int nscores= nhighscores[granui][ap];
+
+      fildebugf("ap=%d %15f", ap, value[ap]);
+      if (value[ap] < bucket->prs[ap].value[ap]) {
+	debugf("      ");
+      } else {
+	int pos;
+	ctr_newbests_granu[granui*AP+ap]++;
+	bucket->prs[ap].length= totaldist;
+	memcpy(bucket->prs[ap].value, value, sizeof(value));
+	memcpy(bucket->prs[ap].ports, ports, sizeof(*ports) * nports);
+	if (nports < MAX_ROUTELEN-1) bucket->prs[ap].ports[nports]= -1;
+	fildebugf("** ");
+	for (pos=0; pos < nscores; pos++)
+	  if (scores[pos].bucket == bucket) goto found;
+	/* not found */
+	pos= -1;
+      found:
+	for (;;) {
+	  pos++;
+	  if (pos >= nscores) break; /* new top */
+	  if (scores[pos].value >= value[ap]) break; /* found spot */
+	  if (pos>0)
+	    scores[pos-1]= scores[pos];
+	}
+	pos--;
+	if (pos>0) {
+	  scores[pos].value= value[ap];
+	  scores[pos].bucket= bucket;
+	  if (granui < granus-1 &&
+	      highscores[granui][A][0].bucket &&
+	      highscores[granui][P][0].bucket) {
+	    /* both absolute and perleague are full at this granularity,
+	     * so we don't care about anything more granular */
+	    fildebugf("\n                STOP-GRANU            ");
+	    granus= granui+1;
+	  }
+	}
+	fildebugf("@%2d/%2d ", pos, nscores);
+      } /* new best */
+    } /* ap */
+  } /* granui */
 
   fildebugf(" route");
 
@@ -161,11 +197,11 @@ static double process_route(int nports, int totaldist,
     fildebugf(" %d",ports[i]);
   fildebugf("\n");
 
-  return absolute;
+  return value[0];
 }
 
 static void recurse(int last_isle,
-		    int nports, /* excluding last_isle */
+		    int nports /* excluding last_isle */,
 		    int totaldist /* including last_isle */,
 		    double last_estimate) {
   ports[nports++]= last_isle;
@@ -182,15 +218,19 @@ static void recurse(int last_isle,
 }
 
 void search(int start_isle, int final_isle_spec,
-	    PotentialResult ****strat_base_io) {
-  strat_base= ONDEMAND(*strat_base_io, narches);
+	    Bucket ****buckets_base_io[GRANUS]) {
+  int granui;
+  for (granui=0; granui<GRANUS; granui++)
+    buckets_base[granui]=
+      ONDEMAND(*buckets_base_io[granui], granusz_fin[granui]);
+
   final_isle= final_isle_spec <= 0 ? 0 : final_isle_spec;
   recurse(start_isle,0,0,1e6);
 }
 
-int nhighscores_absolute, nhighscores_perleague;
-HighScoreEntry *highscores_absolute;
-HighScoreEntry *highscores_perleague;
+int nhighscores[GRANUS][AP];
+HighScoreEntry *highscores[GRANUS][AP];
+int granus=GRANUS, granusz_fin[GRANUS], granusz_mid[GRANUS];
 
 int narches;
 char **archnames;
@@ -228,4 +268,8 @@ void setup_search(void) {
     islandid2arch[isle]= arch;
   }
   sqlite3_finalize(archs);
+
+  granusz_fin[0]=                granusz_mid[0]= narches;
+  granusz_fin[1]= islandtablesz; granusz_mid[1]= narches;
+  granusz_fin[2]=                granusz_mid[2]= islandtablesz;
 }