From: Ian Jackson <ian@liberator.(none)>
Date: Wed, 14 Oct 2009 20:30:42 +0000 (+0100)
Subject: routesearch: change granu to be higher for more specific (more granularity)
X-Git-Tag: 5.0^2~43
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=8dd381ffb993692b376e48eaa4b9ab506b3568e2;hp=d14a97ff4e453ad1540a02b465bb7e398303edde

routesearch: change granu to be higher for more specific (more granularity)
---

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index f086e57..84fad6f 100644
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -165,7 +165,7 @@ typedef struct {
   PotentialResult *pr;
 } HighScoreEntry;
 
-extern int mingranu;
+extern int granus;
 extern int nhighscores[GRANUS][AP];
 extern HighScoreEntry *highscores[GRANUS][AP];
 
diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 04d08ff..976aa5a 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -135,7 +135,7 @@ int main(int argc, const char **argv) {
     }
 
     int mid, fin;
-    for (granui=mingranu; granui<GRANUS; granui++) {
+    for (granui=0; granui<granus; granui++) {
       fprintf(output,"\n");
       for (i=0; i<resultsix; i++) {
 	tabdebugf("========== start #%d granui%d %s [PARTIAL] ==========\n",
diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 74a2f45..9676640 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -95,13 +95,13 @@ static double process_route(int nports, int totaldist,
 
   PotentialResult *buckets[GRANUS];
   int granui;
-  for (granui=mingranu; granui<GRANUS; granui++) {
+  for (granui=0; granui<granus; granui++) {
     PotentialResult **buckets_fin;
     int mid, fin;
     switch (granui) {
-    case 0: fin=finisle; mid=midisle; break;
+    case 0: fin=finarch; mid=midarch; break;
     case 1: fin=finisle; mid=midarch; break;
-    case 2: fin=finarch; mid=midarch; break;
+    case 2: fin=finisle; mid=midisle; break;
     default: abort();
     }
     buckets_fin= ONDEMAND(buckets_base[granui][fin], granusz_mid[granui]);
@@ -109,8 +109,8 @@ static double process_route(int nports, int totaldist,
   }
 
   if (nports>=2) {
-    if (guess[A] <= buckets[mingranu]->value[A] &&
-	guess[P] <= buckets[mingranu]->value[P]) {
+    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];
@@ -129,7 +129,7 @@ static double process_route(int nports, int totaldist,
     return value[0];
   }
 
-  for (granui=mingranu; granui<GRANUS; granui++) {
+  for (granui=granus-1; granui>=0; granui--) {
     PotentialResult *bucket= buckets[granui];
 
     if (value[A] <= bucket->value[A] &&
@@ -215,7 +215,7 @@ void search(int start_isle, int final_isle_spec,
 
 int nhighscores[GRANUS][AP];
 HighScoreEntry *highscores[GRANUS][AP];
-int mingranu, granusz_fin[GRANUS], granusz_mid[GRANUS];
+int granus=GRANUS, granusz_fin[GRANUS], granusz_mid[GRANUS];
 
 int narches;
 char **archnames;
@@ -254,7 +254,7 @@ void setup_search(void) {
   }
   sqlite3_finalize(archs);
 
-  granusz_fin[0]=                granusz_mid[0]= islandtablesz;
+  granusz_fin[0]=                granusz_mid[0]= narches;
   granusz_fin[1]= islandtablesz; granusz_mid[1]= narches;
-  granusz_fin[2]=                granusz_mid[2]= narches;
+  granusz_fin[2]=                granusz_mid[2]= islandtablesz;
 }