Remove use of mode attribute from sfdp - still experimental

diff --git a/doc/info/attrs.html b/doc/info/attrs.html
index 5fb1fbeff22c84d56774faa7510c8d6fef39c204..9a80e48b18c530602338a74fdd18bf1cf11059d9 100644 (file)
--- a/doc/info/attrs.html
+++ b/doc/info/attrs.html
@@ -293,7 +293,7 @@ This field indicates which graph component uses the attribute.
  <TR><TD><A NAME=a:minlen HREF=#d:minlen>minlen</A>
 </TD><TD>E</TD><TD>int</TD><TD ALIGN="CENTER">1</TD><TD>0</TD><TD>dot only</TD> </TR>
  <TR><TD><A NAME=a:mode HREF=#d:mode>mode</A>
-</TD><TD>G</TD><TD>string</TD><TD ALIGN="CENTER">major<BR>spring</TD><TD></TD><TD>sfdp, neato only</TD> </TR>
+</TD><TD>G</TD><TD>string</TD><TD ALIGN="CENTER">major</TD><TD></TD><TD>neato only</TD> </TR>
  <TR><TD><A NAME=a:model HREF=#d:model>model</A>
 </TD><TD>G</TD><TD>string</TD><TD ALIGN="CENTER">shortpath</TD><TD></TD><TD>neato only</TD> </TR>
  <TR><TD><A NAME=a:mosek HREF=#d:mosek>mosek</A>
@@ -1143,10 +1143,6 @@ This field indicates which graph component uses the attribute.
   directionality similar to the layout used in dot, and "ipsep", which
   allows the graph to specify minimum vertical and horizontal distances
   between nodes. (See the <A HREF=#d:sep>sep</A> attribute.)
-  <P>
-  For sfdp, the default <B>mode</B> is <TT>"spring"</TT>, which corresponds to using
-  a spring-electrical model. Setting <B>mode</B> to <TT>"maxent"</TT> causes a similar
-  model to be run but one that also takes into account edge lengths specified by a the
   <TT>"len"</TT> attribute.
 
 <DT><A NAME=d:model HREF=#a:model><STRONG>model</STRONG></A>
@@ -2117,8 +2113,8 @@ the given types.
    points, of the lower-left corner (llx,lly) and the upper-right corner
    (urx,ury).
 
-<DT><A NAME=kshape><STRONG>shape</STRONG></A>
-<DD>A string specifying the <A HREF=/content/node-shapes>shape</A> of a node.
+<DT><A NAME=k:shape><STRONG>shape</STRONG></A>
+<DD>A string specifying the <A HREF=shapes.html>shape</A> of a node.
   There are three
   main types of shapes :
   <A HREF=shapes.html#polygon>polygon-based</A>,

diff --git a/doc/infosrc/attrs b/doc/infosrc/attrs
index cc20bef7ab93eb1ea40abc7a8df2a6142a19c75d..4cb78af20ca1a97c34187fa32ee6bf97518bf236 100644 (file)
--- a/doc/infosrc/attrs
+++ b/doc/infosrc/attrs
@@ -613,7 +613,7 @@ maximum number of iterations in each pass.
 Specifies the minimum separation between all nodes.
 :minlen:E:int:1:0;  dot
 Minimum edge length (rank difference between head and tail).
-:mode:G:string:major/spring;  neato,sfdp
+:mode:G:string:major;  neato
 Technique for optimizing the layout. For neato, if <B>mode</B> is <TT>"major"</TT>,
 neato uses stress majorization. If <B>mode</B> is <TT>"KK"</TT>,
 neato uses a version of the gradient descent method. The only advantage
@@ -625,10 +625,6 @@ There are two experimental modes in neato, "hier", which adds a top-down
 directionality similar to the layout used in dot, and "ipsep", which
 allows the graph to specify minimum vertical and horizontal distances
 between nodes. (See the <A HREF=#d:sep>sep</A> attribute.)
-<P>
-For sfdp, the default <B>mode</B> is <TT>"spring"</TT>, which corresponds to using
-a spring-electrical model. Setting <B>mode</B> to <TT>"maxent"</TT> causes a similar
-model to be run but one that also takes into account edge lengths specified by a the
 <TT>"len"</TT> attribute.
 :model:G:string:shortpath;  neato
 This value specifies how the distance matrix is computed for the input

diff --git a/lib/sfdpgen/sfdpinit.c b/lib/sfdpgen/sfdpinit.c
index ee1062ae5be0f8399b707b09a93a00ed9661c57d..f8c883e422cf1879686ddb3665e3950ea4375dee 100644 (file)
--- a/lib/sfdpgen/sfdpinit.c
+++ b/lib/sfdpgen/sfdpinit.c
@@ -151,6 +151,7 @@ static void sfdpLayout(graph_t * g, spring_electrical_control ctrl,
     if (edge_label_nodes) FREE(edge_label_nodes);
 }
 
+#if UNUSED
 static int
 late_mode (graph_t* g, Agsym_t* sym, int dflt)
 {
@@ -188,6 +189,7 @@ late_mode (graph_t* g, Agsym_t* sym, int dflt)
        rv = dflt;
     return rv;
 }
+#endif
 
 static int
 late_smooth (graph_t* g, Agsym_t* sym, int dflt)
@@ -299,7 +301,8 @@ tuneControl (graph_t* g, spring_electrical_control ctrl)
     ctrl->multilevels = late_int(g, agfindgraphattr(g, "levels"), INT_MAX, 0);
     ctrl->smoothing = late_smooth(g, agfindgraphattr(g, "smoothing"), SMOOTHING_NONE);
     ctrl->tscheme = late_quadtree_scheme(g, agfindgraphattr(g, "quadtree"), QUAD_TREE_NORMAL);
-    ctrl->method = late_mode(g, agfindgraphattr(g, "mode"), METHOD_SPRING_ELECTRICAL);
+    /* ctrl->method = late_mode(g, agfindgraphattr(g, "mode"), METHOD_SPRING_ELECTRICAL); */
+    ctrl->method = METHOD_SPRING_ELECTRICAL;
     ctrl->rotation = late_double(g, agfindgraphattr(g, "rotation"), 0.0, -MAXDOUBLE);
     ctrl->edge_labeling_scheme = late_int(g, agfindgraphattr(g, "label_scheme"), 0, 0);
     if (ctrl->edge_labeling_scheme > 4) {