Add connected components for archive graphs.

Author: jteresco

ArchiveGraphs/archivegraphs.c

@@ -26,6 +26,7 @@
 #include <unistd.h>
 
 #include "tmggraph.h"
+#include "tmg_conn.h"
 #include "tmg_graph_intersections_only.h"
 #include "tmg_stats.h"
 
@@ -97,12 +98,18 @@ int process_one_graph(tmg_graph *g, char *filename, char *descr,
   double aspect_ratio =
     tmg_distance_latlng(&center_west, &center_east) /
     tmg_distance_latlng(&center_north, &center_south);
+
+  // connectivity
+  int num_parts;
+  int *part_sizes;
+  tmg_conn(g, &num_parts, &part_sizes);
+  free(part_sizes);
 
   sprintf(tmg_filename, "%s.tmg", filename);
-  fprintf(sqlfp, "('%s','%s','%d','%d','%d','%s','%s','%s','%d','%.4f','%4f')\n",
+  fprintf(sqlfp, "('%s','%s','%d','%d','%d','%s','%s','%s','%d','%.4f','%4f','%d')\n",
 	  tmg_filename, descr, g->num_vertices, g->num_edges, g->num_travelers,
 	  tmg_format_names[g->format], category, archive_name,
-	  vs.highest_degree, vs.average_degree, aspect_ratio);
+	  vs.highest_degree, vs.average_degree, aspect_ratio, num_parts);
   return 0;
 }
 

ArchiveGraphs/create_ag_tables.sql

@@ -1,4 +1,4 @@
 DROP TABLE IF EXISTS graphArchives;
 DROP TABLE IF EXISTS graphArchiveSets;
 CREATE TABLE graphArchiveSets (setName VARCHAR(16), descr VARCHAR(100), dateStamp DATE, hwyDataVers VARCHAR(41), userDataVers VARCHAR(41), dataProcVers VARCHAR(41), PRIMARY KEY(setName));
-CREATE TABLE graphArchives (filename VARCHAR(32), descr VARCHAR(100), vertices INTEGER, edges INTEGER, travelers INTEGER, format VARCHAR(10), category VARCHAR(12), setName VARCHAR(16), maxDegree INTEGER, avgDegree FLOAT, aspectRatio FLOAT, FOREIGN KEY (category) REFERENCES graphTypes(category), FOREIGN KEY (setName) REFERENCES graphArchiveSets(setName));
+CREATE TABLE graphArchives (filename VARCHAR(32), descr VARCHAR(100), vertices INTEGER, edges INTEGER, travelers INTEGER, format VARCHAR(10), category VARCHAR(12), setName VARCHAR(16), maxDegree INTEGER, avgDegree FLOAT, aspectRatio FLOAT, components INTEGER, FOREIGN KEY (category) REFERENCES graphTypes(category), FOREIGN KEY (setName) REFERENCES graphArchiveSets(setName));