sfdpgen SparseStressMajorizationSmoother_new: remove inverse distance weighting

This scheme is unused.

diff --git a/lib/sfdpgen/post_process.c b/lib/sfdpgen/post_process.c
index a25201dae1a92cafc381ef5a2dc04cb360e9b7a0..58852585771a4d26a4b930c8e0656e8abbfac4d9 100644 (file)
--- a/lib/sfdpgen/post_process.c
+++ b/lib/sfdpgen/post_process.c
@@ -361,13 +361,6 @@ StressMajorizationSmoother SparseStressMajorizationSmoother_new(SparseMatrix A,
            w[nz] = -1/(dist*dist);
          }
          break;
-       case WEIGHTING_SCHEME_INV_DIST:
-         if (dist*dist == 0){
-           w[nz] = -100000;
-         } else {
-           w[nz] = -1/(dist);
-         }
-         break;
        case WEIGHTING_SCHEME_NONE:
          w[nz] = -1;
          break;

diff --git a/lib/sfdpgen/post_process.h b/lib/sfdpgen/post_process.h
index 84c58d593d700c7a82f669378339110df55a73fd..343bdf0f990f272adca3f34b3f2dfc5e16572807 100644 (file)
--- a/lib/sfdpgen/post_process.h
+++ b/lib/sfdpgen/post_process.h
@@ -75,7 +75,7 @@ typedef  StressMajorizationSmoother SparseStressMajorizationSmoother;
 
 void SparseStressMajorizationSmoother_delete(SparseStressMajorizationSmoother sm);
 
-enum {WEIGHTING_SCHEME_NONE, WEIGHTING_SCHEME_INV_DIST, WEIGHTING_SCHEME_SQR_DIST};
+enum {WEIGHTING_SCHEME_NONE, WEIGHTING_SCHEME_SQR_DIST};
 SparseStressMajorizationSmoother SparseStressMajorizationSmoother_new(SparseMatrix A, int dim, double lambda, double *x, 
                                                                      int weighting_scheme, int scale_initial_coord);