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=23d2ece5eb8541ccc2616fd8ae749d0966759b3b;hp=31ec3d76b7ab12b842f15cf73a309331d87c8290;hb=b0df3bd887cce71fdbd60332b89db0a076b1ee4e;hpb=767fa1cf87952a46530bfaa2de0543ac07b64c2a

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 31ec3d7..23d2ece 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -38,7 +38,7 @@ static Neighbour *get_neighbours(int isle) {
 }
 
 
-static PotentialResult ***buckets_base[GRANUS];
+static Bucket ***buckets_base[GRANUS];
 
 
 static double process_route(int nports, int totaldist,
@@ -79,8 +79,8 @@ 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) {
+    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];
@@ -93,10 +93,10 @@ static double process_route(int nports, int totaldist,
   int midisle= ports[nports/2];
   int midarch= route2midarch(ports,nports);
 
-  PotentialResult *buckets[GRANUS];
+  Bucket *buckets[GRANUS];
   int granui;
   for (granui=0; granui<granus; granui++) {
-    PotentialResult **buckets_fin;
+    Bucket **buckets_fin;
     int mid, fin;
     switch (granui) {
     case 0: fin=finarch; mid=midarch; break;
@@ -109,8 +109,8 @@ static double process_route(int nports, int totaldist,
   }
 
   if (nports>=2) {
-    if (guess[A] <= buckets[0]->value[A] &&
-	guess[P] <= buckets[0]->value[P]) {
+    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];
@@ -130,39 +130,39 @@ static double process_route(int nports, int totaldist,
   }
 
   for (granui=granus-1; granui>=0; granui--) {
-    PotentialResult *bucket= buckets[granui];
+    Bucket *bucket= buckets[granui];
 
-    if (value[A] <= bucket->value[A] &&
-	value[P] <= bucket->value[P])
+    if (value[A] <= bucket->prs[A].value[A] &&
+	value[P] <= bucket->prs[P].value[P])
       continue;
 
     debugf(" SOMEHOW %d BEST\n",granui);
 
-    fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);
-    int relevant=0;
+    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];
+      int nscores= nhighscores[granui][ap];
 
       fildebugf("ap=%d %15f", ap, value[ap]);
-      if (value[ap] < bucket->value[ap]) {
+      if (value[ap] < bucket->prs[ap].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;
+	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].pr == bucket) goto found;
+	for (pos=0; pos < nscores; pos++)
+	  if (scores[pos].bucket == bucket) goto found;
 	/* not found */
 	pos= -1;
       found:
 	for (;;) {
 	  pos++;
-	  if (pos >= *nscores-1) break; /* new top */
+	  if (pos >= nscores-1) break; /* new top */
 	  if (scores[pos].value >= value[ap]) break; /* found spot */
 	  if (pos>0)
 	    scores[pos-1]= scores[pos];
@@ -170,16 +170,19 @@ static double process_route(int nports, int totaldist,
 	pos--;
 	if (pos>0) {
 	  scores[pos].value= value[ap];
-	  scores[pos].pr= bucket;
-	  relevant=1;
+	  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", pos);
+	fildebugf("@%2d/%2d ", pos, nscores);
       } /* 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");
@@ -209,7 +212,7 @@ static void recurse(int last_isle,
 }
 
 void search(int start_isle, int final_isle_spec,
-	    PotentialResult ****buckets_base_io[GRANUS]) {
+	    Bucket ****buckets_base_io[GRANUS]) {
   int granui;
   for (granui=0; granui<GRANUS; granui++)
     buckets_base[granui]=