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=6674c02952a263dde69b7c4c1838e737f2a8a63d;hp=eb40a47fbdeba5cb144118e53fc40b9de099ad82;hb=d0f65e91f071ebb0fbc6791ee168e2be5ba8e5ae;hpb=fe2cd54600f099689170bc2d9c47a48559c1d692

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index eb40a47..6674c02 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;
@@ -22,7 +23,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,18 +36,34 @@ static Neighbour *get_neighbours(int isle) {
   return head;
 }
 
-static double best_absolute, best_perleague;
+
+static PotentialResult ***strat_base;
+
+
+static inline int isle2arch(int isle) {
+  int arch= islandid2arch[isle];
+  assert(arch>=0);
+  return arch;
+}
 
 static double process_route(int nports, int totaldist,
 			    double overestimate_excepting_tail) {
   int i;
   int leagues_divisor= totaldist + nports;
 
+  ctr_routes_considered++;
+
   debugf("========== ROUTE");
   for (i=0; i<nports; i++)
     debugf(" %d",ports[i]);
   debugf("\n");
 
+  int finisle= ports[nports-1]; int finarch= isle2arch(finisle);
+  int midisle= ports[nports/2]; int midarch= isle2arch(midisle);
+
+  PotentialResult **strat_fin= ONDEMAND(strat_base[finarch], narches);
+  PotentialResult *strat= ONDEMAND(strat_fin[midarch], 1);
+
   if (nports>=2) {
     int pair[2], i;
     pair[1]= ports[nports-1];
@@ -53,41 +71,56 @@ static double process_route(int nports, int totaldist,
     
     for (i=0; i<nports; i++) {
       pair[0]= ports[i];
-      IslandPair *ip= ipair_get(ports[nports-2], ports[nports-1]);
-      if (ip->route_tail_value < 0)
+      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;
     }
     double guess_perleague= guess_absolute / leagues_divisor;
 
-    if (guess_absolute <= best_absolute && guess_perleague <= best_perleague) {
+    if (guess_absolute <= strat->absolute &&
+	guess_perleague <= strat->perleague) {
+      ctr_routes_eliminated++;
       debugf(" ELIM %f %f\n", guess_absolute, guess_perleague);
       return guess_absolute;
     }
     debugf(" COMPUTE %f %f\n", guess_absolute, guess_perleague);
   }
 
+  ctr_routes_valued++;
+
   double absolute= value_route(nports, ports, 0);
   double perleague= absolute / leagues_divisor;
 
-  if (absolute <= best_absolute && perleague <= best_perleague)
+  if (absolute <= strat->absolute &&
+      perleague <= strat->perleague)
     return absolute;
 
   debugf(" SOMEHOW BEST\n");
 
-#define CHK(absperl) 					\
-  fprintf(stderr,#absperl " %15f", absperl);		\
-  if (absperl < best_##absperl) fputs("   ",stderr);	\
-  else { best_##absperl= absperl; fputs("** ",stderr); }
+  fildebugf("final %d:%3d mid %d:%3d ",finarch,finisle,midarch,midisle);
+
+#define CHK(absperl)							\
+  fildebugf(#absperl " %15f", absperl);					\
+  if (absperl < strat->absperl) {					\
+    debugf("   ");							\
+  } else {								\
+    strat->absperl= absperl;						\
+    memcpy(strat->absperl##_ports, ports, sizeof(*ports) * nports);	\
+    fildebugf("** ");							\
+  }
 
   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;
 }
@@ -109,13 +142,46 @@ static void recurse(int last_isle,
   }
 }
 
-void search(int start_isle) {
+void search(int start_isle, PotentialResult ****strat_base_io) {
+  strat_base= ONDEMAND(*strat_base_io, narches);
   recurse(start_isle,0,0,1e6);
 }
 
+
+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);
 }