Correct makeHier interface to use number of edges in reduced graph

diff --git a/cmd/smyrna/hier.c b/cmd/smyrna/hier.c
index 901954c9fca82fb0740cb3dd61445d5172be2a06..e0ca07226c961ec679a3b7ea618707313d81e9da 100644 (file)
--- a/cmd/smyrna/hier.c
+++ b/cmd/smyrna/hier.c
@@ -10,7 +10,7 @@
   focus_t* fs;
   int ne;
   vtx_data* graph = makeGraph (topview*, &ne);
-  hierarchy = makeHier(topview*, graph, x_coords, y_coords);
+  hierarchy = makeHier(topview->NodeCount, ne, graph, x_coords, y_coords);
   freeGraph (graph);
   fs = initFocus (topview->Nodecount); // create focus set
 
@@ -167,12 +167,10 @@ makeGraph (topview* tv, int* nedges)
 }
 
 Hierarchy*
-makeHier (topview* tv, vtx_data* graph, double* x_coords, double* y_coords)
+makeHier (int nn, int ne, vtx_data* graph, double* x_coords, double* y_coords)
 {
     vtx_data* delaunay;
     ex_vtx_data* geom_graph;
-    int nn = tv->Nodecount;
-    int ne = tv->Edgecount;
     int ngeom_edges;
     Hierarchy* hp = NEW(Hierarchy);
 

diff --git a/cmd/smyrna/hier.h b/cmd/smyrna/hier.h
index 884bc15234f83575ee93fa74833f0ee7757bddff..1a3a9e52d5b6e2a9b1618a1a7e3400a13aec27f7 100644 (file)
--- a/cmd/smyrna/hier.h
+++ b/cmd/smyrna/hier.h
@@ -21,6 +21,6 @@ typedef struct {
 
 void positionAllItems (Hierarchy* hp, focus_t* fs, hierparms_t* parms);
 vtx_data* makeGraph (topview* tv, int* nedges);
-Hierarchy* makeHier (topview*, vtx_data*, double*, double*);
+Hierarchy* makeHier (int nnodes, int nedges, vtx_data*, double*, double*);
 
 #endif