chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
routesearch: give tableau its own debug flag
[ypp-sc-tools.db-test.git]
/
yarrg
/
rsmain.c
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;
FILE *debug_file;
FILE *output;
+DEBUG_DEFINE_SOME_DEBUGF(tableau,tabdebugf);
+
#define CTR(x) int ctr_##x;
COUNTER_LIST
#define CTR(x) int ctr_##x;
COUNTER_LIST
@@
-83,7
+85,7
@@
int main(int argc, const char **argv) {
setup_value();
setup_search();
setup_value();
setup_search();
- fprintf(
stderr
,"setup complete, starting search\n");
+ fprintf(
output
,"setup complete, starting search\n");
arg= *argv++;
if (!strcmp(arg,"specific")) {
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++) {
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;
PotentialResult ***strat_resultsix= results[i];
if (!strat_resultsix) continue;
-
fprintf(stderr,
" ");
+
tabdebugf(
" ");
for (midarch=0; midarch<narches; midarch++) {
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;
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) {
for (midarch=0; midarch<narches; midarch++) {
PotentialResult *result= strat_finarch[midarch];
if (!result) {
-
fprintf(stderr,
"| ");
+
tabdebugf(
"| ");
} else {
} 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");
}
}
}
}