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=31ec3d76b7ab12b842f15cf73a309331d87c8290;hp=d5a97a488604fb74db3f5c6ceaa7c686ef2613ed;hb=e0e0711ed505eb9de89ac5a26848b30785e58816;hpb=88a4cb4aba6429c13a848dafe3f82652cfc168cb

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index d5a97a4..31ec3d7 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -3,6 +3,7 @@
 #include "rscommon.h"
 
 DEBUG_DEFINE_DEBUGF(search);
+DEBUG_DEFINE_SOME_DEBUGF(filter,fildebugf);
 
 typedef struct Neighbour {
   struct Neighbour *next;
@@ -14,6 +15,7 @@ static Neighbour **neighbours; /* neighbours[islandid]->islandid etc. */
 static sqlite3_stmt *ss_neigh;
 
 static int ports[MAX_ROUTELEN];
+static int final_isle;
 
 static Neighbour *get_neighbours(int isle) {
   Neighbour **np= &neighbours[isle];
@@ -22,7 +24,8 @@ static Neighbour *get_neighbours(int isle) {
 
   SQL_BIND(ss_neigh, 1, isle);
   while (SQL_STEP(ss_neigh)) {
-    Neighbour *add= mmalloc(sizeof(*add));
+    Neighbour *add;
+    NEW(add);
     add->islandid= sqlite3_column_int(ss_neigh, 0);
     add->dist= sqlite3_column_int(ss_neigh, 1);
     add->next= head;
@@ -34,67 +37,162 @@ static Neighbour *get_neighbours(int isle) {
   return head;
 }
 
-static double best_absolute, best_perleague;
+
+static PotentialResult ***buckets_base[GRANUS];
+
 
 static double process_route(int nports, int totaldist,
 			    double overestimate_excepting_tail) {
-  int i;
+  int i, ap;
   int leagues_divisor= totaldist + nports;
 
+  ctr_routes_considered++;
+
+  int wrong_final= final_isle && ports[nports-1] != final_isle;
+
   debugf("========== ROUTE");
   for (i=0; i<nports; i++)
     debugf(" %d",ports[i]);
   debugf("\n");
 
+  double guess[AP]={0,0};
   if (nports>=2) {
     int pair[2], i;
     pair[1]= ports[nports-1];
-    double 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]);
       if (!ip) continue;
-      if (ip->route_tail_value < 0)
+      if (ip->route_tail_value < 0) {
+	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[P]= guess[A] / leagues_divisor;
+
+    if (wrong_final) {
+      ctr_routes_wrongfinalelim++;
+      debugf(" WFELIM\n");
+      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];
+    }
+  }
+
+  int finisle= ports[nports-1];
+  int finarch= isle2arch(finisle);
+
+  int midisle= ports[nports/2];
+  int midarch= route2midarch(ports,nports);
+
+  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();
     }
-    double guess_perleague= guess_absolute / leagues_divisor;
+    buckets_fin= ONDEMAND(buckets_base[granui][fin], granusz_mid[granui]);
+    buckets[granui]= ONDEMAND(buckets_fin[mid], 1);
+  }
 
-    if (guess_absolute <= best_absolute && guess_perleague <= best_perleague) {
-      debugf(" ELIM %f %f\n", guess_absolute, guess_perleague);
-      return guess_absolute;
+  if (nports>=2) {
+    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];
     }
-    debugf(" COMPUTE %f %f\n", guess_absolute, guess_perleague);
+    debugf(" COMPUTE %f %f\n", guess[A], guess[P]);
   }
 
-  double absolute= value_route(nports, ports, 0);
-  double perleague= absolute / leagues_divisor;
+  ctr_routes_valued++;
+
+  double value[AP];
+  value[A]= value_route(nports, ports, 0);
+  value[P]= value[A] / leagues_divisor;
+
+  if (wrong_final) {
+    ctr_routes_wrongfinal++;
+    return value[0];
+  }
+
+  for (granui=granus-1; granui>=0; granui--) {
+    PotentialResult *bucket= buckets[granui];
+
+    if (value[A] <= bucket->value[A] &&
+	value[P] <= bucket->value[P])
+      continue;
 
-  if (absolute <= best_absolute && perleague <= best_perleague)
-    return absolute;
+    debugf(" SOMEHOW %d BEST\n",granui);
 
-  debugf(" SOMEHOW BEST\n");
+    fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);
+    int relevant=0;
 
-#define CHK(absperl) 					\
-  fprintf(stderr,#absperl " %15f", absperl);		\
-  if (absperl < best_##absperl) fputs("   ",stderr);	\
-  else { best_##absperl= absperl; fputs("** ",stderr); }
+    for (ap=0; ap<AP; ap++) {
+      HighScoreEntry *scores= highscores[granui][ap];
+      int *nscores= &nhighscores[granui][ap];
 
-  CHK(absolute)
-  CHK(perleague)
+      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 */
 
-  fputs(" route",stderr);
+  fildebugf(" route");
 
   for (i=0; i<nports; i++)
-    fprintf(stderr," %d",ports[i]);
-  putc('\n',stderr);
+    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;
@@ -110,13 +208,59 @@ static void recurse(int last_isle,
   }
 }
 
-void search(int start_isle) {
+void search(int start_isle, int final_isle_spec,
+	    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[GRANUS][AP];
+HighScoreEntry *highscores[GRANUS][AP];
+int granus=GRANUS, granusz_fin[GRANUS], granusz_mid[GRANUS];
+
+int narches;
+char **archnames;
+int *islandid2arch;
+
 void setup_search(void) {
-  neighbours= mcalloc(sizeof(*neighbours) * islandtablesz);
+  MCALLOC(neighbours, islandtablesz);
 
   SQL_PREPARE(ss_neigh,
 	      "SELECT biid, dist FROM routes WHERE aiid=?");
+
+  int max_narches=
+    sql_single_int(" SELECT count(*) FROM (\n"
+		   "  SELECT DISTINCT archipelago\n"
+		   "   FROM islands\n"
+		   "  )");
+  MCALLOC(archnames, max_narches);
+  MCALLOC_INITEACH(islandid2arch, islandtablesz, *this=-1);
+
+  sqlite3_stmt *archs;
+  SQL_PREPARE(archs,
+	      " SELECT islandid, archipelago\n"
+	      "  FROM islands\n"
+	      "  ORDER BY archipelago");
+  while (SQL_STEP(archs)) {
+    int isle= sqlite3_column_int(archs,0);
+    const char *archname= (const char*)sqlite3_column_text(archs,1);
+    int arch;
+    for (arch=0; arch<narches; arch++)
+      if (!strcmp(archnames[arch], archname)) goto found;
+    assert(narches < max_narches);
+    arch= narches++;
+    archnames[arch]= masprintf("%s",archname);
+  found:
+    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;
 }