Cleanup verbose output; add missing initialization to smoother

diff --git a/lib/neatogen/overlap.c b/lib/neatogen/overlap.c
index d4978c40e60786b7c76486cb2583de89c1b6ccc7..b912fbf9877c91cef4f550aea815d9501c3357ed 100644 (file)
--- a/lib/neatogen/overlap.c
+++ b/lib/neatogen/overlap.c
@@ -296,6 +296,9 @@ OverlapSmoother OverlapSmoother_new(SparseMatrix A, int m,
     sm->data = NULL;
   }
 
+  sm->tol_cg = 0.01;
+  sm->maxit_cg = sqrt((double) A->m);
+
   lambda = sm->lambda = N_GNEW(m,real);
   for (i = 0; i < m; i++) sm->lambda[i] = lambda0;
   

diff --git a/lib/sfdpgen/post_process.c b/lib/sfdpgen/post_process.c
index 9ca1b115f17f5cee28fe67571f13866c41032dd7..32afa6c6694d3675dfce1a713598dac71ca18389 100644 (file)
--- a/lib/sfdpgen/post_process.c
+++ b/lib/sfdpgen/post_process.c
@@ -834,7 +834,9 @@ real StressMajorizationSmoother_smooth(StressMajorizationSmoother sm, int dim, r
   w = (real*) Lw->a;
   iw = Lw->ia; jw = Lw->ja;
 
+#ifdef DEBUG_PRINT
   if (Verbose) fprintf(stderr, "initial stress = %f\n", get_stress(m, dim, iw, jw, w, d, x, sm->scaling, sm->data, 1));
+#endif
   /* for the additional matrix L due to the position constraints */
   if (sm->scheme == SM_SCHEME_NORMAL_ELABEL){
     get_edge_label_matrix(sm->data, m, dim, x, &Lc, &x00);
@@ -996,7 +998,9 @@ real StressMajorizationSmoother_smooth(StressMajorizationSmoother sm, int dim, r
   _statistics[1] += iter-1;
 #endif
 
+#ifdef DEBUG_PRINT
   if (Verbose) fprintf(stderr, "iter = %d, final stress = %f\n", iter, get_stress(m, dim, iw, jw, w, d, x, sm->scaling, sm->data, 1));
+#endif
 
  RETURN:
   SparseMatrix_delete(Lwdd);

diff --git a/lib/sfdpgen/sparse_solve.c b/lib/sfdpgen/sparse_solve.c
index c7609ab452cb12787588e40feea33bd286d1c45e..14b4f23cb4d09d06075c6bdfabf2dcf2f29c8d91 100644 (file)
--- a/lib/sfdpgen/sparse_solve.c
+++ b/lib/sfdpgen/sparse_solve.c
@@ -22,7 +22,7 @@
 #include "types.h"
 #include "globals.h"
 
-#define DEBUG_PRINT
+/* #define DEBUG_PRINT */
 
 struct uniform_stress_matmul_data{
   real alpha;