X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Frsmain.c;h=2e1c500308658ed53c60a49e7b9fc3f64590a268;hb=3579e35d2b8ed951db24cc4873c155fded7f4375;hp=dd3748f1638d934e0ec03b952e568048639a348a;hpb=d3298934807f28698d96ea7df784e52674e94968;p=ypp-sc-tools.db-test.git

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index dd3748f..2e1c500 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -21,7 +21,7 @@ FILE *output;
 #undef CTR
 #undef CTRA
 
-static PotentialResult ****results[GRANUS];
+static Bucket ****results[GRANUS];
   /* results[GRANUS][start_isle_ix][finalisle][midisle]-> */
 
 static pid_t debugoutpid;
@@ -41,6 +41,8 @@ int main(int argc, const char **argv) {
 #ifndef debug_flags
     if (!strcmp(arg,"-DN")) {
       debug_flags= 0;
+    } else if (!strcmp(arg,"-D1")) {
+      debug_flags= ~(dbg_sql2|dbg_lp|dbg_value2);
     } else
 #endif
     {
@@ -126,7 +128,7 @@ int main(int argc, const char **argv) {
       else final_isle= atoi(final_isle_spec);
       assert(final_isle);
 
-      PotentialResult ****buckets_base_io[GRANUS];
+      Bucket ****buckets_base_io[GRANUS];
       for (granui=0; granui<GRANUS; granui++)
 	buckets_base_io[granui]= &results[granui][resultsix];
 	
@@ -138,9 +140,9 @@ int main(int argc, const char **argv) {
     for (granui=0; granui<granus; granui++) {
       fprintf(output,"\n");
       for (i=0; i<resultsix; i++) {
-	tabdebugf("========== start #%d granui%d %s [PARTIAL] ==========\n",
+	tabdebugf("========== start #%d granui%d %s ==========\n",
 		  i, granui, argv[i]);
-	PotentialResult ***buckets_resultsix= results[granui][i];
+	Bucket ***buckets_resultsix= results[granui][i];
 	if (!buckets_resultsix) continue;
 	tabdebugf("    ");
 	for (mid=0; mid<granusz_mid[granui]; mid++) {
@@ -148,17 +150,17 @@ int main(int argc, const char **argv) {
 	}
 	tabdebugf("\n");
 	for (fin=0; fin<granusz_fin[granui]; fin++) {
-	  PotentialResult **buckets_fin= buckets_resultsix[fin];
+	  Bucket **buckets_fin= buckets_resultsix[fin];
 	  if (!buckets_fin) continue;
 	  tabdebugf("f%-3d",fin);
 	  for (mid=0; mid<granusz_mid[granui]; mid++) {
-	    PotentialResult *result= buckets_fin[mid];
+	    Bucket *result= buckets_fin[mid];
 	    if (!result) {
 	      tabdebugf("|          ");
 	    } else {
-	      tabdebugf("|%5d",(int)(result->value[A]));
+	      tabdebugf("|%5d",(int)(result->prs[A].value[A]));
 	      tabdebugf(" ");
-	      tabdebugf("%4d",(int)(result->value[P]));
+	      tabdebugf("%4d",(int)(result->prs[P].value[P]));
 	    }
 	  }
 	  tabdebugf("\n");
@@ -171,9 +173,10 @@ int main(int argc, const char **argv) {
 		granui, ap);
 	for (pos=nhighscores[granui][ap]-1; pos>=0; pos--) {
 	  HighScoreEntry *hs= &highscores[granui][ap][pos];
-	  PotentialResult *pr= hs->pr;
-	  if (!pr) continue;
-	  const int *const ports= pr->ports[ap];
+	  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];
@@ -181,8 +184,8 @@ int main(int argc, const char **argv) {
 	  int midisle= ports[nports/2];
 	  int midarch= route2midarch(ports,nports);
 	  fprintf(output,
-		  " @%2d #%2d | start%3d mid%d:%3d f%d:%3d | %5d %5d %4d |",
-		  pos, nhighscores[granui][ap] - 1 - pos,
+		  " @%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]);