From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 7 Oct 2009 23:20:57 +0000 (+0100)
Subject: WIP routesearch; construct archipelago lookup table
X-Git-Tag: 5.0^2~65
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=2d200537436a446c0fd7d62921f5a5fec231a696

WIP routesearch; construct archipelago lookup table
---

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 873ff30..f0215b2 100644
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -118,6 +118,10 @@ extern int max_dist;
 
 extern int islandtablesz;
 
+extern int narches;
+extern char **archnames;
+extern int *islandid2arch;
+
 
 #define ONDEMAND(pointer_lvalue, calloc_size_count)			     \
   ((pointer_lvalue) ? :							     \
diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 0a17adf..fa43d89 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -140,9 +140,43 @@ void search(int start_isle, PotentialResult ****strat_base_io) {
   recurse(start_isle,0,0,1e6);
 }
 
+
+int narches;
+char **archnames;
+int *islandid2arch;
+
 void setup_search(void) {
   neighbours= mcalloc(sizeof(*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"
+		   "  )");
+  archnames= mcalloc(sizeof(*archnames) * max_narches);
+  islandid2arch= mmalloc(sizeof(*islandid2arch) * islandtablesz);
+  int i;
+  for (i=0; i<islandtablesz; i++) islandid2arch[i]=-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);
 }
diff --git a/yarrg/x.gdb b/yarrg/x.gdb
index 06e18f8..42aaddc 100644
--- a/yarrg/x.gdb
+++ b/yarrg/x.gdb
@@ -1,4 +1,5 @@
 file ./routesearch
-set args 13460 20210 -1 0.0005 search 20 7
-break ipair_get if si==7 && di==5
+set args -DN 13460 20210 -1 0.0005 search 10  4 19 134 32 13 24 36
+break setup_search
 run
+finish