From: Jonathan Zheng Date: Wed, 15 Jan 2020 17:38:07 +0000 (+0000) Subject: fixed more indentation X-Git-Tag: stable_release_2.44.0~12^2~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e2c2d99e8365dd9b7a3fb4aadff853934898eee;p=graphviz fixed more indentation --- diff --git a/lib/common/types.h b/lib/common/types.h index a653101df..e7da57b08 100644 --- a/lib/common/types.h +++ b/lib/common/types.h @@ -297,8 +297,8 @@ typedef enum {NATIVEFONTS,PSFONTS,SVGFONTS} fontname_kind; #ifndef DOT_ONLY /* to place nodes */ node_t **neato_nlist; - node_t **heap; - int heapsize; + node_t **heap; + int heapsize; int move; double **dist; double **spring; diff --git a/lib/neatogen/CMakeLists.txt b/lib/neatogen/CMakeLists.txt index eeac6ac82..ffdcf6c68 100644 --- a/lib/neatogen/CMakeLists.txt +++ b/lib/neatogen/CMakeLists.txt @@ -45,7 +45,7 @@ set(sources sparsegraph.h stress.h voronoi.h - sgd.h + sgd.h # Source files adjust.c @@ -86,7 +86,7 @@ set(sources stuff.c stress.c voronoi.c - sgd.c + sgd.c ) if (with_ipsepcola) diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c index 386e36bad..2f63bb90c 100644 --- a/lib/neatogen/neatoinit.c +++ b/lib/neatogen/neatoinit.c @@ -663,6 +663,8 @@ static int neatoMode(graph_t * g) mode = MODE_KK; else if (streq(str, "major")) mode = MODE_MAJOR; + else if (streq(str, "sgd")) + mode = MODE_SGD; #ifdef DIGCOLA else if (streq(str, "hier")) mode = MODE_HIER; @@ -671,8 +673,6 @@ static int neatoMode(graph_t * g) mode = MODE_IPSEP; #endif #endif - else if (streq(str, "sgd")) - mode = MODE_SGD; else agerr(AGWARN, "Illegal value %s for attribute \"mode\" in graph %s - ignored\n", @@ -1359,11 +1359,11 @@ neatoLayout(Agraph_t * mg, Agraph_t * g, int layoutMode, int layoutModel, nG = scan_graph_mode(g, layoutMode); if ((nG < 2) || (MaxIter < 0)) return; - if (layoutMode == MODE_KK) + if (layoutMode == MODE_KK) kkNeato(g, nG, layoutModel); - else if (layoutMode == MODE_SGD) + else if (layoutMode == MODE_SGD) sgd(g, nG, layoutModel); - else + else majorization(mg, g, nG, layoutMode, layoutModel, Ndim, MaxIter, am); }