abbreviate some accumulated operations

diff --git a/lib/neatogen/heap.c b/lib/neatogen/heap.c
index 343ed52f2f02f2ff0c87db9f841c3a6634ad9019..c2572562620c09e0e7d990ee3bab668f94bc3041 100644 (file)
--- a/lib/neatogen/heap.c
+++ b/lib/neatogen/heap.c
@@ -55,7 +55,7 @@ void PQinsert(Halfedge * he, Site * v, double offset)
     }
     he->PQnext = last->PQnext;
     last->PQnext = he;
-    PQcount += 1;
+    ++PQcount;
 }
 
 void PQdelete(Halfedge * he)
@@ -67,7 +67,7 @@ void PQdelete(Halfedge * he)
        while (last->PQnext != he)
            last = last->PQnext;
        last->PQnext = he->PQnext;
-       PQcount -= 1;
+       --PQcount;
        deref(he->vertex);
        he->vertex = (Site *) NULL;
     }

diff --git a/lib/neatogen/kkutils.c b/lib/neatogen/kkutils.c
index 6e2ec32dfd9ab23e043eb2752e76a948f6aa7c7d..ce89b8dec28d317733cbdda3ac98732013c6d258 100644 (file)
--- a/lib/neatogen/kkutils.c
+++ b/lib/neatogen/kkutils.c
@@ -159,7 +159,7 @@ split_by_place(double *place, int *nodes, int first, int last, int *middle)
      * notice that always left>first, because of its initialization
      */
     if (place[nodes[left]] > place_val)
-       left = left - 1;
+       --left;
     *middle = left;
     nodes[first] = nodes[left];
     nodes[left] = val;

diff --git a/lib/neatogen/matrix_ops.c b/lib/neatogen/matrix_ops.c
index 7fd102b51779dca46d452f35971ae46d1cca4fe7..e8fa00262c2ae10ae676d0da2ba76acb9106ee7f 100644 (file)
--- a/lib/neatogen/matrix_ops.c
+++ b/lib/neatogen/matrix_ops.c
@@ -270,8 +270,8 @@ double dot(double *vec1, int beg, int end, double *vec2)
     double sum;
 
     sum = 0.0;
-    vec1 = vec1 + beg;
-    vec2 = vec2 + beg;
+    vec1 += beg;
+    vec2 += beg;
     for (i = end - beg + 1; i; i--) {
        sum += (*vec1++) * (*vec2++);
     }
@@ -284,8 +284,8 @@ void scadd(double *vec1, int beg, int end, double fac, double *vec2)
 {
     int i;
 
-    vec1 = vec1 + beg;
-    vec2 = vec2 + beg;
+    vec1 += beg;
+    vec2 += beg;
     for (i = end - beg + 1; i; i--) {
        (*vec1++) += fac * (*vec2++);
     }

diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c
index bb714aa5ae91bff2dbd7a697d52b3aa9ce99997e..3c43719e28359ce9bf4b7f3524d2d4e5c5d043e1 100644 (file)
--- a/lib/neatogen/neatoinit.c
+++ b/lib/neatogen/neatoinit.c
@@ -84,7 +84,7 @@ int user_pos(attrsym_t * posptr, attrsym_t * pinptr, node_t * np, int nG)
            if (PSinputscale > 0.0) {
                int i;
                for (i = 0; i < Ndim; i++)
-                   pvec[i] = pvec[i] / PSinputscale;
+                   pvec[i] /= PSinputscale;
            }
            if (Ndim > 2) {
                if (N_z && (p = agxget(np, N_z)) && (sscanf(p,"%lf",&z) == 1)) {

diff --git a/lib/neatogen/neatosplines.c b/lib/neatogen/neatosplines.c
index 8282137538bb0f0813a0a5aa80644d32ac448d95..a15ff17bac09fbbf14f1c00b7195f92f97dcfc79 100644 (file)
--- a/lib/neatogen/neatosplines.c
+++ b/lib/neatogen/neatosplines.c
@@ -52,7 +52,7 @@ make_barriers(Ppoly_t ** poly, int npoly, int pp, int qp,
            continue;
        if (i == qp)
            continue;
-       n = n + poly[i]->pn;
+       n += poly[i]->pn;
     }
     bar = N_GNEW(n, Pedge_t);
     b = 0;
@@ -1023,10 +1023,10 @@ static boolean _neato_set_aspect(graph_t * g)
            /* handle case where one or more dimensions is too big */
            if ((xf < 1.0) || (yf < 1.0)) {
                if (xf < yf) {
-                   yf = yf / xf;
+                   yf /= xf;
                    xf = 1.0;
                } else {
-                   xf = xf / yf;
+                   xf /= yf;
                    yf = 1.0;
                }
            }
@@ -1070,8 +1070,8 @@ static boolean _neato_set_aspect(graph_t * g)
         * allocate it in the root graph and the connected components. 
         */
        for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
-           ND_pos(n)[0] = ND_pos(n)[0] * xf;
-           ND_pos(n)[1] = ND_pos(n)[1] * yf;
+           ND_pos(n)[0] *= xf;
+           ND_pos(n)[1] *= yf;
        }
        scaleBB(g, xf, yf);
         return TRUE;

diff --git a/lib/neatogen/site.c b/lib/neatogen/site.c
index 36715bbffe78e2792014ee6cc889531a3fc6cdf0..ffda5ad2cb020cfebb69dc333e87ed90ddfe43fd 100644 (file)
--- a/lib/neatogen/site.c
+++ b/lib/neatogen/site.c
@@ -50,7 +50,7 @@ double dist(Site * s, Site * t)
 void makevertex(Site * v)
 {
     v->sitenbr = nvertices;
-    nvertices += 1;
+    ++nvertices;
 #ifdef STANDALONE
     out_vertex(v);
 #endif
@@ -59,12 +59,12 @@ void makevertex(Site * v)
 
 void deref(Site * v)
 {
-    v->refcnt -= 1;
+    --v->refcnt;
     if (v->refcnt == 0)
        makefree(v, &sfl);
 }
 
 void ref(Site * v)
 {
-    v->refcnt += 1;
+    ++v->refcnt;
 }

diff --git a/lib/neatogen/stuff.c b/lib/neatogen/stuff.c
index 311a1225c3178e34b0428e1a4188f2d15516026a..2f40e0b730a2b0b9b58f9c6a91ef5c1c75018380 100644 (file)
--- a/lib/neatogen/stuff.c
+++ b/lib/neatogen/stuff.c
@@ -50,7 +50,7 @@ double **new_array(int m, int n, double ival)
     mem = N_NEW(m * n, double);
     for (i = 0; i < m; i++) {
        rv[i] = mem;
-       mem = mem + n;
+       mem += n;
        for (j = 0; j < n; j++)
            rv[i][j] = ival;
     }

diff --git a/lib/pathplan/cvt.c b/lib/pathplan/cvt.c
index efaee8585c503305d1d94a674a18e4edc72de987..1bde5002a27a180e15a2243f963b038090c6d03b 100644 (file)
--- a/lib/pathplan/cvt.c
+++ b/lib/pathplan/cvt.c
@@ -53,7 +53,7 @@ vconfig_t *Pobsopen(Ppoly_t ** obs, int n_obs)
     /* get storage */
     n = 0;
     for (poly_i = 0; poly_i < n_obs; poly_i++)
-       n = n + obs[poly_i]->pn;
+       n += obs[poly_i]->pn;
     rv->P = mymalloc(n * sizeof(Ppoint_t));
     rv->start = mymalloc((n_obs + 1) * sizeof(int));
     rv->next = mymalloc(n * sizeof(int));