From: ellson Date: Tue, 18 Oct 2005 20:16:57 +0000 (+0000) Subject: missed change X-Git-Tag: LAST_LIBGRAPH~32^2~7132 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d3ac8369cfef09283a56d0561c0bb1b62e5d7a5;p=graphviz missed change --- diff --git a/doc/info/attrs.html b/doc/info/attrs.html index 47461bd7e..e85a18482 100644 --- a/doc/info/attrs.html +++ b/doc/info/attrs.html @@ -1512,7 +1512,6 @@ the given types. At present, the recognized style names comprise "dashed", "dotted", "solid", "invis" and "bold" for nodes and edges, and "filled", "diagonals" and "rounded" for nodes only. - The styles "filled" and "rounded" are recognized for clusters. Additional styles are available in device-dependent form. Style lists are passed to device drivers, which can use this to generate appropriate output. diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c index 2bcaec63b..a58c61fa3 100644 --- a/lib/neatogen/neatoinit.c +++ b/lib/neatogen/neatoinit.c @@ -745,7 +745,6 @@ static vtx_data *makeGraphData(graph_t * g, int nv, int *nedges, int mode, int m int haveLen; int haveWt; int haveDir; - int dfltConstr; PointMap *ps = newPM(); int i, i_nedges, idx; @@ -792,11 +791,6 @@ static vtx_data *makeGraphData(graph_t * g, int nv, int *nedges, int mode, int m #ifdef DIGCOLA if (haveDir) { graph[i].edists = edists++; - /* if g is directed, use edge direction by default - * if g is undirected, don't. - */ - if (AG_IS_DIRECTED(g)) dfltConstr = 1; - else dfltConstr = 0; } else graph[i].edists = NULL; @@ -828,10 +822,7 @@ static vtx_data *makeGraphData(graph_t * g, int nv, int *nedges, int mode, int m *ewgts++ = 1.0; #ifdef DIGCOLA if (haveDir) { - if (late_bool(ep,E_constr,dfltConstr)) *edists++ = (np == ep->head ? 1.0 : -1.0); - else - *edists++ = 0.0; } #endif i_nedges++; @@ -1031,8 +1022,8 @@ majorization(graph_t * g, int nv, int mode, int model, int dim, int steps) coords[i] = coords[0] + i * nv; } if (Verbose) { - fprintf(stderr, "mode %d model %d smart_init %d iterations %d tol %f\n", - mode, model, (init == INIT_SELF), MaxIter, Epsilon); + fprintf(stderr, "model %d smart_init %d iterations %d tol %f\n", + model, (init == INIT_SELF), MaxIter, Epsilon); fprintf(stderr, "convert graph: "); start_timer(); }