routesearch: give tableau its own debug flag

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index b4e780362b5286b5a3fbe849f552f16ee9fd290a..5da0721dbec588b8d004e7d2c2f4110de01c238e 100644 (file)
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -10,6 +10,7 @@
    DF(search)                                  \
    DF(filter)                                  \
    DF(check)                                   \
+   DF(tableau)                                 \
    DF(lp)
 
 #define debug debug_file

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 545ece002f6ae250e077f95ff4ab1d1179253373..17e98a39962a3ce22c72ce939c99ae797445c74f 100644 (file)
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -12,6 +12,8 @@ int max_dist= -1;
 FILE *debug_file;
 FILE *output;
 
+DEBUG_DEFINE_SOME_DEBUGF(tableau,tabdebugf);
+
 
 #define CTR(x) int ctr_##x;
   COUNTER_LIST
@@ -83,7 +85,7 @@ int main(int argc, const char **argv) {
   setup_value();
   setup_search();
 
-  fprintf(stderr,"setup complete, starting search\n");
+  fprintf(output,"setup complete, starting search\n");
   
   arg= *argv++;
   if (!strcmp(arg,"specific")) {
@@ -120,30 +122,30 @@ int main(int argc, const char **argv) {
 
     int i, midarch, finarch;
     for (i=0; i<resultsix; i++) {
-      fprintf(stderr,"============== start #%d %s [PARTIAL] ==============\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->absolute));
+           tabdebugf(" ");
+           tabdebugf("%4d",(int)(result->perleague));
          }
        }
-       fprintf(stderr,"\n");
+       tabdebugf("\n");
       }
     }