With maxiter = 0, allow initial positions to be assigned before returning

diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c
index e5c40d6875fb63a5f08a16b9f6cc71a6bcc77f4a..ff753fdb5d7cb15e1f6183996e4080746062910a 100644 (file)
--- a/lib/neatogen/neatoinit.c
+++ b/lib/neatogen/neatoinit.c
@@ -1540,7 +1540,7 @@ neatoLayout(Agraph_t * mg, Agraph_t * g, int layoutMode, int layoutModel,
        MaxIter = 100 * agnnodes(g);
 
     nG = scan_graph_mode(g, layoutMode);
-    if ((nG < 2) || (MaxIter <=0))
+    if ((nG < 2) || (MaxIter < 0))
        return;
     if (layoutMode)
        majorization(mg, g, nG, layoutMode, layoutModel, Ndim, MaxIter, am);

diff --git a/lib/neatogen/stress.c b/lib/neatogen/stress.c
index c651f770ed17c6dddd0914aea0687e8fcec50d4d..ba6565783adea73dce8964a2765379988c6778d0 100644 (file)
--- a/lib/neatogen/stress.c
+++ b/lib/neatogen/stress.c
@@ -939,7 +939,7 @@ int stress_majorization_kD_mkernel(vtx_data * graph,        /* Input graph in sparse re
        ** Compute the all-pairs-shortest-distances matrix **
        ****************************************************/
 
-    if (maxi == 0)
+    if (maxi < 0)
        return 0;
 
     if (Verbose)
@@ -1019,7 +1019,7 @@ int stress_majorization_kD_mkernel(vtx_data * graph,      /* Input graph in sparse re
     }
     if (Verbose)
        fprintf(stderr, ": %.2f sec", elapsed_sec());
-    if (n == 1)
+    if ((n == 1) || (maxi == 0))
        return 0;
 
     if (Verbose) {