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

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index f14b0cd..fd2e66a 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,41 +37,139 @@ static Neighbour *get_neighbours(int isle) {
   return head;
 }
 
-static double best_absolute, best_perleague;
 
-static void process_route(int nports, int totaldist) {
+static PotentialResult ***strat_base;
+
+
+static double process_route(int nports, int totaldist,
+			    double overestimate_excepting_tail) {
   int i;
+  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 absolute= value_route(nports, ports);
-  double perleague= absolute / (totaldist + nports);
+  double guess_absolute=0, guess_perleague=0;
+  if (nports>=2) {
+    int pair[2], i;
+    pair[1]= ports[nports-1];
+    guess_absolute= 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) {
+	ctr_subroute_tails_valued++;
+	ip->route_tail_value= value_route(2, pair, pair[0]!=pair[1]);
+      }
+      guess_absolute += ip->route_tail_value;
+    }
+    guess_perleague= guess_absolute / leagues_divisor;
+
+    if (wrong_final) {
+      ctr_routes_wrongfinalelim++;
+      debugf(" WFELIM\n");
+      return guess_absolute;
+    }
+
+    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;
+    }
+  }
+
+  int finisle= ports[nports-1]; int finarch= isle2arch(finisle);
+  int midarch= route2midarch(ports,nports);
+
+  PotentialResult **strat_fin= ONDEMAND(strat_base[finarch], narches);
+  PotentialResult *strat= ONDEMAND(strat_fin[midarch], 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);
+  }
+
+  ctr_routes_valued++;
 
-  if (absolute < best_absolute && perleague < best_perleague) return;
+  double absolute= value_route(nports, ports, 0);
+  double perleague= absolute / leagues_divisor;
 
-#define CHK(absperl) 					\
-  fprintf(stderr,#absperl " %15f", absperl);		\
-  if (absperl < best_##absperl) fputs("   ",stderr);	\
-  else { best_##absperl= absperl; fputs("** ",stderr); }
+  if (wrong_final) {
+    ctr_routes_wrongfinal++;
+    return absolute;
+  }
+
+  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)
 
-  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;
 }
 
 static void recurse(int last_isle,
 		    int nports, /* excluding last_isle */
-		    int totaldist /* including last_isle */) {
+		    int totaldist /* including last_isle */,
+		    double last_estimate) {
   ports[nports++]= last_isle;
-  process_route(nports, totaldist);
+  double estimate= process_route(nports, totaldist, last_estimate);
   if (nports >= MAX_ROUTELEN) return;
 
   Neighbour *add;
@@ -76,17 +177,55 @@ static void recurse(int last_isle,
     int newdist= totaldist + add->dist;
     if (newdist > max_dist) continue;
 
-    recurse(add->islandid, nports, newdist);
+    recurse(add->islandid, nports, newdist, estimate);
   }
 }
 
-void search(int start_isle) {
-  recurse(start_isle,0,0);
+void search(int start_isle, int final_isle_spec,
+	    PotentialResult ****strat_base_io) {
+  strat_base= ONDEMAND(*strat_base_io, narches);
+  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 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);
 }