X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Frsmain.c;h=f99f866d2ee0e39316403e2cd682bc5e7ef98c3a;hp=ea032600798aec91a87728442ed70e13c1bc974c;hb=8fb8cf52d2bf96beda40c30134e04a352ff988b4;hpb=2abd3537af0c697684bfb97895f230372101329d

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index ea03260..f99f866 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -12,7 +12,7 @@ int max_dist= -1;
 FILE *debug_file;
 FILE *output;
 
-DEBUG_DEFINE_SOME_DEBUGF(tableau,tabdebugf);
+#define tabdebugf printf
 
 
 #define CTR(x)    int ctr_##x;
@@ -21,14 +21,16 @@ DEBUG_DEFINE_SOME_DEBUGF(tableau,tabdebugf);
 #undef CTR
 #undef CTRA
 
-static PotentialResult ****results;
-  /* results[start_isle_ix][finalisle][midisle]-> */
+static Bucket ****results[GRANUS];
+  /* results[GRANUS][start_isle_ix][finalisle][midisle]-> */
 
 static pid_t debugoutpid;
 
 int main(int argc, const char **argv) {
   const char *arg;
   int i, ap;
+  int granui;
+  const char *database=0;
 
 #ifndef debug_flags
   debug_flags= ~( dbg_sql2 );
@@ -37,12 +39,18 @@ int main(int argc, const char **argv) {
   for (;;) {
     arg= *++argv;
     if (arg[0] != '-') break;
+    if (!strcmp(arg,"-d")) {
+      database= *++argv;
+    } else if (!strcmp(arg,"-g")) {
+      granus= atoi(*++argv);
+      assert(granus>=1 && granus<=GRANUS);
 #ifndef debug_flags
-    if (!strcmp(arg,"-DN")) {
+    } else if (!strcmp(arg,"-DN")) {
       debug_flags= 0;
-    } else
+    } else if (!strcmp(arg,"-D1")) {
+      debug_flags= ~(dbg_sql2|dbg_lp|dbg_value2);
+    } else {
 #endif
-    {
       abort();
     }
   }
@@ -74,8 +82,6 @@ int main(int argc, const char **argv) {
     debug_file= stderr;
   }
 
-  const char *database= *argv++;
-
   sysassert( !setvbuf(debug,0,_IOLBF,0) );
 
   max_mass= atof(*argv++);
@@ -101,12 +107,17 @@ int main(int argc, const char **argv) {
     double val= value_route(ni, ia, 0);
     fprintf(output, "route value is %g\n", val);
   } else if (!strcmp(arg,"search")) {
-    MCALLOC(results, argc);
+    for (granui=0; granui<GRANUS; granui++)
+      MCALLOC(results[granui], argc);
 
     max_dist= atoi(*argv++);
+
     for (ap=0; ap<AP; ap++) {
-      nhighscores[ap]= atoi(*argv++);
-      MCALLOC(highscores[ap], nhighscores[ap]);
+      int nhs= atoi(*argv++);
+      for (granui=0; granui<GRANUS; granui++) {
+	nhighscores[granui][ap]= nhs;
+	MCALLOC(highscores[granui][ap], nhs);
+      }
     }
     const char *final_isle_spec= *argv++;
 
@@ -120,60 +131,71 @@ int main(int argc, const char **argv) {
       else final_isle= atoi(final_isle_spec);
       assert(final_isle);
 
-      search(init_isle, final_isle, &results[resultsix]);
+      Bucket ****buckets_base_io[GRANUS];
+      for (granui=0; granui<GRANUS; granui++)
+	buckets_base_io[granui]= &results[granui][resultsix];
+	
+      search(init_isle, final_isle, buckets_base_io);
       resultsix++;
     }
 
-    int midarch, finarch;
-    for (i=0; i<resultsix; i++) {
-      tabdebugf("============== start #%d %s [PARTIAL] ==============\n",
-		i, argv[i]);
-      PotentialResult ***strat_resultsix= results[i];
-      if (!strat_resultsix) continue;
-      tabdebugf("  ");
-      for (midarch=0; midarch<narches; midarch++) {
-	tabdebugf("|   mid %d  ",midarch);
-      }
-      tabdebugf("\n");
-      for (finarch=0; finarch<narches; finarch++) {
-	PotentialResult **strat_finarch= strat_resultsix[finarch];
-	if (!strat_finarch) continue;
-	tabdebugf("f%d",finarch);
-	for (midarch=0; midarch<narches; midarch++) {
-	  PotentialResult *result= strat_finarch[midarch];
-	  if (!result) {
-	    tabdebugf("|          ");
-	  } else {
-	    tabdebugf("|%5d",(int)(result->value[A]));
-	    tabdebugf(" ");
-	    tabdebugf("%4d",(int)(result->value[P]));
-	  }
+    int mid, fin;
+    for (granui=0; granui<granus; granui++) {
+      fprintf(output,"\n");
+      for (i=0; i<resultsix; i++) {
+	tabdebugf("========== start #%d granui%d %s ==========\n",
+		  i, granui, argv[i]);
+	Bucket ***buckets_resultsix= results[granui][i];
+	if (!buckets_resultsix) continue;
+	tabdebugf("    ");
+	for (mid=0; mid<granusz_mid[granui]; mid++) {
+	  tabdebugf("|   m%-3d   ",mid);
 	}
 	tabdebugf("\n");
-      }
-    }
-
-    for (ap=0; ap<AP; ap++) {
-      int pos;
-      fprintf(output,"\n================== ap=%d ==================\n", ap);
-      for (pos=0; pos<nhighscores[ap]; pos++) {
-	HighScoreEntry *hs= &highscores[ap][pos];
-	PotentialResult *pr= hs->pr;
-	if (!pr) continue;
-	const int *const ports= pr->ports[ap];
-	int nports;
-	for (nports=0; nports<MAX_ROUTELEN && ports[nports]>=0; nports++);
-	int finisle= ports[nports-1]; int finarch= isle2arch(finisle);
-	int midarch= route2midarch(ports,nports);
-	fprintf(output,
-		" @%2d #%2d | start%3d mid%d f%d:%3d | %5d %5d %4d |",     \
-		pos, nhighscores[ap] - 1 - pos,
-		ports[0], midarch, finarch,finisle,		      \
-		(int)hs->value, (int)pr->value[A], (int)pr->value[P]);
-	for (i=0; i<nports; i++) fprintf(output," %d",ports[i]);
-	fprintf(output,"\n");
-      }
-    }
+	for (fin=0; fin<granusz_fin[granui]; fin++) {
+	  Bucket **buckets_fin= buckets_resultsix[fin];
+	  if (!buckets_fin) continue;
+	  tabdebugf("f%-3d",fin);
+	  for (mid=0; mid<granusz_mid[granui]; mid++) {
+	    Bucket *result= buckets_fin[mid];
+	    if (!result) {
+	      tabdebugf("|          ");
+	    } else {
+	      tabdebugf("|%5d",(int)(result->prs[A].value[A]));
+	      tabdebugf(" ");
+	      tabdebugf("%4d",(int)(result->prs[P].value[P]));
+	    }
+	  }
+	  tabdebugf("\n");
+	}
+      } /* i */
+
+      for (ap=0; ap<AP; ap++) {
+	int pos;
+	fprintf(output,"============== granui%d ap=%d ==============\n",
+		granui, ap);
+	for (pos=nhighscores[granui][ap]-1; pos>=0; pos--) {
+	  HighScoreEntry *hs= &highscores[granui][ap][pos];
+	  Bucket *bucket= hs->bucket;
+	  if (!bucket) continue;
+	  OnePotentialResult *pr= &bucket->prs[ap];
+	  const int *const ports= pr->ports;
+	  int nports;
+	  for (nports=0; nports<MAX_ROUTELEN && ports[nports]>=0; nports++);
+	  int finisle= ports[nports-1];
+	  int finarch= isle2arch(finisle);
+	  int midisle= ports[nports/2];
+	  int midarch= route2midarch(ports,nports);
+	  fprintf(output,
+		  " @%2d %c#%2d | start%3d mid%d:%3d f%d:%3d | %5d %5d %4d |",
+		  pos, "ap"[ap], nhighscores[granui][ap] - pos,
+		  ports[0], midarch,midisle, finarch,finisle,
+		  (int)hs->value, (int)pr->value[A], (int)pr->value[P]);
+	  for (i=0; i<nports; i++) fprintf(output," %d",ports[i]);
+	  fprintf(output,"\n");
+	} /* pos */
+      } /* ap */
+    } /* granui */
     fprintf(output,"\n");
 
   } else {