remove some commented out code

diff --git a/lib/cgraph/attr.c b/lib/cgraph/attr.c
index 16c3edad5ae4ebe3e1ef48209a7167b246d152f2..8436b87cc773e91186f73054e852d2dccf583af9 100644 (file)
--- a/lib/cgraph/attr.c
+++ b/lib/cgraph/attr.c
@@ -246,7 +246,6 @@ static void addattr(Agraph_t * g, Agobj_t * obj, Agsym_t * sym)
                                                     ((size_t) sym->id +
                                                      1) * sizeof(char *));
     attr->str[sym->id] = agstrdup(g, sym->defval);
-    /* agmethod_upd(g,obj,sym);  JCE and GN didn't like this. */
 }
 
 

diff --git a/lib/cgraph/graph.c b/lib/cgraph/graph.c
index bc4388d83e1b0c10c919094eb39e5f6f1b6e1d2d..a094acd8fcbdb166a3000bc88961c3da6b796dee 100644 (file)
--- a/lib/cgraph/graph.c
+++ b/lib/cgraph/graph.c
@@ -54,7 +54,6 @@ Agraph_t *agopen(char *name, Agdesc_t desc, Agdisc_t * arg_disc)
     g->clos->state.id = g->clos->disc.id->open(g, arg_disc);
     if (agmapnametoid(g, AGRAPH, name, &gid, TRUE))
        AGID(g) = gid;
-    /* else AGID(g) = 0 because we have no alternatives */
     g = agopen1(g);
     agregister(g, AGRAPH, g);
     return g;
@@ -77,7 +76,7 @@ Agraph_t *agopen1(Agraph_t * g)
     if (par) {
        AGSEQ(g) = agnextseq(par, AGRAPH);
        dtinsert(par->g_dict, g);
-    }                          /* else AGSEQ=0 */
+    }
     if (!par || par->desc.has_attrs)
        agraphattr_init(g);
     agmethod_init(g, g);

diff --git a/lib/cgraph/io.c b/lib/cgraph/io.c
index c9ea0f30dad76cac762a45cbbc6f3d1fa2b66488..2d1494f1daf24e70ca0da9c91b03596a18f6d25f 100644 (file)
--- a/lib/cgraph/io.c
+++ b/lib/cgraph/io.c
@@ -20,8 +20,6 @@ static int iofread(void *chan, char *buf, int bufsize)
        return strlen(buf);
     else
        return 0;
-    /* return read(fileno((FILE *) chan), buf, bufsize); */
-    /* return fread(buf, 1, bufsize, (FILE*)chan); */
 }
 
 /* default IO methods */

diff --git a/lib/mingle/agglomerative_bundling.c b/lib/mingle/agglomerative_bundling.c
index 499a9bf37520247a62dfec2de5ecb855a50ae4cb..1ab241438b08aa028467c3a48c3d547948fa799a 100644 (file)
--- a/lib/mingle/agglomerative_bundling.c
+++ b/lib/mingle/agglomerative_bundling.c
@@ -86,7 +86,6 @@ static Agglomerative_Ink_Bundling Agglomerative_Ink_Bundling_establish(Agglomera
   SparseMatrix A = grid->A;
   int n = grid->n, level = grid->level, nc = 0;
   int *ia = A->ia, *ja = A->ja;
-  // real *a;
   int i, j, k, jj, jc, jmax, ni, nj, npicks;
   int *mask;
   pedge *edges = grid->edges;
@@ -115,7 +114,6 @@ static Agglomerative_Ink_Bundling Agglomerative_Ink_Bundling_establish(Agglomera
   assert(n == A->n);
   for (i = 0; i < n; i++) matching[i] = UNMATCHED;
 
-  //  a = (real*) A->a;
   for (i = 0; i < n; i++){
     if (matching[i] != UNMATCHED) continue;
 
@@ -442,8 +440,6 @@ static pedge* agglomerative_ink_bundling_internal(int dim, SparseMatrix A, pedge
       xx[i*4 + 2] = meet2.x;
       xx[i*4 + 3] = meet2.y;
       mid_edges[i] = pedge_wgt_new(2, dim, &(xx[i*4]), wgt);
-      //mid_edges[i] = pedge_wgt_new(2, dim, &(xx[i*4]), 1.);
-
     }
 
     A_mid = nearest_neighbor_graph(ne, MIN(nneighbors, ne), xx, eps);
@@ -488,7 +484,6 @@ static pedge* agglomerative_ink_bundling_internal(int dim, SparseMatrix A, pedge
        nedges_global = grid->n;
        edges_global = edges;
        drawScene();
-       //      waitie(5./R->m);
       }
 #endif
     }
@@ -503,7 +498,6 @@ static pedge* agglomerative_ink_bundling_internal(int dim, SparseMatrix A, pedge
     nedges_global = grid->n;
     edges_global = edges;
     drawScene();
-    //      waitie(5./R->m);
   }
 #endif
 
@@ -526,4 +520,3 @@ pedge* agglomerative_ink_bundling(int dim, SparseMatrix A, pedge* edges, int nne
     fprintf(stderr,"initial total ink = %f, final total ink = %f, inksaving = %f percent, total ink_calc = %f, avg ink_calc per edge = %f\n", ink0, current_ink, (ink0-current_ink)/ink0, ink_count,  ink_count/(real) A->m);
   return edges2;
 }
-

diff --git a/lib/mingle/edge_bundling.c b/lib/mingle/edge_bundling.c
index cf84095925f5b18378159f7cb77588bb13f38fb1..f0f2b709ee7d8a75506229958904d6ae3b6c786b 100644 (file)
--- a/lib/mingle/edge_bundling.c
+++ b/lib/mingle/edge_bundling.c
@@ -124,7 +124,6 @@ static real edge_compatibility(pedge e1, pedge e2){
   }
   len1 = dist(dim, u1, v1);
   len2 = dist(dim, u2, v2);
-  //dist1 = MAX(0.1, dist1/(len1+len2+dist1));
   dist1 = MAX(0.1, dist1/(len1+len2+0.0001*dist1));
   if (flipped){
     return -1/dist1; 
@@ -167,7 +166,6 @@ static real edge_compatibility_full(pedge e1, pedge e2){
   assert(ca > -0.001);
 
   /* scale compatibility */
-  //cs = 2/(len1/len2+len2/len1);
   cs = 2/(MAX(len1,len2)/len + len/MIN(len1, len2));
   assert(cs > -0.001 && cs < 1.001);
  
@@ -183,7 +181,6 @@ static real edge_compatibility_full(pedge e1, pedge e2){
 
   /* visibility compatibility */
 
-  //dist1 = MAX(0.1, dist1/(len1+len2+dist1));
   dist1 = cp*ca*cs;
   if (flipped){
     return -dist1; 
@@ -223,8 +220,6 @@ void pedge_export_gv(FILE *fp, int ne, pedge *edges){
   int i, j, k, kk, dim, sta, sto;
   real maxwgt = 0, len, len_total, len_total0;
   int r, g, b;
-  //  real tt1[3]={0.25,0.5,0.75};
-  //  real tt2[4]={0.2,0.4,0.6,0.8};
   real tt1[3]={0.15,0.5,0.85};
   real tt2[4]={0.15,0.4,0.6,0.85};
   real *tt;
@@ -284,7 +279,6 @@ void pedge_export_gv(FILE *fp, int ne, pedge *edges){
          tt = tt1;
        }
        for (kk = 1; kk <= mm; kk++){
-         //t = kk/(real) (mm+1);
          t = tt[kk-1];
          for (k = 0; k < dim; k++) {
            if (k != 0) fprintf(fp,",");
@@ -443,7 +437,6 @@ pedge pedge_double(pedge e){
   int j, ii, ii2, np;
 
   assert(npoints >= 2);
-  //  pedge_print("before doubling edge = ", e);
   if (npoints*2-1 > len){
     len = 3*npoints;
     e->x = REALLOC(e->x, dim*len*sizeof(real));
@@ -468,8 +461,6 @@ pedge pedge_double(pedge e){
   np = e->npoints = 2*(e->npoints) - 1;
   e->edge_length = dist(dim, &(x[0*dim]), &(x[(np-1)*dim]));
   
-  //pedge_print("after doubling edge = ", e);
-  
   return e;
 }
 
@@ -478,50 +469,19 @@ static void edge_tension_force(real *force, pedge e){
   int dim = e->dim;
   int np = e->npoints;
   int i, left, right, j;
-  //real dist_left, dist_right;
   real s;
 
-
   /* tention force = ((np-1)*||2x-xleft-xright||)/||e||, so the force is norminal and unitless
   */
-  //s =  (np-1)*(np-1)/MAX(SMALL, e->edge_length);
   s =  (np-1)/MAX(SMALL, e->edge_length);
   for (i = 1; i <= np - 2; i++){
     left = i - 1;
     right = i + 1;
-    // dist_left = dist(dim, &(x[i*dim]), &(x[left*dim]));
-    // dist_right = dist(dim, &(x[i*dim]), &(x[right*dim]));
     for (j = 0; j < dim; j++) force[i*dim + j] += s*(x[left*dim + j] - x[i*dim + j]);
     for (j = 0; j < dim; j++) force[i*dim + j] += s*(x[right*dim + j] - x[i*dim + j]);
   }
 }
 
-
-#if 0
-static void edge_tension_force2(real *force, pedge e){
-  /* in this version each node is pulled towards its original position on the line */
-  real *x = e->x;
-  int dim = e->dim;
-  int np = e->npoints;
-  int i, j;
-  //int left, right;
-  //real dist_left, dist_right;
-  real s;
-
-
-  /* tention force = ((np-1)*||2x-xleft-xright||)/||e||, so the force is norminal and unitless
-  */
-  s = .1/MAX(SMALL, e->edge_length);
-  for (i = 1; i <= np - 2; i++){
-    //left = i - 1;
-    //    right = i + 1;
-    // dist_left = dist(dim, &(x[i*dim]), &(x[left*dim]));
-    // dist_right = dist(dim, &(x[i*dim]), &(x[right*dim]));
-    for (j = 0; j < dim; j++) force[i*dim + j] += s*((i*x[0*dim + j]+(np-1-i)*x[(np-1)*dim + j])/(np-1) - x[i*dim + j]);
-  }
-}
-#endif
-
 static void  edge_attraction_force(real similarity, pedge e1, pedge e2, real *force){
   /* attrractive force from x2 applied to x1 */
   real *x1 = e1->x, *x2 = e2->x;
@@ -585,7 +545,6 @@ static pedge* force_directed_edge_bundling(SparseMatrix A, pedge* edges, int max
       }
       e1 = edges[i];
       x = e1->x;
-      //edge_tension_force2(force_t, e1);
       edge_tension_force(force_t, e1);
       for (j = ia[i]; j < ia[i+1]; j++){
        e2 = edges[ja[j]];
@@ -595,26 +554,11 @@ static pedge* force_directed_edge_bundling(SparseMatrix A, pedge* edges, int max
       fnorm_a = MAX(SMALL, norm(dim*(np - 2), &(force_a[1*dim])));
       edge_length = e1->edge_length;
 
-      //      fprintf(stderr,"tension force norm = %f att force norm = %f step = %f edge_length = %f\n",fnorm_t, fnorm_a, step, edge_length);
       for (j = 1; j <= np - 2; j++){
        for (k = 0; k < dim; k++) {
          x[j*dim + k] += step*edge_length*(force_t[j*dim+k] + K*force_a[j*dim+k])/(sqrt(fnorm_t*fnorm_t + K*K*fnorm_a*fnorm_a));
        }
       }
-
-      /*
-      fprintf(stderr,"edge %d",i);
-      for (j = 0; j < np; j++){
-       if (j != 0) fprintf(stderr,",");
-       fprintf(stderr,"{");
-       for (k = 0; k < dim; k++) {
-         if (k != 0) fprintf(stderr,",");
-         fprintf(stderr,"%f", x[j*dim+k]);
-       }
-       fprintf(stderr,"}");
-      }
-      fprintf(stderr,"\n");
-      */
       
     }
     step = step*0.9;
@@ -646,8 +590,6 @@ static pedge* modularity_ink_bundling(int dim, int ne, SparseMatrix B, pedge* ed
   int i, j, jj;
   int use_value_for_clustering = TRUE;
 
-  //int use_value_for_clustering = FALSE;
-
   SparseMatrix BB;
 
   /* B may contain negative entries */
@@ -710,7 +652,6 @@ static SparseMatrix check_compatibility(SparseMatrix A, int ne, pedge *edges, in
 
   B = SparseMatrix_new(1, 1, 1, MATRIX_TYPE_REAL, FORMAT_COORD);
   ia = A->ia; ja = A->ja;
-  //SparseMatrix_print("A",A);
   start = clock();
   for (i = 0; i < ne; i++){
     for (j = ia[i]; j < ia[i+1]; j++){
@@ -721,13 +662,6 @@ static SparseMatrix check_compatibility(SparseMatrix A, int ne, pedge *edges, in
       } else if (compatibility_method == COMPATIBILITY_FULL){
        dist = edge_compatibility(edges[i], edges[jj]);
       } 
-      /*
-      fprintf(stderr,"edge %d = {",i);
-      pedge_print("", edges[i]);
-      fprintf(stderr,"edge %d = {",jj);
-      pedge_print("", edges[jj]);
-      fprintf(stderr,"compatibility=%f\n",dist);
-      */
 
       if (fabs(dist) > tol){
        B = SparseMatrix_coordinate_form_add_entries(B, 1, &i, &jj, &dist);
@@ -736,7 +670,6 @@ static SparseMatrix check_compatibility(SparseMatrix A, int ne, pedge *edges, in
     }
   }
   C = SparseMatrix_from_coordinate_format(B);
-  //SparseMatrix_print("C",C);
   SparseMatrix_delete(B);
   B = C;
   if (Verbose > 1)

diff --git a/lib/mingle/ink.c b/lib/mingle/ink.c
index df2f14c8a558590104d6e9fa4ec925a66c98f83d..1f9a07c52b95c297702fd002128b235f1dc65996 100644 (file)
--- a/lib/mingle/ink.c
+++ b/lib/mingle/ink.c
@@ -214,19 +214,10 @@ static double project_to_line(point_t pt, point_t left, point_t right, real angl
   if (alpha == M_PI/2){
     return ccord;
   } else {
-    //    assert(dnorm >= MIN(-1.e-5, -1.e-5*bnorm));
     return ccord + sqrt(MAX(0, dnorm))/tan(alpha);
   }
 }
 
-
-
-
-
-
-
-
-
 /* ink:
  * Compute minimal ink used the input edges are bundled.
  * Assumes tails all occur on one side and heads on the other.
@@ -240,12 +231,10 @@ double ink(pedge* edges, int numEdges, int *pick, double *ink0, point_t *meet1,
   point_t* sources = N_NEW(numEdges, point_t);
   point_t* targets = N_NEW(numEdges, point_t);
   double inkUsed;
-  //double eps = 1.0e-2;
   double eps = 1.0e-2;
   double cend = 0, cbegin = 0;
   double wgt = 0;
 
-  //  fprintf(stderr,"in ink code ========\n");
   ink_count += numEdges;
 
   *ink0 = 0;
@@ -269,8 +258,6 @@ double ink(pedge* edges, int numEdges, int *pick, double *ink0, point_t *meet1,
     begin = addPoint (begin, scalePoint(sources[i], e->wgt));
     end = addPoint (end, scalePoint(targets[i], e->wgt));
     wgt += e->wgt;
-    //fprintf(stderr,"source={%f,%f}, target = {%f,%f}\n",sources[i].x, sources[i].y,
-    //targets[i].x, targets[i].y);
   }
 
   begin = scalePoint (begin, 1.0/wgt);
@@ -280,7 +267,6 @@ double ink(pedge* edges, int numEdges, int *pick, double *ink0, point_t *meet1,
   if (numEdges == 1){
     *meet1 = begin;
     *meet2 = end;
-    //fprintf(stderr,"ink used = %f\n",*ink0);
       free (sources);
       free (targets);
       return *ink0;
@@ -329,20 +315,13 @@ double ink(pedge* edges, int numEdges, int *pick, double *ink0, point_t *meet1,
 
   inkUsed = (bestInk (sources, numEdges, begin, mid, eps, meet1, angle_param)
             + bestInk (targets, numEdges, end, mid, eps, meet2, angle_param));
-  //fprintf(stderr,"beg={%f,%f}, meet1={%f,%f}, meet2={%f,%f}, mid={%f,%f}, end={%f,%f}\n",begin.x, begin.y, meet1->x, meet1->y, meet2->x, meet2->y,
-  //mid.x, mid.y, end.x, end.y);
 
-  //fprintf(stderr,"ink used = %f\n",inkUsed);
-  //  fprintf(stderr,"{cb,ce}={%f, %f} end={%f,%f}, meet={%f,%f}, mid={%f,%f}\n",cbegin, cend, end.x, end.y, meet2->x, meet2->y, mid.x, mid.y);
   free (sources);
   free (targets);
   return inkUsed;
 }
 
-
 double ink1(pedge e){
-
-
   real *x, xx, yy;
 
   real ink0 = 0;

diff --git a/lib/pack/pack.c b/lib/pack/pack.c
index baf4fe067e978b40eba2cf9739f445d196885bb9..319d96addee7a0ad09388fb0f3bb848d8a54f121 100644 (file)
--- a/lib/pack/pack.c
+++ b/lib/pack/pack.c
@@ -583,13 +583,6 @@ static int acmpf(const void *X, const void *Y)
 {
     const ainfo* x = *(ainfo *const *) X;
     const ainfo* y = *(ainfo *const *) Y;
-#if 0
-    if (x->height < y->height) return 1;
-    else if (x->height > y->height) return -1;
-    else if (x->width < y->width) return 1;
-    else if (x->width > y->width) return -1;
-    else return 0;
-#endif
     double dX = x->height + x->width; 
     double dY = y->height + y->width; 
     if (dX < dY) return 1;
@@ -1309,12 +1302,6 @@ parsePackModeInfo(char* p, pack_mode dflt, pack_info* pinfo)
                    pinfo->aspect = 1;
            }
            break;
-#ifdef NOT_IMPLEMENTED
-       case 'b':
-           if (streq(p, "bisect"))
-               pinfo->mode = l_bisect;
-           break;
-#endif
        case 'c':
            if (streq(p, "cluster"))
                pinfo->mode = l_clust;
@@ -1323,22 +1310,10 @@ parsePackModeInfo(char* p, pack_mode dflt, pack_info* pinfo)
            if (streq(p, "graph"))
                pinfo->mode = l_graph;
            break;
-#ifdef NOT_IMPLEMENTED
-       case 'h':
-           if (streq(p, "hull"))
-               pinfo->mode = l_hull;
-           break;
-#endif
        case 'n':
            if (streq(p, "node"))
                pinfo->mode = l_node;
            break;
-#ifdef NOT_IMPLEMENTED
-       case 't':
-           if (streq(p, "tile"))
-               pinfo->mode = l_tile;
-           break;
-#endif
        }
     }
 
@@ -1406,5 +1381,3 @@ getPackInfo(Agraph_t * g, pack_mode dflt, int dfltMargin, pack_info* pinfo)
 
     return pinfo->mode;
 }
-
-

diff --git a/lib/pack/ptest.c b/lib/pack/ptest.c
index 98a87ea5541888603cc0daac18435df818ea9450..d7dec6e76157923f4292fddf1bf258ef72d5f260 100644 (file)
--- a/lib/pack/ptest.c
+++ b/lib/pack/ptest.c
@@ -340,7 +340,6 @@ main(int argc, char *argv[])
                ptest_initGraph(g);
            }
            initPos(g);
-           /* if (Verbose) dumpG (g); */
            gs[cnt++] = g;
        }
        if (single) {