sparse: remove 'D' parameter from 'SparseMatrix_import_dot' that is always null

diff --git a/cmd/mingle/minglemain.cpp b/cmd/mingle/minglemain.cpp
index 345a6c731739319413fd2f686e1a1913b7404a00..c9f902bd820339b314a9b67e29159a2cbd82c404 100644 (file)
--- a/cmd/mingle/minglemain.cpp
+++ b/cmd/mingle/minglemain.cpp
@@ -393,7 +393,8 @@ bundle (Agraph_t* g, opts_t* opts)
                return 1;
        }
     initDotIO(g);
-       A = SparseMatrix_import_dot(g, dim, &label_sizes, &x, &n_edge_label_nodes, nullptr, FORMAT_CSR, nullptr);
+       A = SparseMatrix_import_dot(g, dim, &label_sizes, &x, &n_edge_label_nodes,
+                                   nullptr, FORMAT_CSR);
        if (!A){
                agerr (AGERR, "Error: could not convert graph %s (%s) into matrix\n", agnameof(g), fname);
                return 1;

diff --git a/lib/edgepaint/edge_distinct_coloring.c b/lib/edgepaint/edge_distinct_coloring.c
index 6ab87c6a1adf352673b093cc1d0ea522bf8cc27d..5226373699961404b784a67a4007491d4803990b 100644 (file)
--- a/lib/edgepaint/edge_distinct_coloring.c
+++ b/lib/edgepaint/edge_distinct_coloring.c
@@ -166,7 +166,7 @@ Agraph_t* edge_distinct_coloring(char *color_scheme, char *lightness, Agraph_t*
   char **xsplines = NULL;
   int cdim;
 
-  A = SparseMatrix_import_dot(g, dim, NULL, &x, NULL, NULL, FORMAT_COORD, NULL);
+  A = SparseMatrix_import_dot(g, dim, NULL, &x, NULL, NULL, FORMAT_COORD);
   if (!x){
     fprintf(stderr,"The gv file contains no or improper 2D coordinates\n");
     return NULL;

diff --git a/lib/sparse/DotIO.c b/lib/sparse/DotIO.c
index 34ec9535b7df747c6fea4dc058502f7811dfde36..d662bc4e00fb8ca312d8060fc626ccc04f4d7c0b 100644 (file)
--- a/lib/sparse/DotIO.c
+++ b/lib/sparse/DotIO.c
@@ -76,20 +76,20 @@ void attach_edge_colors(Agraph_t* g, int dim, double *colors){
  * Assumes g is connected and simple, i.e., we can have a->b and b->a
  * but not a->b and a->b
  */
-SparseMatrix 
-SparseMatrix_import_dot (Agraph_t* g, int dim, double **label_sizes, double **x, int *n_edge_label_nodes, int **edge_label_nodes, int format, SparseMatrix *D)
-{
+SparseMatrix SparseMatrix_import_dot(Agraph_t *g, int dim, double **label_sizes,
+                                     double **x, int *n_edge_label_nodes,
+                                     int **edge_label_nodes, int format) {
   SparseMatrix A = 0;
   Agnode_t* n;
   Agedge_t* e;
-  Agsym_t *sym, *symD = NULL;
+  Agsym_t *sym;
   Agsym_t *psym;
   int nnodes;
   int nedges;
   int i, row;
   int* I;
   int* J;
-  double *val, *valD = NULL;
+  double *val;
   double v;
   int type = MATRIX_TYPE_REAL;
   double padding = 10;
@@ -123,10 +123,6 @@ SparseMatrix_import_dot (Agraph_t* g, int dim, double **label_sizes, double **x,
   }
 
   sym = agattr(g, AGEDGE, "weight", NULL);
-  if (D) {
-    symD = agattr(g, AGEDGE, "len", NULL);
-    valD = N_NEW(nedges, double);
-  }
   i = 0;
   for (n = agfstnode (g); n; n = agnxtnode (g, n)) {
     if (edge_label_nodes && strncmp(agnameof(n), "|edgelabel|",11)==0) nedge_nodes++;
@@ -143,18 +139,6 @@ SparseMatrix_import_dot (Agraph_t* g, int dim, double **label_sizes, double **x,
       }
       val[i] = v;
 
-      /* edge length */
-      if (symD) {
-        if (sscanf (agxget (e, symD), "%lf", &v) != 1) {
-          v = 72;
-        } else {
-          v *= 72;/* len is specified in inch. Convert to points */
-        }
-       valD[i] = v;
-      } else if (valD) {
-        valD[i] = 72;
-      }
-
       i++;
     }
   }
@@ -251,15 +235,12 @@ SparseMatrix_import_dot (Agraph_t* g, int dim, double **label_sizes, double **x,
   if (format == FORMAT_CSR) A = SparseMatrix_from_coordinate_arrays(nedges, nnodes, nnodes, I, J, val, type, sz);
   if (edge_label_nodes) *n_edge_label_nodes = nedge_nodes;
 
-  if (D) *D = SparseMatrix_from_coordinate_arrays(nedges, nnodes, nnodes, I, J, valD, type, sz);
-
 done:
   if (format != FORMAT_COORD){
     free(I);
     free(J);
     free(val);
   }
-  free(valD);
 
   return A;
 }

diff --git a/lib/sparse/DotIO.h b/lib/sparse/DotIO.h
index f14a74d05876af12b3f2cfe44dff2676e0914a57..401a7e75e4b36385a0da6884d264aaca7a50a9dc 100644 (file)
--- a/lib/sparse/DotIO.h
+++ b/lib/sparse/DotIO.h
@@ -25,8 +25,11 @@ extern int getDotNodeID (Agnode_t* n);
 
 extern void attach_edge_colors(Agraph_t* g, int dim, double *colors);
 
-extern SparseMatrix SparseMatrix_import_dot(Agraph_t* g, int dim, double **label_sizes, double **x, int *n_edge_label_nodes,
-                                           int **edge_label_nodes, int format, SparseMatrix *D);
+extern SparseMatrix SparseMatrix_import_dot(Agraph_t *g, int dim,
+                                            double **label_sizes, double **x,
+                                            int *n_edge_label_nodes,
+                                            int **edge_label_nodes,
+                                            int format);
 char * hue2rgb(double hue, char *color);
 
 SparseMatrix Import_coord_clusters_from_dot(Agraph_t* g, int maxcluster, int dim, int *nn, double **label_sizes, double **x, int **clusters, float **rgb_r,  float **rgb_g,  float **rgb_b,  float **fsz, char ***labels, int default_color_scheme, int clustering_scheme, int useClusters);