From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Sun, 6 Jan 2008 20:36:52 +0000 (+0000)
Subject: printing improvements
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=commitdiff_plain;h=a602fc812857788265c72c27b132f34b9d7d107c

printing improvements
---

diff --git a/energy.c b/energy.c
index 2bbf049..5e6de24 100644
--- a/energy.c
+++ b/energy.c
@@ -23,7 +23,7 @@ double compute_energy(const struct Vertices *vs) {
   compute_vertex_areas(vs->a);
   energy= 0;
 
-  printing= printing_check(pr_cost);
+  printing= printing_check(pr_cost,0);
 
   if (printing) printf("cost > energy |");
 
diff --git a/minimise.c b/minimise.c
index d7cc86d..51114a6 100644
--- a/minimise.c
+++ b/minimise.c
@@ -111,8 +111,8 @@ int main(int argc, const char *const *argv) {
     size= gsl_multimin_fminimizer_size(minimiser);
     r= gsl_multimin_test_size(size, stop_epsilon);
 
-    if (printing_check(pr_size))
-      printf("%*s size %# e, r=%d\n", 135,"", size, r);
+    if (printing_check(pr_size,155))
+      printf("size %# e, r=%d\n", size, r);
     flushoutput();
 
     if (r==GSL_SUCCESS) break;
@@ -126,7 +126,7 @@ int main(int argc, const char *const *argv) {
 static volatile unsigned print_todo;
 static sigset_t print_alarmset;
 
-int printing_check(enum printing_instance which) {
+int printing_check(enum printing_instance which, int indent) {
   static int skipped[pr__max];
   
   unsigned bits= 1u << which;
@@ -142,7 +142,7 @@ int printing_check(enum printing_instance which) {
   sigprocmask(SIG_UNBLOCK,&print_alarmset,0);
 
   sk= skipped[which];
-  if (sk) printf("[%4d] ",sk);
+  if (sk) printf("%*s[%4d] ",indent,"", sk);
   else printf("       ");
   skipped[which]= 0;
 
diff --git a/minimise.h b/minimise.h
index 4ac64a9..2043d16 100644
--- a/minimise.h
+++ b/minimise.h
@@ -24,6 +24,6 @@ extern const char *input_file, *output_file;
 extern char *output_file_tmp;
 
 enum printing_instance { pr_cost, pr_size, pr__max };
-int printing_check(enum printing_instance);
+int printing_check(enum printing_instance, int indent);
 
 #endif /*MINIMISE_H*/