WIP routesearch: add new UI; make enter_route capable of rejecting arches, etc

[ypp-sc-tools.db-test.git] / yarrg / rsmain.c

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 17e98a39962a3ce22c72ce939c99ae797445c74f..524cbece8159c6b19dd0be8e6d18e4abfb8d17b0 100644 (file)
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -15,9 +15,11 @@ FILE *output;
 DEBUG_DEFINE_SOME_DEBUGF(tableau,tabdebugf);
 
 
-#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]-> */
@@ -26,11 +28,12 @@ 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
-  
+
   for (;;) {
     arg= *++argv;
     if (arg[0] != '-') break;
@@ -85,8 +88,10 @@ int main(int argc, const char **argv) {
   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;
@@ -99,17 +104,16 @@ int main(int argc, const char **argv) {
     MCALLOC(results, argc);
 
     max_dist= atoi(*argv++);
-    nhighscores_absolute= atoi(*argv++);
-    nhighscores_perleague= atoi(*argv++);
+    for (ap=0; ap<AP; ap++) {
+      nhighscores[ap]= atoi(*argv++);
+      MCALLOC(highscores[ap], nhighscores[ap]);
+    }
     const char *final_isle_spec= *argv++;
 
-    MCALLOC(highscores_absolute, nhighscores_absolute);
-    MCALLOC(highscores_perleague, nhighscores_perleague);
-
     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;
@@ -120,7 +124,7 @@ int main(int argc, const char **argv) {
       resultsix++;
     }
 
-    int i, midarch, finarch;
+    int midarch, finarch;
     for (i=0; i<resultsix; i++) {
       tabdebugf("============== start #%d %s [PARTIAL] ==============\n",
                i, argv[i]);
@@ -140,44 +144,45 @@ int main(int argc, const char **argv) {
          if (!result) {
            tabdebugf("|          ");
          } else {
-           tabdebugf("|%5d",(int)(result->absolute));
+           tabdebugf("|%5d",(int)(result->value[A]));
            tabdebugf(" ");
-           tabdebugf("%4d",(int)(result->perleague));
+           tabdebugf("%4d",(int)(result->value[P]));
          }
        }
        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");                                                  \
+    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(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