chiark
/
gitweb
/
~ianmdlvl
/
matchsticks-search.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
541f31d
)
Separate stdout from stderr.
author
Simon Tatham
<anakin@pobox.com>
Sat, 8 Mar 2014 00:03:04 +0000
(
00:03
+0000)
committer
Simon Tatham
<anakin@pobox.com>
Sat, 8 Mar 2014 00:03:04 +0000
(
00:03
+0000)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 3a7984dc62a636d1e7183bbbbeb9c5565ebdc7ce..83728fa7a4aee7cb0168bbdc96d2bd689483669d 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-130,7
+130,7
@@
static void optimise(int doprint) {
prob = 0;
}
prob = 0;
}
-#define PRINTF
if (!doprint) ; else printf
/* bodgy */
+#define PRINTF
(...) if (!doprint) ; else fprintf(stderr, __VA_ARGS__)
/* bodgy */
PRINTF("%2d ", maxhamweight);
PRINTF("%2d ", maxhamweight);
@@
-308,14
+308,14
@@
static void optimise(int doprint) {
best_adjmatrix = xalloc_adjmatrix();
memcpy(best_adjmatrix, adjmatrix, sizeof(*adjmatrix)*n);
best_adjmatrix = xalloc_adjmatrix();
memcpy(best_adjmatrix, adjmatrix, sizeof(*adjmatrix)*n);
-
printf
(" BEST \n");
+
PRINTF
(" BEST \n");
return;
}
out:
if (prob)
glp_delete_prob(prob);
return;
}
out:
if (prob)
glp_delete_prob(prob);
- if (doprint) {
printf
(" \r"); fflush(stdout); }
+ if (doprint) {
PRINTF
(" \r"); fflush(stdout); }
}
static void iterate_recurse(int i, AdjWord min) {
}
static void iterate_recurse(int i, AdjWord min) {
@@
-354,7
+354,7
@@
int main(int argc, char **argv) {
m = atoi(argv[2]);
prep();
iterate();
m = atoi(argv[2]);
prep();
iterate();
-
printf(
"\n");
+
fprintf(stderr,
"\n");
if (best_prob) {
double min = glp_get_obj_val(best_prob);
double a[n][m];
if (best_prob) {
double min = glp_get_obj_val(best_prob);
double a[n][m];