From: ellson <devnull@localhost>
Date: Thu, 23 Oct 2008 04:05:44 +0000 (+0000)
Subject: cgraph fixes
X-Git-Tag: LAST_LIBGRAPH~32^2~2998
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=431d11b14741525cd13c3ab171cc5f437474416a;p=graphviz

cgraph fixes
---

diff --git a/lib/neatogen/circuit.c b/lib/neatogen/circuit.c
index cdf58a253..3e003c998 100644
--- a/lib/neatogen/circuit.c
+++ b/lib/neatogen/circuit.c
@@ -45,7 +45,8 @@ int circuit_model(graph_t * g, int nG)
 {
     double **Gm;
     double **Gm_inv;
-    int rv, i, j;
+    int rv;
+    long i, j;
     node_t *v;
     edge_t *e;
 
@@ -55,8 +56,8 @@ int circuit_model(graph_t * g, int nG)
     /* set non-diagonal entries */
     for (v = agfstnode(g); v; v = agnxtnode(g, v)) {
 	for (e = agfstedge(g, v); e; e = agnxtedge(g, e, v)) {
-	    i = ND_id(e->tail);
-	    j = ND_id(e->head);
+	    i = AGID(agtail(e));
+	    j = AGID(aghead(e));
 	    if (i == j)
 		continue;
 	    /* conductance is 1/resistance */