From 30dce18670dcb6514d7f0a8a280b40943c928ac5 Mon Sep 17 00:00:00 2001 From: erg Date: Mon, 21 Apr 2008 19:12:09 +0000 Subject: [PATCH] Back out changes to use of neato_init_node() --- lib/circogen/circularinit.c | 10 +--------- lib/fdpgen/fdpinit.c | 9 +-------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/lib/circogen/circularinit.c b/lib/circogen/circularinit.c index b48debe81..e0720ce38 100644 --- a/lib/circogen/circularinit.c +++ b/lib/circogen/circularinit.c @@ -34,14 +34,6 @@ #include "neatoprocs.h" #include -static void circular_init_node(node_t * n) -{ - common_init_node(n); - - gv_nodesize(n, GD_flip(n->graph)); - ND_pos(n) = N_NEW(GD_ndim(n->graph), double); -} - static void circular_init_edge(edge_t * e) { common_init_edge(e); @@ -61,7 +53,7 @@ static void circular_init_node_edge(graph_t * g) for (n = agfstnode(g); n; n = agnxtnode(g, n)) { ND_alg(n) = alg + i; GD_neato_nlist(g)[i++] = n; - circular_init_node(n); + neato_init_node(n); } for (n = agfstnode(g); n; n = agnxtnode(g, n)) { for (e = agfstout(g, n); e; e = agnxtout(g, e)) { diff --git a/lib/fdpgen/fdpinit.c b/lib/fdpgen/fdpinit.c index 221a33687..363106a59 100644 --- a/lib/fdpgen/fdpinit.c +++ b/lib/fdpgen/fdpinit.c @@ -65,13 +65,6 @@ static void initialPositions(graph_t * g) } } -static void fdp_initNode(node_t * n) -{ - common_init_node(n); - ND_pos(n) = N_NEW(GD_ndim(n->graph), double); - gv_nodesize(n, GD_flip(n->graph)); -} - /* init_edge: */ static void init_edge(edge_t * e, attrsym_t * E_len) @@ -96,7 +89,7 @@ void fdp_init_node_edge(graph_t * g) GD_neato_nlist(g) = N_NEW(nn + 1, node_t *); for (i = 0, n = agfstnode(g); n; n = agnxtnode(g, n)) { - fdp_initNode (n); + neato_init_node (n); ND_alg(n) = alg + i; GD_neato_nlist(g)[i] = n; ND_id(n) = i++; -- 2.50.0