X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Frsmain.c;h=04d08ffbf48e9ecc6a2ce4fa34e57c00c6475e33;hb=388e806e8cded8d8ff1d3aff2a5a0ac92be56edf;hp=50b73485e02685f293b616d9c890c5f85d69fd4f;hpb=6ab7c759c0aab39bfaf8275041dd39f45062399c;p=ypp-sc-tools.web-test.git

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 50b7348..04d08ff 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -21,15 +21,15 @@ FILE *output;
 #undef CTR
 #undef CTRA
 
-static PotentialResult ****results[STRATS];
-  /* results[STRATS][start_isle_ix][finalisle][midisle]-> */
+static PotentialResult ****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 strati;
+  int granui;
 
 #ifndef debug_flags
   debug_flags= ~( dbg_sql2 );
@@ -102,16 +102,16 @@ 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")) {
-    for (strati=0; strati<STRATS; strati++)
-      MCALLOC(results[strati], argc);
+    for (granui=0; granui<GRANUS; granui++)
+      MCALLOC(results[granui], argc);
 
     max_dist= atoi(*argv++);
 
     for (ap=0; ap<AP; ap++) {
       int nhs= atoi(*argv++);
-      for (strati=0; strati<STRATS; strati++) {
-	nhighscores[strati][ap]= nhs;
-	MCALLOC(highscores[strati][ap], nhs);
+      for (granui=0; granui<GRANUS; granui++) {
+	nhighscores[granui][ap]= nhs;
+	MCALLOC(highscores[granui][ap], nhs);
       }
     }
     const char *final_isle_spec= *argv++;
@@ -126,33 +126,33 @@ int main(int argc, const char **argv) {
       else final_isle= atoi(final_isle_spec);
       assert(final_isle);
 
-      PotentialResult ****strat_base_io[STRATS];
-      for (strati=0; strati<STRATS; strati++)
-	strat_base_io[strati]= &results[strati][resultsix];
+      PotentialResult ****buckets_base_io[GRANUS];
+      for (granui=0; granui<GRANUS; granui++)
+	buckets_base_io[granui]= &results[granui][resultsix];
 	
-      search(init_isle, final_isle, strat_base_io);
+      search(init_isle, final_isle, buckets_base_io);
       resultsix++;
     }
 
     int mid, fin;
-    for (strati=minstrat; strati<STRATS; strati++) {
+    for (granui=mingranu; granui<GRANUS; granui++) {
       fprintf(output,"\n");
       for (i=0; i<resultsix; i++) {
-	tabdebugf("========== start #%d strati%d %s [PARTIAL] ==========\n",
-		  i, strati, argv[i]);
-	PotentialResult ***strat_resultsix= results[strati][i];
-	if (!strat_resultsix) continue;
+	tabdebugf("========== start #%d granui%d %s [PARTIAL] ==========\n",
+		  i, granui, argv[i]);
+	PotentialResult ***buckets_resultsix= results[granui][i];
+	if (!buckets_resultsix) continue;
 	tabdebugf("    ");
-	for (mid=0; mid<stratsz_mid[strati]; mid++) {
+	for (mid=0; mid<granusz_mid[granui]; mid++) {
 	  tabdebugf("|   m%-3d   ",mid);
 	}
 	tabdebugf("\n");
-	for (fin=0; fin<stratsz_fin[strati]; fin++) {
-	  PotentialResult **strat_fin= strat_resultsix[fin];
-	  if (!strat_fin) continue;
+	for (fin=0; fin<granusz_fin[granui]; fin++) {
+	  PotentialResult **buckets_fin= buckets_resultsix[fin];
+	  if (!buckets_fin) continue;
 	  tabdebugf("f%-3d",fin);
-	  for (mid=0; mid<stratsz_mid[strati]; mid++) {
-	    PotentialResult *result= strat_fin[mid];
+	  for (mid=0; mid<granusz_mid[granui]; mid++) {
+	    PotentialResult *result= buckets_fin[mid];
 	    if (!result) {
 	      tabdebugf("|          ");
 	    } else {
@@ -167,10 +167,10 @@ int main(int argc, const char **argv) {
 
       for (ap=0; ap<AP; ap++) {
 	int pos;
-	fprintf(output,"============== strati%d ap=%d ==============\n",
-		strati, ap);
-	for (pos=0; pos<nhighscores[strati][ap]; pos++) {
-	  HighScoreEntry *hs= &highscores[strati][ap][pos];
+	fprintf(output,"============== granui%d ap=%d ==============\n",
+		granui, ap);
+	for (pos=0; pos<nhighscores[granui][ap]; pos++) {
+	  HighScoreEntry *hs= &highscores[granui][ap][pos];
 	  PotentialResult *pr= hs->pr;
 	  if (!pr) continue;
 	  const int *const ports= pr->ports[ap];
@@ -182,14 +182,14 @@ int main(int argc, const char **argv) {
 	  int midarch= route2midarch(ports,nports);
 	  fprintf(output,
 		  " @%2d #%2d | start%3d mid%d:%3d f%d:%3d | %5d %5d %4d |",
-		  pos, nhighscores[strati][ap] - 1 - pos,
+		  pos, nhighscores[granui][ap] - 1 - 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 */
-    } /* strati */
+    } /* granui */
     fprintf(output,"\n");
 
   } else {