remove some unnecessary bracketing

diff --git a/lib/cgraph/attr.c b/lib/cgraph/attr.c
index 38a1a9e148067d81b187f343c751de9ec422af23..7a8ce5aea883d7f063bd87bf16b5d7c1c9b76234 100644 (file)
--- a/lib/cgraph/attr.c
+++ b/lib/cgraph/attr.c
@@ -117,7 +117,7 @@ static Agdatadict_t *agmakedatadict(Agraph_t * g)
        dtview(dd->dict.e, parent_dd->dict.e);
        dtview(dd->dict.g, parent_dd->dict.g);
     } else {
-       if (ProtoGraph && (g != ProtoGraph)) {
+       if (ProtoGraph && g != ProtoGraph) {
            /* it's not ok to dtview here for several reasons. the proto
               graph could change, and the sym indices don't match */
            parent_dd = agdatadict(ProtoGraph, FALSE);
@@ -389,7 +389,7 @@ void agnodeattr_init(Agraph_t * g, Agnode_t * n)
     Agattr_t *data;
 
     data = agattrrec(n);
-    if ((!data) || (!data->dict))
+    if (!data || !data->dict)
        (void) agmakeattrs(g, n);
 }
 
@@ -408,7 +408,7 @@ void agedgeattr_init(Agraph_t * g, Agedge_t * e)
     Agattr_t *data;
 
     data = agattrrec(e);
-    if ((!data) || (!data->dict))
+    if (!data || !data->dict)
        (void) agmakeattrs(g, e);
 }
 
@@ -433,7 +433,7 @@ char *agget(void *obj, char *name)
        rv = 0;                 /* note was "", but this provides more info */
     else {
        data = agattrrec(obj);
-       rv = (char *) (data->str[sym->id]);
+       rv = (char *) data->str[sym->id];
     }
     return rv;
 }
@@ -444,7 +444,7 @@ char *agxget(void *obj, Agsym_t * sym)
     char *rv;
 
     data = agattrrec(obj);
-    assert((sym->id >= 0) && (sym->id < topdictsize(obj)));
+    assert(sym->id >= 0 && sym->id < topdictsize(obj));
     rv = (char *) (data->str[sym->id]);
     return rv;
 }
@@ -472,7 +472,7 @@ int agxset(void *obj, Agsym_t * sym, char *value)
     g = agraphof(obj);
     hdr = obj;
     data = agattrrec(hdr);
-    assert((sym->id >= 0) && (sym->id < topdictsize(obj)));
+    assert(sym->id >= 0 && sym->id < topdictsize(obj));
     agstrfree(g, data->str[sym->id]);
     data->str[sym->id] = agstrdup(g, value);
     if (hdr->tag.objtype == AGRAPH) {

diff --git a/lib/cgraph/edge.c b/lib/cgraph/edge.c
index d4579ee386dbef1fdebf39cfee05e463a15a242a..5a8fc6734d723778f8b475d90c1427a26a108723 100644 (file)
--- a/lib/cgraph/edge.c
+++ b/lib/cgraph/edge.c
@@ -93,13 +93,13 @@ Agedge_t *agnxtedge(Agraph_t * g, Agedge_t * e, Agnode_t * n)
        if (rv == NULL) {
            do {
                rv = !rv ? agfstin(g, n) : agnxtin(g,rv);
-           } while (rv && (rv->node == n));
+           } while (rv && rv->node == n);
        }
     } else {
        do {
            rv = agnxtin(g, e);         /* so that we only see each edge once, */
                e = rv;
-       } while (rv && (rv->node == n));        /* ignore loops as in-edges */
+       } while (rv && rv->node == n);  /* ignore loops as in-edges */
     }
     return rv;
 }
@@ -250,7 +250,7 @@ Agedge_t *agidedge(Agraph_t * g, Agnode_t * t, Agnode_t * h,
        e = agfindedge_by_id(g, h, t, id);
     if (e == NULL && cflag && ok_to_make_edge(g, t, h)) {
        root = agroot(g);
-       if ((g != root) && ((e = agfindedge_by_id(root, t, h, id)))) {
+       if (g != root && ((e = agfindedge_by_id(root, t, h, id)))) {
            subedge(g, e);      /* old */
        } else {
            if (agallocid(g, AGEDGE, id)) {
@@ -391,7 +391,7 @@ static int agedgeidcmpf(Dict_t * d, void *arg_e0, void *arg_e1, Dtdisc_t * disc)
     if (AGID(e0->node) < AGID(e1->node)) return -1;
     if (AGID(e0->node) > AGID(e1->node)) return 1;
     /* same node */
-    if ((AGTYPE(e0) != 0) && (AGTYPE(e1) != 0)) {
+    if (AGTYPE(e0) != 0 && AGTYPE(e1) != 0) {
         if (AGID(e0) < AGID(e1)) return -1;
         if (AGID(e0) > AGID(e1)) return 1;
     }

diff --git a/lib/cgraph/obj.c b/lib/cgraph/obj.c
index d565ec97179240abb3bf23c14fc7dd929e635970..8d22f5f35c8ab7141a7fbf22cf2eece5fc0df898 100644 (file)
--- a/lib/cgraph/obj.c
+++ b/lib/cgraph/obj.c
@@ -13,7 +13,7 @@
 
 int agdelete(Agraph_t * g, void *obj)
 {
-    if ((AGTYPE(obj) == AGRAPH) && (g != agparent(obj))) {
+    if (AGTYPE(obj) == AGRAPH && g != agparent(obj)) {
        agerr(AGERR, "agdelete on wrong graph");
        return FAILURE;
     }
@@ -219,7 +219,7 @@ int agpopdisc(Agraph_t * g, Agcbdisc_t * cbd)
        if (stack_ent->f == cbd)
            g->clos->cb = stack_ent->prev;
        else {
-           while (stack_ent && (stack_ent->prev->f != cbd))
+           while (stack_ent && stack_ent->prev->f != cbd)
                stack_ent = stack_ent->prev;
            if (stack_ent && stack_ent->prev)
                stack_ent->prev = stack_ent->prev->prev;
@@ -245,9 +245,9 @@ int agcontains(Agraph_t* g, void* obj)
        } while ((subg = agparent (subg)));
        return 0;
     case AGNODE: 
-        return (agidnode(g, AGID(obj), 0) != 0);
+        return agidnode(g, AGID(obj), 0) != 0;
     default:
-        return (agsubedge(g, obj, 0) != 0);
+        return agsubedge(g, obj, 0) != 0;
     }
 }
 

diff --git a/lib/cgraph/write.c b/lib/cgraph/write.c
index 78455cefddbcbe1fb6f728dda826e63c4a15f738..29b5a8f4382fe55be3e18a7f1bcf9f555a5379ea 100644 (file)
--- a/lib/cgraph/write.c
+++ b/lib/cgraph/write.c
@@ -71,7 +71,7 @@ static char *_agstrcanon(char *arg, char *buf)
     p = buf;
     *p++ = '\"';
     uc = *(unsigned char *) s++;
-    maybe_num = isdigit(uc) || (uc == '.') || (uc == '-');
+    maybe_num = isdigit(uc) || uc == '.' || uc == '-';
     while (uc) {
        if (uc == '\"') {
            *p++ = '\\';
@@ -105,14 +105,14 @@ static char *_agstrcanon(char *arg, char *buf)
         * id char.
         */
        if (Max_outputline) {
-            if (uc && backslash_pending && !(is_id_char(p[-1]) || (p[-1] == '\\')) && is_id_char(uc)) {
+            if (uc && backslash_pending && !(is_id_char(p[-1]) || p[-1] == '\\') && is_id_char(uc)) {
                *p++ = '\\';
                *p++ = '\n';
                needs_quotes = true;
                backslash_pending = false;
                cnt = 0;
             } else if (uc && (cnt >= Max_outputline)) {
-               if (!(is_id_char(p[-1]) || (p[-1] == '\\')) && is_id_char(uc)) {
+               if (!(is_id_char(p[-1]) || p[-1] == '\\') && is_id_char(uc)) {
                    *p++ = '\\';
                    *p++ = '\n';
                    needs_quotes = true;
@@ -125,7 +125,7 @@ static char *_agstrcanon(char *arg, char *buf)
     }
     *p++ = '\"';
     *p = '\0';
-    if (needs_quotes || ((cnt == 1) && ((*arg == '.') || (*arg == '-'))))
+    if (needs_quotes || (cnt == 1 && (*arg == '.' || *arg == '-')))
        return buf;
 
     /* Use quotes to protect tokens (example, a node named "node") */
@@ -355,7 +355,7 @@ static bool irrelevant_subgraph(Agraph_t * g)
     dd = agdatadict(g, FALSE);
     if (!dd)
        return true;
-    if ((dtsize(dd->dict.n) > 0) || (dtsize(dd->dict.e) > 0))
+    if (dtsize(dd->dict.n) > 0 || dtsize(dd->dict.e) > 0)
        return false;
     return true;
 }
@@ -455,7 +455,7 @@ static int write_nondefault_attrs(void *obj, iochan_t * ofile,
     int cnt = 0;
     int rv;
 
-    if ((AGTYPE(obj) == AGINEDGE) || (AGTYPE(obj) == AGOUTEDGE)) {
+    if (AGTYPE(obj) == AGINEDGE || AGTYPE(obj) == AGOUTEDGE) {
        CHKRV(rv = write_edge_name(obj, ofile, FALSE));
        if (rv)
            cnt++;
@@ -464,10 +464,10 @@ static int write_nondefault_attrs(void *obj, iochan_t * ofile,
     g = agraphof(obj);
     if (data)
        for (sym = dtfirst(defdict); sym; sym = dtnext(defdict, sym)) {
-           if ((AGTYPE(obj) == AGINEDGE) || (AGTYPE(obj) == AGOUTEDGE)) {
-               if (Tailport && (sym->id == Tailport->id))
+           if (AGTYPE(obj) == AGINEDGE || AGTYPE(obj) == AGOUTEDGE) {
+               if (Tailport && sym->id == Tailport->id)
                    continue;
-               if (Headport && (sym->id == Headport->id))
+               if (Headport && sym->id == Headport->id)
                    continue;
            }
            if (data->str[sym->id] != sym->defval) {
@@ -659,7 +659,7 @@ int agwrite(Agraph_t * g, void *ofile)
     Level = 0;                 /* re-initialize tab level */
     if ((s = agget(g, "linelength")) && isdigit(*s)) {
        len = (int)strtol(s, (char **)NULL, 10);
-       if ((len == 0) || (len >= MIN_OUTPUTLINE))
+       if (len == 0 || len >= MIN_OUTPUTLINE)
            Max_outputline = len;
     }
     set_attrwf(g, true, false);

diff --git a/lib/mingle/edge_bundling.c b/lib/mingle/edge_bundling.c
index f0f2b709ee7d8a75506229958904d6ae3b6c786b..75c68ab020560f050bc8771078b7058efa842cf9 100644 (file)
--- a/lib/mingle/edge_bundling.c
+++ b/lib/mingle/edge_bundling.c
@@ -55,9 +55,9 @@ pedge pedge_new(int np, int dim, real *x){
   e->npoints = np;
   e->dim = dim;
   e->len = np;
-  e->x = MALLOC(dim*(e->len)*sizeof(real));
-  memcpy(e->x, x, dim*(e->len)*sizeof(real));
-  e->edge_length = dist(dim, &(x[0*dim]), &(x[(np-1)*dim]));
+  e->x = MALLOC(dim*e->len*sizeof(real));
+  memcpy(e->x, x, dim*e->len*sizeof(real));
+  e->edge_length = dist(dim, &x[0*dim], &x[(np-1)*dim]);
   e->wgt = 1.;
   e->wgts = NULL;
   return e;
@@ -71,9 +71,9 @@ pedge pedge_wgt_new(int np, int dim, real *x, real wgt){
   e->npoints = np;
   e->dim = dim;
   e->len = np;
-  e->x = MALLOC(dim*(e->len)*sizeof(real));
-  memcpy(e->x, x, dim*(e->len)*sizeof(real));
-  e->edge_length = dist(dim, &(x[0*dim]), &(x[(np-1)*dim]));
+  e->x = MALLOC(dim*e->len*sizeof(real));
+  memcpy(e->x, x, dim*e->len*sizeof(real));
+  e->edge_length = dist(dim, &x[0*dim], &x[(np-1)*dim]);
   e->wgt = wgt;
   e->wgts = MALLOC(sizeof(real)*(np - 1));
   for (i = 0; i < np - 1; i++) e->wgts[i] = wgt;
@@ -93,10 +93,10 @@ pedge pedge_flip(pedge e){
   int n = e->npoints;
 
   y = MALLOC(sizeof(real)*e->dim);
-  for (i = 0; i < (e->npoints)/2; i++){
-    memcpy(y, &(x[i*dim]), sizeof(real)*dim);
-    memcpy(&(x[(n-1-i)*dim]), &(x[i*dim]), sizeof(real)*dim);
-    memcpy(&(x[i*dim]), y, sizeof(real)*dim);
+  for (i = 0; i < e->npoints/2; i++){
+    memcpy(y, &x[i*dim], sizeof(real)*dim);
+    memcpy(&x[(n-1-i)*dim], &x[i*dim], sizeof(real)*dim);
+    memcpy(&x[i*dim], y, sizeof(real)*dim);
   }
   FREE(y);
   return e;
@@ -110,9 +110,9 @@ static real edge_compatibility(pedge e1, pedge e2){
   int dim = e1->dim, flipped = FALSE;
 
   u1 = e1->x;
-  v1 = (e1->x)+(e1->npoints)*dim-dim;
+  v1 = e1->x+e1->npoints*dim-dim;
   u2 = e2->x;
-  v2 = (e2->x)+(e2->npoints)*dim-dim;
+  v2 = e2->x+e2->npoints*dim-dim;
   dist1 = sqr_dist(dim, u1, u2) + sqr_dist(dim, v1, v2);
   dist2 =  sqr_dist(dim, u1, v2) + sqr_dist(dim, v1, u2);
   if (dist1 > dist2){
@@ -142,9 +142,9 @@ static real edge_compatibility_full(pedge e1, pedge e2){
   int dim = e1->dim, flipped = FALSE, i;
 
   u1 = e1->x;
-  v1 = (e1->x)+(e1->npoints)*dim-dim;
+  v1 = e1->x+e1->npoints*dim-dim;
   u2 = e2->x;
-  v2 = (e2->x)+(e2->npoints)*dim-dim;
+  v2 = e2->x+e2->npoints*dim-dim;
   dist1 = sqr_dist(dim, u1, u2) + sqr_dist(dim, v1, v2);
   dist2 =  sqr_dist(dim, u1, v2) + sqr_dist(dim, v1, u2);
   if (dist1 > dist2){
@@ -458,8 +458,8 @@ pedge pedge_double(pedge e){
     }
   }
   e->len = len;
-  np = e->npoints = 2*(e->npoints) - 1;
-  e->edge_length = dist(dim, &(x[0*dim]), &(x[(np-1)*dim]));
+  np = e->npoints = 2*e->npoints - 1;
+  e->edge_length = dist(dim, &x[0*dim], &x[(np-1)*dim]);
   
   return e;
 }
@@ -501,7 +501,7 @@ static void  edge_attraction_force(real similarity, pedge e1, pedge e2, real *fo
     s = edge_length;
     s = similarity*edge_length;
     for (i = 1; i <= np - 2; i++){
-      dist = sqr_dist(dim, &(x1[i*dim]), &(x2[i*dim]));
+      dist = sqr_dist(dim, &x1[i*dim], &x2[i*dim]);
       if (dist < SMALL) dist = SMALL;
       ss = s/(dist+0.1*edge_length*sqrt(dist));
       for (j = 0; j < dim; j++) force[i*dim + j] += ss*(x2[i*dim + j] - x1[i*dim + j]);
@@ -510,7 +510,7 @@ static void  edge_attraction_force(real similarity, pedge e1, pedge e2, real *fo
     s = -edge_length;
     s = -similarity*edge_length; 
     for (i = 1; i <= np - 2; i++){
-      dist = sqr_dist(dim, &(x1[i*dim]), &(x2[(np - 1 - i)*dim]));
+      dist = sqr_dist(dim, &x1[i*dim], &x2[(np - 1 - i)*dim]);
       if (dist < SMALL) dist = SMALL;
       ss = s/(dist+0.1*edge_length*sqrt(dist));
       for (j = 0; j < dim; j++) force[i*dim + j] += ss*(x2[(np - 1 - i)*dim + j] - x1[i*dim + j]);
@@ -533,8 +533,8 @@ static pedge* force_directed_edge_bundling(SparseMatrix A, pedge* edges, int max
   if (Verbose > 1)
     fprintf(stderr, "total interaction pairs = %d out of %d, avg neighbors per edge = %f\n",A->nz, A->m*A->m, A->nz/(real) A->m);
 
-  force_t = MALLOC(sizeof(real)*dim*(np));
-  force_a = MALLOC(sizeof(real)*dim*(np));
+  force_t = MALLOC(sizeof(real)*dim*np);
+  force_a = MALLOC(sizeof(real)*dim*np);
   while (step > 0.001 && iter < maxit){
     start = clock();
     iter++;
@@ -550,8 +550,8 @@ static pedge* force_directed_edge_bundling(SparseMatrix A, pedge* edges, int max
        e2 = edges[ja[j]];
        edge_attraction_force(a[j], e1, e2, force_a);
       }
-      fnorm_t = MAX(SMALL, norm(dim*(np - 2), &(force_t[1*dim])));
-      fnorm_a = MAX(SMALL, norm(dim*(np - 2), &(force_a[1*dim])));
+      fnorm_t = MAX(SMALL, norm(dim*(np - 2), &force_t[1*dim]));
+      fnorm_a = MAX(SMALL, norm(dim*(np - 2), &force_a[1*dim]));
       edge_length = e1->edge_length;
 
       for (j = 1; j <= np - 2; j++){
@@ -617,7 +617,7 @@ static pedge* modularity_ink_bundling(int dim, int ne, SparseMatrix B, pedge* ed
   clusterp = D->ia;
   clusters = D->ja;
   for (i = 0; i < nclusters; i++){
-    ink1 = ink(edges, clusterp[i+1] - clusterp[i], &(clusters[clusterp[i]]), &ink0, &meet1, &meet2, angle_param, angle);
+    ink1 = ink(edges, clusterp[i+1] - clusterp[i], &clusters[clusterp[i]], &ink0, &meet1, &meet2, angle_param, angle);
     if (Verbose > 1)
       fprintf(stderr,"nedges = %d ink0 = %f, ink1 = %f\n",clusterp[i+1] - clusterp[i], ink0, ink1);
     if (ink1 < ink0){
@@ -707,7 +707,7 @@ pedge* edge_bundling(SparseMatrix A0, int dim, real *x, int maxit_outer, real K,
   edges = MALLOC(sizeof(pedge)*ne);
 
   for (i = 0; i < ne; i++){
-    edges[i] = pedge_new(2, dim, &(x[dim*2*i]));
+    edges[i] = pedge_new(2, dim, &x[dim*2*i]);
   }
 
   A = SparseMatrix_symmetrize(A0, TRUE);