From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 26 Jun 2021 04:33:21 +0000 (-0700)
Subject: remove pattern_symmetric_only parameter to SparseMatrix_symmetrize_nodiag
X-Git-Tag: 2.48.0~24^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca17b9f1cfda5d075ca735b8178e5b104bc986fb;p=graphviz

remove pattern_symmetric_only parameter to SparseMatrix_symmetrize_nodiag

This function is only called with FALSE for this argument, so we can propagate
it through and remove the parameter.
---

diff --git a/lib/sfdpgen/Multilevel.c b/lib/sfdpgen/Multilevel.c
index 8d66004ce..f51093592 100644
--- a/lib/sfdpgen/Multilevel.c
+++ b/lib/sfdpgen/Multilevel.c
@@ -1187,7 +1187,7 @@ Multilevel Multilevel_new(SparseMatrix A0, SparseMatrix D0, real *node_weights,
     A = SparseMatrix_get_real_adjacency_matrix_symmetrized(A);
   }
   if (D && (!SparseMatrix_is_symmetric(D, FALSE) || D->type != MATRIX_TYPE_REAL)){
-    D = SparseMatrix_symmetrize_nodiag(D, FALSE);
+    D = SparseMatrix_symmetrize_nodiag(D);
   }
   grid = Multilevel_init(A, D, node_weights);
   grid = Multilevel_establish(grid, ctrl);
diff --git a/lib/sfdpgen/sfdpinit.c b/lib/sfdpgen/sfdpinit.c
index 9df8bf87a..9be012383 100644
--- a/lib/sfdpgen/sfdpinit.c
+++ b/lib/sfdpgen/sfdpinit.c
@@ -121,7 +121,7 @@ static void sfdpLayout(graph_t * g, spring_electrical_control ctrl,
 	    D = SparseMatrix_get_real_adjacency_matrix_symmetrized(A);/* all distance 1 */
 	    weighted = FALSE;
 	} else {
-	    D = SparseMatrix_symmetrize_nodiag(D, FALSE);
+	    D = SparseMatrix_symmetrize_nodiag(D);
 	    weighted = TRUE;
 	}
 	if (hops > 0){
diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index 16516cfa9..9e2cd9d07 100644
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -1977,9 +1977,9 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0
 
   if (!SparseMatrix_is_symmetric(A, FALSE) || A->type != MATRIX_TYPE_REAL){
     if (ctrl->method == METHOD_SPRING_MAXENT){
-      A = SparseMatrix_symmetrize_nodiag(A, FALSE);
+      A = SparseMatrix_symmetrize_nodiag(A);
       assert(D0);
-      D = SparseMatrix_symmetrize_nodiag(D, FALSE);
+      D = SparseMatrix_symmetrize_nodiag(D);
     } else {
       A = SparseMatrix_get_real_adjacency_matrix_symmetrized(A);
     }
diff --git a/lib/sparse/SparseMatrix.c b/lib/sparse/SparseMatrix.c
index ba3505645..1c105d05c 100644
--- a/lib/sparse/SparseMatrix.c
+++ b/lib/sparse/SparseMatrix.c
@@ -155,9 +155,9 @@ SparseMatrix SparseMatrix_symmetrize(SparseMatrix A, int pattern_symmetric_only)
   return A;
 }
 
-SparseMatrix SparseMatrix_symmetrize_nodiag(SparseMatrix A, int pattern_symmetric_only){
+SparseMatrix SparseMatrix_symmetrize_nodiag(SparseMatrix A){
   SparseMatrix B;
-  if (SparseMatrix_is_symmetric(A, pattern_symmetric_only)) {
+  if (SparseMatrix_is_symmetric(A, FALSE)) {
     B = SparseMatrix_copy(A);
     return SparseMatrix_remove_diagonal(B);
   }
diff --git a/lib/sparse/SparseMatrix.h b/lib/sparse/SparseMatrix.h
index 39d52981f..9836afda6 100644
--- a/lib/sparse/SparseMatrix.h
+++ b/lib/sparse/SparseMatrix.h
@@ -76,7 +76,7 @@ SparseMatrix SparseMatrix_coordinate_form_add_entries(SparseMatrix A, int nentri
 int SparseMatrix_is_symmetric(SparseMatrix A, int test_pattern_symmetry_only);
 SparseMatrix SparseMatrix_transpose(SparseMatrix A);
 SparseMatrix SparseMatrix_symmetrize(SparseMatrix A, int pattern_symmetric_only);
-SparseMatrix SparseMatrix_symmetrize_nodiag(SparseMatrix A, int pattern_symmetric_only);
+SparseMatrix SparseMatrix_symmetrize_nodiag(SparseMatrix A);
 void SparseMatrix_multiply_vector(SparseMatrix A, real *v, real **res, int transposed);/* if v = NULL, v is assumed to be {1,1,...,1}*/
 SparseMatrix SparseMatrix_remove_diagonal(SparseMatrix A);
 SparseMatrix SparseMatrix_remove_upper(SparseMatrix A);/* remove diag and upper diag */