remove the ability to transpose the result of SparseMatrix_multiply_dense

Neither of the two callers was using this functionality.

diff --git a/lib/sfdpgen/post_process.c b/lib/sfdpgen/post_process.c
index c826442124a9ce2dfb1e020473f22ad8adf5b5e3..3723a835b76391f6b0414b9e97b4fa66fec48e18 100644 (file)
--- a/lib/sfdpgen/post_process.c
+++ b/lib/sfdpgen/post_process.c
@@ -659,7 +659,7 @@ real StressMajorizationSmoother_smooth(StressMajorizationSmoother sm, int dim, r
       }
       /* solve (Lw+lambda*I) x = Lwdd y + lambda x0 */
 
-      SparseMatrix_multiply_dense(Lwdd, x, &y, FALSE, dim);
+      SparseMatrix_multiply_dense(Lwdd, x, &y, dim);
     } else {
       for (i = 0; i < m; i++){
        for (j = 0; j < dim; j++){

diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index c9de0225e4dca7cb14f3c1bd665ee4f4ec45f8ee..6f192c32068e0ac659579a2b3263dac1638cefe5 100644 (file)
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -1685,7 +1685,7 @@ void interpolate_coord(int dim, SparseMatrix A, real *x){
 }
 static void prolongate(int dim, SparseMatrix A, SparseMatrix P, SparseMatrix R, real *x, real *y, int coarsen_scheme_used, real delta){
   int nc, *ia, *ja, i, j, k;
-  SparseMatrix_multiply_dense(P, x, &y, FALSE, dim);
+  SparseMatrix_multiply_dense(P, x, &y, dim);
 
   /* xu yao rao dong */
   if (coarsen_scheme_used > EDGE_BASED_STA && coarsen_scheme_used < EDGE_BASED_STO){

diff --git a/lib/sparse/SparseMatrix.c b/lib/sparse/SparseMatrix.c
index 366e18a9f0eb46324e680b0e21f5f6450f5199fd..ac6d24e6dd747ef7230cc235146c0819d161d98f 100644 (file)
--- a/lib/sparse/SparseMatrix.c
+++ b/lib/sparse/SparseMatrix.c
@@ -1057,16 +1057,11 @@ static void SparseMatrix_multiply_dense1(SparseMatrix A, real *v, real **res, in
 
 }
 
-void SparseMatrix_multiply_dense(SparseMatrix A, real *v, real **res, int res_transposed, int dim){
-  /* assume res_transposed == FALSE
-     A * V, with A dimension m x n, with V of dimension n x dim. v[i*dim+j] gives V[i,j]. Result of dimension m x dim
- 
-     furthermore, if res_transpose d== TRUE, then the result is transposed. Hence if res_transposed == TRUE
-
-     V^T A^T, with A dimension m x n, with V of dimension n x dim. v[i*dim+j] gives V[i,j]. Result of dimension dim x dim
+void SparseMatrix_multiply_dense(SparseMatrix A, real *v, real **res, int dim){
+  /* A * V, with A dimension m x n, with V of dimension n x dim. v[i*dim+j] gives V[i,j]. Result of dimension m x dim
  */
 
-  SparseMatrix_multiply_dense1(A, v, res, dim, 0, res_transposed);
+  SparseMatrix_multiply_dense1(A, v, res, dim, 0, 0);
 }
 
 void SparseMatrix_multiply_vector(SparseMatrix A, real *v, real **res, int transposed){

diff --git a/lib/sparse/SparseMatrix.h b/lib/sparse/SparseMatrix.h
index fa867a7aac08932cd70f78edc0eb98ec4599c131..2874f1baa5532136910db91de6f2d774acdd3374 100644 (file)
--- a/lib/sparse/SparseMatrix.h
+++ b/lib/sparse/SparseMatrix.h
@@ -73,7 +73,7 @@ SparseMatrix SparseMatrix_remove_diagonal(SparseMatrix A);
 SparseMatrix SparseMatrix_remove_upper(SparseMatrix A);/* remove diag and upper diag */
 SparseMatrix SparseMatrix_divide_row_by_degree(SparseMatrix A);
 SparseMatrix SparseMatrix_get_real_adjacency_matrix_symmetrized(SparseMatrix A);  /* symmetric, all entries to 1, diaginal removed */
-void SparseMatrix_multiply_dense(SparseMatrix A, real *v, real **res, int res_transpose, int dim);
+void SparseMatrix_multiply_dense(SparseMatrix A, real *v, real **res, int dim);
 SparseMatrix SparseMatrix_apply_fun(SparseMatrix A, double (*fun)(double x));/* for real only! */
 SparseMatrix SparseMatrix_copy(SparseMatrix A);
 int SparseMatrix_has_diagonal(SparseMatrix A);