From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 28 Nov 2022 00:34:19 +0000 (-0800)
Subject: sparse QuadTree_get_repulsive_force: remove 'flag' that is always set to 0
X-Git-Tag: 7.0.4~3^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3be38fb1e54600573d4862a7a6b5c7cd0c94b128;p=graphviz

sparse QuadTree_get_repulsive_force: remove 'flag' that is always set to 0
---

diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index f9ee807fe..745b3eda3 100644
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -547,9 +547,7 @@ void spring_electrical_embedding_fast(int dim, SparseMatrix A0, spring_electrica
     start = clock();
 #endif
 
-    QuadTree_get_repulsive_force(qt, force, x, ctrl->bh, p, KP, counts, flag);
-
-    assert(!(*flag));
+    QuadTree_get_repulsive_force(qt, force, x, ctrl->bh, p, KP, counts);
 
 #ifdef TIME
     end = clock();
diff --git a/lib/sparse/QuadTree.c b/lib/sparse/QuadTree.c
index bf73ede93..6b322b428 100644
--- a/lib/sparse/QuadTree.c
+++ b/lib/sparse/QuadTree.c
@@ -311,7 +311,7 @@ static void QuadTree_repulsive_force_accumulate(QuadTree qt, double *force, doub
 
 }
 
-void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double bh, double p, double KP, double *counts, int *flag){
+void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double bh, double p, double KP, double *counts){
   /* get repulsice force by a more efficient algortihm: we consider two cells, if they are well separated, we
      calculate the overall repulsive force on the cell level, if not well separated, we divide one of the cell.
      If both cells are at the leaf level, we calcuaulate repulsicve force among individual nodes. Finally
@@ -332,8 +332,6 @@ void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double
 
   for (i = 0; i < 4; i++) counts[i] = 0;
 
-  *flag = 0;
-
   for (i = 0; i < dim*n; i++) force[i] = 0;
 
   QuadTree_repulsive_force_interact(qt, qt, x, force, bh, p, KP, counts);
diff --git a/lib/sparse/QuadTree.h b/lib/sparse/QuadTree.h
index 6e0c7d8fc..f58eed59f 100644
--- a/lib/sparse/QuadTree.h
+++ b/lib/sparse/QuadTree.h
@@ -53,7 +53,7 @@ double point_distance(double *p1, double *p2, int dim);
 void QuadTree_get_supernodes(QuadTree qt, double bh, double *point, int nodeid, int *nsuper, 
 			     int *nsupermax, double **center, double **supernode_wgts, double **distances, double *counts, int *flag);
 
-void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double bh, double p, double KP, double *counts, int *flag);
+void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double bh, double p, double KP, double *counts);
 
 /* find the nearest point and put in ymin, index in imin and distance in min */
 void QuadTree_get_nearest(QuadTree qt, double *x, double *ymin, int *imin, double *min);