From 9d8563f82cf2569c101282d893bf912ceaea97c0 Mon Sep 17 00:00:00 2001 From: Sebastian Buchwald Date: Thu, 22 Jul 2010 14:01:54 +0000 Subject: [PATCH] Format string depend on used type. [r27777] --- brute_force.c | 12 +++++++++--- heuristical.c | 8 +++++++- heuristical_co.c | 7 ++++++- heuristical_co_ld.c | 8 +++++++- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/brute_force.c b/brute_force.c index 8785af05a..a1631260b 100644 --- a/brute_force.c +++ b/brute_force.c @@ -367,9 +367,15 @@ void solve_pbqp_brute_force(pbqp *pbqp) #if KAPS_STATISTIC fh = fopen("solutions.pb", "a"); - fprintf(fh, ": %lld RE:%u R0:%u R1:%u R2:%u RN/BF:%u\n", pbqp->solution, - pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, - pbqp->num_bf); + #if KAPS_USE_UNSIGNED + fprintf(fh, ": %u RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, + pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, + pbqp->num_rm, pbqp->num_rn); + #else + fprintf(fh, ": %lld RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, + pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, + pbqp->num_rm, pbqp->num_bf); + #endif fclose(fh); #endif diff --git a/heuristical.c b/heuristical.c index 8c6f32530..ee810e375 100644 --- a/heuristical.c +++ b/heuristical.c @@ -124,9 +124,15 @@ void solve_pbqp_heuristical(pbqp *pbqp) #if KAPS_STATISTIC fh = fopen("solutions.pb", "a"); - fprintf(fh, ": %lld RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, + #if KAPS_USE_UNSIGNED + fprintf(fh, ": %u RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, pbqp->num_rm, pbqp->num_rn); + #else + fprintf(fh, ": %lld RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, + pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, + pbqp->num_rm, pbqp->num_rn); + #endif fclose(fh); #endif diff --git a/heuristical_co.c b/heuristical_co.c index 18ede22de..d5eb0f401 100644 --- a/heuristical_co.c +++ b/heuristical_co.c @@ -188,9 +188,14 @@ void solve_pbqp_heuristical_co(pbqp *pbqp, plist_t *rpeo) #if KAPS_STATISTIC fh = fopen("solutions.pb", "a"); - fprintf(fh, ": %lld RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, + #if KAPS_USE_UNSIGNED + fprintf(fh, ": %u RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, pbqp->num_rm, pbqp->num_rn); + #else + fprintf(fh, ": %lld RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, + pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, + #endif fclose(fh); #endif diff --git a/heuristical_co_ld.c b/heuristical_co_ld.c index 9325cdb29..65ddeecc0 100644 --- a/heuristical_co_ld.c +++ b/heuristical_co_ld.c @@ -353,9 +353,15 @@ void solve_pbqp_heuristical_co_ld(pbqp *pbqp, plist_t *rpeo) #if KAPS_STATISTIC fh = fopen("solutions.pb", "a"); - fprintf(fh, ": %lld RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, + #if KAPS_USE_UNSIGNED + fprintf(fh, ": %u RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, pbqp->num_rm, pbqp->num_rn); + #else + fprintf(fh, ": %lld RE:%u R0:%u R1:%u R2:%u RM:%u RN/BF:%u\n", pbqp->solution, + pbqp->num_edges, pbqp->num_r0, pbqp->num_r1, pbqp->num_r2, + pbqp->num_rm, pbqp->num_rn); + #endif fclose(fh); #endif -- 2.20.1