Integrate topfish and sfdp into main tree, using GTS for triangulation;

remove duplicated code

diff --git a/cmd/smyrna/hier.c b/cmd/smyrna/hier.c
index ffb3bcc49c71827c3f6ed007e542178f2aa953a6..8fee701d16b2d3cba28915df6deac7865b2d56ee 100644 (file)
--- a/cmd/smyrna/hier.c
+++ b/cmd/smyrna/hier.c
@@ -15,6 +15,7 @@
 
 #include "smyrnadefs.h"
 #include "hier.h"
+#include "delaunay.h"
 #include "memory.h"
 
 /* scale_coords:
@@ -124,7 +125,7 @@ void positionAllItems(Hierarchy * hp, focus_t * fs, reposition_t* parms)
 
 #ifdef DEBUG
 static void
-dumpG (int nn, vtx_data * graph)
+dumpG (int nn, v_data * graph)
 {
     int i, j;
     for (i=0; i < nn; i++) {
@@ -166,10 +167,10 @@ dumpHier (Hierarchy* hier)
 
 #endif
 
-Hierarchy *makeHier(int nn, int ne, vtx_data * graph, double *x_coords,
+Hierarchy *makeHier(int nn, int ne, v_data * graph, double *x_coords,
                    double *y_coords, hierparms_t* parms)
 {
-    vtx_data *delaunay;
+    v_data *delaunay;
     ex_vtx_data *geom_graph;
     int ngeom_edges;
     Hierarchy *hp;

diff --git a/cmd/smyrna/hier.h b/cmd/smyrna/hier.h
index 4b7735d755e099b4510baa136efa8f8e1da8025f..54f37c560812a1fe94de60eff39eb291ad568e3e 100644 (file)
--- a/cmd/smyrna/hier.h
+++ b/cmd/smyrna/hier.h
@@ -49,7 +49,7 @@ typedef struct {
 } reposition_t;
 
 void positionAllItems(Hierarchy * hp, focus_t * fs, reposition_t* parms);
-Hierarchy *makeHier(int nnodes, int nedges, vtx_data *, double *,
+Hierarchy *makeHier(int nnodes, int nedges, v_data *, double *,
                    double*, hierparms_t *);
 
 focus_t *initFocus(int ncnt);