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=976aa5a29e4d3a1ed81c44945dcb102a3950b293;hp=17e98a39962a3ce22c72ce939c99ae797445c74f;hb=7ad4d18b7d353d1b068bdc47a3a98351175e09f8;hpb=447921b45575ec3c98cff70183fccb2f16326df4

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 17e98a3..976aa5a 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -12,25 +12,29 @@ int max_dist= -1;
 FILE *debug_file;
 FILE *output;
 
-DEBUG_DEFINE_SOME_DEBUGF(tableau,tabdebugf);
+#define tabdebugf printf
 
 
-#define CTR(x) int ctr_##x;
+#define CTR(x)    int ctr_##x;
+#define CTRA(x,n) int ctr_##x[n];
   COUNTER_LIST
 #undef CTR
+#undef CTRA
 
-static PotentialResult ****results;
-  /* results[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 granui;
 
 #ifndef debug_flags
   debug_flags= ~( dbg_sql2 );
 #endif
-  
+
   for (;;) {
     arg= *++argv;
     if (arg[0] != '-') break;
@@ -71,22 +75,24 @@ int main(int argc, const char **argv) {
     debug_file= stderr;
   }
 
+  const char *database= *argv++;
+
   sysassert( !setvbuf(debug,0,_IOLBF,0) );
 
   max_mass= atof(*argv++);
   max_volu= atof(*argv++);
   max_capi= atof(*argv++);
   double loss_per_league= atof(*argv++);
-
-  if (!loss_per_league) loss_per_league= 1e-7;
   distance_loss_factor_per_league= 1.0 - loss_per_league;
 
-  setup_sql();
+  setup_sql(database);
   setup_value();
   setup_search();
 
+  for (i=0; i<narches; i++)
+    fprintf(output,"arch %d %s\n",i,archnames[i]);
   fprintf(output,"setup complete, starting search\n");
-  
+
   arg= *argv++;
   if (!strcmp(arg,"specific")) {
     int ia[argc], ni=0;
@@ -96,88 +102,103 @@ 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++);
-    nhighscores_absolute= atoi(*argv++);
-    nhighscores_perleague= atoi(*argv++);
-    const char *final_isle_spec= *argv++;
 
-    MCALLOC(highscores_absolute, nhighscores_absolute);
-    MCALLOC(highscores_perleague, nhighscores_perleague);
+    for (ap=0; ap<AP; 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++;
 
     int resultsix= 0;
     while ((arg= argv[resultsix])) {
       int init_isle= atoi(arg);
-      
+
       int final_isle;
       if (!strcmp(final_isle_spec,"circ")) final_isle= init_isle;
       else if (!strcmp(final_isle_spec,"any")) final_isle= -1;
       else final_isle= atoi(final_isle_spec);
       assert(final_isle);
 
-      search(init_isle, final_isle, &results[resultsix]);
+      PotentialResult ****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 i, 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->absolute));
-	    tabdebugf(" ");
-	    tabdebugf("%4d",(int)(result->perleague));
-	  }
+    int mid, fin;
+    for (granui=0; granui<granus; granui++) {
+      fprintf(output,"\n");
+      for (i=0; i<resultsix; i++) {
+	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<granusz_mid[granui]; mid++) {
+	  tabdebugf("|   m%-3d   ",mid);
 	}
 	tabdebugf("\n");
-      }
-    }
-
-    int pos;
-#define OUT(absperl)							      \
-    fprintf(output,"\n================== " #absperl " ==================\n"); \
-    for (pos=0; pos<nhighscores_##absperl; pos++) {			      \
-      HighScoreEntry *hs= &highscores_##absperl[pos];			      \
-      PotentialResult *pr= hs->pr;					      \
-      if (!pr) continue;						      \
-      const int *const ports= pr->absperl##_ports;			      \
-      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_##absperl - 1 - pos,			      \
-	      ports[0], midarch, finarch,finisle,		      \
-	      (int)hs->value, (int)pr->absolute, (int)pr->perleague);	      \
-      for (i=0; i<nports; i++) fprintf(output," %d",ports[i]);		      \
-      fprintf(output,"\n"); 						      \
-    }
-    OUT(absolute)
-    OUT(perleague)
+	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<granusz_mid[granui]; mid++) {
+	    PotentialResult *result= buckets_fin[mid];
+	    if (!result) {
+	      tabdebugf("|          ");
+	    } else {
+	      tabdebugf("|%5d",(int)(result->value[A]));
+	      tabdebugf(" ");
+	      tabdebugf("%4d",(int)(result->value[P]));
+	    }
+	  }
+	  tabdebugf("\n");
+	}
+      } /* i */
+
+      for (ap=0; ap<AP; ap++) {
+	int 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];
+	  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 #%2d | start%3d mid%d:%3d f%d:%3d | %5d %5d %4d |",
+		  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 */
+    } /* granui */
     fprintf(output,"\n");
-    
+
   } else {
     abort();
   }
 
 #define CTR(x) fprintf(output,"  %-30s %10d\n",#x,ctr_##x);
+#define CTRA(x,n) for (i=0;i<n;i++) \
+  fprintf(output,"  %-27s[%d] %10d\n",#x,i,ctr_##x[i]);
   COUNTER_LIST
 #undef CTR