X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Frssearch.c;h=31ec3d76b7ab12b842f15cf73a309331d87c8290;hp=646c796196d69a364034eed7f302a216fe31d040;hb=7ad4d18b7d353d1b068bdc47a3a98351175e09f8;hpb=d66f27768708df0b8ce256e2d868ff4f7060ef3f

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 646c796..31ec3d7 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -38,7 +38,7 @@ static Neighbour *get_neighbours(int isle) {
 }
 
 
-static PotentialResult ***strat_base;
+static PotentialResult ***buckets_base[GRANUS];
 
 
 static double process_route(int nports, int totaldist,
@@ -79,24 +79,39 @@ static double process_route(int nports, int totaldist,
       return guess[A];
     }
 
-    if (guess[A] <= highscores[A][0].value &&
-	guess[P] <= highscores[P][0].value) {
+    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];
     }
   }
 
-  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);
+  PotentialResult *buckets[GRANUS];
+  int granui;
+  for (granui=0; granui<granus; granui++) {
+    PotentialResult **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[A] <= strat->value[A] &&
-	guess[P] <= strat->value[P]) {
-      ctr_routes_stratelim++;
+    if (guess[A] <= buckets[0]->value[A] &&
+	guess[P] <= buckets[0]->value[P]) {
+      ctr_routes_bucketelim++;
       debugf(" ELIM %f %f\n", guess[A], guess[P]);
       return guess[A];
     }
@@ -114,45 +129,58 @@ static double process_route(int nports, int totaldist,
     return value[0];
   }
 
-  if (value[A] <= strat->value[A] &&
-      value[P] <= strat->value[P])
-    return value[A];
-
-  debugf(" SOMEHOW BEST\n");
-
-  fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);
-
-  for (ap=0; ap<AP; ap++) {
-    fildebugf("ap=%d %15f", ap, value[ap]);
-    if (value[ap] < strat->value[ap]) {
-      debugf("      ");
-    } else {
-      int pos;
-      ctr_newbests_strat[ap]++;
-      strat->value[ap]= value[ap];
-      memcpy(strat->ports[ap], ports, sizeof(*ports) * nports);
-      if (nports < MAX_ROUTELEN-1) strat->ports[ap][nports]= -1;
-      fildebugf("** ");
-      for (pos=0; pos < nhighscores[ap]; pos++)
-	if (highscores[ap][pos].pr == strat) goto found;
-      /* not found */
-      pos= -1;
-    found:
-      for (;;) {
-	pos++;
-	if (pos >= nhighscores[ap]-1) break; /* new top */
-	if (highscores[ap][pos].value >= value[ap]) break; /* found spot */
-	if (pos>0)
-	  highscores[ap][pos-1]= highscores[ap][pos];
-      }
-      pos--;
-      if (pos>0) {
-	highscores[ap][pos].value= value[ap];
-	highscores[ap][pos].pr= strat;
-      }
-      fildebugf("@%2d", pos);
-    }
-  }
+  for (granui=granus-1; granui>=0; granui--) {
+    PotentialResult *bucket= buckets[granui];
+
+    if (value[A] <= bucket->value[A] &&
+	value[P] <= bucket->value[P])
+      continue;
+
+    debugf(" SOMEHOW %d BEST\n",granui);
+
+    fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);
+    int relevant=0;
+
+    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->value[ap]) {
+	debugf("      ");
+      } else {
+	int pos;
+	ctr_newbests_granu[granui*AP+ap]++;
+	bucket->value[ap]= value[ap];
+	memcpy(bucket->ports[ap], ports, sizeof(*ports) * nports);
+	if (nports < MAX_ROUTELEN-1) bucket->ports[ap][nports]= -1;
+	fildebugf("** ");
+	for (pos=0; pos < *nscores; pos++)
+	  if (scores[pos].pr == bucket) goto found;
+	/* not found */
+	pos= -1;
+      found:
+	for (;;) {
+	  pos++;
+	  if (pos >= *nscores-1) 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].pr= bucket;
+	  relevant=1;
+	}
+	fildebugf("@%2d", pos);
+      } /* new best */
+    } /* ap */
+    if (!relevant)
+      /* both absolute and perleague are full at this granularity,
+       * so we don't care about anything more granular */
+      granus= granui+1;
+  } /* granui */
 
   fildebugf(" route");
 
@@ -164,7 +192,7 @@ static double process_route(int nports, int totaldist,
 }
 
 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;
@@ -181,14 +209,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);
+	    PotentialResult ****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[AP];
-HighScoreEntry *highscores[AP];
+int nhighscores[GRANUS][AP];
+HighScoreEntry *highscores[GRANUS][AP];
+int granus=GRANUS, granusz_fin[GRANUS], granusz_mid[GRANUS];
 
 int narches;
 char **archnames;
@@ -226,4 +259,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;
 }