X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Frsmain.c;h=a1868613fba4969308c9072d7ceb635ea61bd489;hb=8ee07d9a86ecdf73fd959ae88173b176cdac2305;hp=b3a6d73c6244a07629e270b3c827608a66fe80df;hpb=4ed298fb2ac975783ad1a350659f5ae22825e24e;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index b3a6d73..a186861 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -2,26 +2,38 @@
 
 #include "rscommon.h"
 
+#include <ctype.h>
+
 int o_quiet= 0;
 double max_mass=-1, max_volu=-1, max_capi=-1;
 double distance_loss_factor_per_league;
 int max_dist= -1;
 
-#define CTR(x) int ctr_##x;
+FILE *debug_file;
+FILE *output;
+
+#define tabdebugf printf
+
+
+#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 pid_t debugoutpid;
+
 int main(int argc, const char **argv) {
   const char *arg;
+  int i, ap;
 
 #ifndef debug_flags
   debug_flags= ~( dbg_sql2 );
 #endif
-  sysassert( !setvbuf(debug,0,_IOLBF,0) );
-  
+
   for (;;) {
     arg= *++argv;
     if (arg[0] != '-') break;
@@ -35,20 +47,51 @@ int main(int argc, const char **argv) {
     }
   }
 
+  if (debug_flags) {
+    /* glpk insists on writing stuff to stdout, and it does buffering,
+     * so we route all our debug through it this too */
+    int realstdout;
+    sysassert( (realstdout= dup(1)) > 2 );
+    sysassert( output= fdopen(realstdout,"w") );
+
+    int pfd[2];
+    sysassert(! pipe(pfd) );
+    sysassert( (debugoutpid= fork()) >=0 );
+    if (!debugoutpid) {
+      sysassert( dup2(pfd[0],0)==0 );
+      sysassert( dup2(2,1)==1 );
+      sysassert(! close(pfd[0]) );
+      sysassert(! close(pfd[1]) );
+      sysassert(! execlp("cat","cat",(char*)0) );
+    }
+    sysassert( dup2(pfd[1],1)==1 );
+    sysassert(! close(pfd[0]) );
+    sysassert(! close(pfd[1]) );
+
+    debug_file= stdout;
+  } else {
+    output= stdout;
+    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();
 
-  fprintf(stderr,"setup complete, starting search\n");
-  
+  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;
@@ -56,82 +99,98 @@ int main(int argc, const char **argv) {
       ia[ni++]= atoi(arg);
 
     double val= value_route(ni, ia, 0);
-    printf("route value is %g\n", val);
+    fprintf(output, "route value is %g\n", val);
   } else if (!strcmp(arg,"search")) {
     MCALLOC(results, argc);
 
     max_dist= atoi(*argv++);
-    nhighscores_absolute= atoi(*argv++);
-    nhighscores_perleague= atoi(*argv++);
-
-    MCALLOC(highscores_absolute, nhighscores_absolute);
-    MCALLOC(highscores_perleague, nhighscores_perleague);
+    for (ap=0; ap<AP; ap++) {
+      nhighscores[ap]= atoi(*argv++);
+      MCALLOC(highscores[ap], nhighscores[ap]);
+    }
+    const char *final_isle_spec= *argv++;
 
     int resultsix= 0;
     while ((arg= argv[resultsix])) {
-      search(atoi(arg), &results[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]);
       resultsix++;
     }
 
-    int i, midarch, finarch;
+    int midarch, finarch;
     for (i=0; i<resultsix; i++) {
-      fprintf(stderr,"============== start #%d %s ==============\n",
-	      i, argv[i]);
+      tabdebugf("============== start #%d %s [PARTIAL] ==============\n",
+		i, argv[i]);
       PotentialResult ***strat_resultsix= results[i];
       if (!strat_resultsix) continue;
-      fprintf(stderr,"  ");
+      tabdebugf("  ");
       for (midarch=0; midarch<narches; midarch++) {
-	fprintf(stderr,"|   mid %d  ",midarch);
+	tabdebugf("|   mid %d  ",midarch);
       }
-      fprintf(stderr,"\n");
+      tabdebugf("\n");
       for (finarch=0; finarch<narches; finarch++) {
 	PotentialResult **strat_finarch= strat_resultsix[finarch];
 	if (!strat_finarch) continue;
-	fprintf(stderr,"f%d",finarch);
+	tabdebugf("f%d",finarch);
 	for (midarch=0; midarch<narches; midarch++) {
 	  PotentialResult *result= strat_finarch[midarch];
 	  if (!result) {
-	    fprintf(stderr,"|          ");
+	    tabdebugf("|          ");
 	  } else {
-	    fprintf(stderr,"|%5d",(int)(result->absolute));
-	    fprintf(stderr," ");
-	    fprintf(stderr,"%4d",(int)(result->perleague));
+	    tabdebugf("|%5d",(int)(result->value[A]));
+	    tabdebugf(" ");
+	    tabdebugf("%4d",(int)(result->value[P]));
 	  }
 	}
-	fprintf(stderr,"\n");
+	tabdebugf("\n");
       }
     }
 
-    int pos;
-#define OUT(absperl)							      \
-    fprintf(stderr,"\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 midisle= ports[nports/2]; int midarch= isle2arch(midisle);	      \
-      fprintf(stderr,							      \
-	      " @%2d #%2d | start%3d mid %d:%3d f%d:%3d | %5d %5d %4d |",     \
-	      pos, nhighscores_##absperl - 1 - pos,			      \
-	      ports[0], midarch,midisle, finarch,finisle,		      \
-	      (int)hs->value, (int)pr->absolute, (int)pr->perleague);	      \
-      for (i=0; i<nports; i++) fprintf(stderr," %d",ports[i]);		      \
-      fprintf(stderr,"\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");
+      }
     }
-    OUT(absolute)
-    OUT(perleague)
-    
+    fprintf(output,"\n");
+
   } else {
     abort();
   }
 
-#define CTR(x) fprintf(stderr,"  %-30s %10d\n",#x,ctr_##x);
+#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
 
+  if (debug_flags) {
+    sysassert(! fclose(debug) );
+    waitpid_check_exitstatus(debugoutpid,"debug cat",1);
+  }
+  sysassert(! fclose(output) );
+
   return 0;
 }