graph fixes for -e mode

no graph gen, yes CSV checks
(plus path cleanup for Datacheck static functions)

Author: yakra

siteupdate/cplusplus/classes/Datacheck/Datacheck.cpp

@@ -1,4 +1,5 @@
 #include "Datacheck.h"
+#include "../Args/Args.h"
 #include "../ElapsedTime/ElapsedTime.h"
 #include "../ErrorList/ErrorList.h"
 #include "../Route/Route.h"
@@ -40,9 +41,9 @@ std::string Datacheck::str() const
 {	return route->root + ";" + label1 + ";" + label2 + ";" + label3 + ";" + code + ";" + info;
 }
 
-void Datacheck::read_fps(std::string& path, ErrorList &el)
+void Datacheck::read_fps(ErrorList &el)
 {	// read in the datacheck false positives list
-	std::ifstream file(path+"/datacheckfps.csv");
+	std::ifstream file(Args::datapath+"/datacheckfps.csv");
 	std::string line;
 	getline(file, line); // ignore header line
 	while (getline(file, line))
@@ -71,9 +72,9 @@ void Datacheck::read_fps(std::string& path, ErrorList &el)
 	file.close();
 }
 
-void Datacheck::mark_fps(std::string& path, ElapsedTime &et)
+void Datacheck::mark_fps(ElapsedTime &et)
 {	errors.sort();
-	std::ofstream fpfile(path+"/nearmatchfps.log");
+	std::ofstream fpfile(Args::logfilepath+"/nearmatchfps.log");
 	time_t timestamp = time(0);
 	fpfile << "Log file created at: " << ctime(&timestamp);
 	unsigned int counter = 0;
@@ -102,9 +103,9 @@ void Datacheck::mark_fps(std::string& path, ElapsedTime &et)
 	std::cout << et.et() << "Found " << Datacheck::errors.size() << " datacheck errors and matched " << fpcount << " FP entries." << std::endl;
 }
 
-void Datacheck::unmatchedfps_log(std::string& path)
+void Datacheck::unmatchedfps_log()
 {	// write log of unmatched false positives from datacheckfps.csv
-	std::ofstream fpfile(path+"/unmatchedfps.log");
+	std::ofstream fpfile(Args::logfilepath+"/unmatchedfps.log");
 	time_t timestamp = time(0);
 	fpfile << "Log file created at: " << ctime(&timestamp);
 	if (fps.empty()) fpfile << "No unmatched FP entries.\n";
@@ -115,8 +116,8 @@ void Datacheck::unmatchedfps_log(std::string& path)
 	fpfile.close();
 }
 
-void Datacheck::datacheck_log(std::string& path)
-{	std::ofstream logfile(path+"/datacheck.log");
+void Datacheck::datacheck_log()
+{	std::ofstream logfile(Args::logfilepath+"/datacheck.log");
 	time_t timestamp = time(0);
 	logfile << "Log file created at: " << ctime(&timestamp);
 	logfile << "Datacheck errors that have been flagged as false positives are not included.\n";

siteupdate/cplusplus/classes/Datacheck/Datacheck.h

@@ -74,10 +74,10 @@ class Datacheck
 
 	static std::list<Datacheck> errors;
 	static void add(Route*, std::string, std::string, std::string, std::string, std::string);
-	static void read_fps(std::string&, ErrorList &);
-	static void mark_fps(std::string&, ElapsedTime &);
-	static void unmatchedfps_log(std::string&);
-	static void datacheck_log(std::string&);
+	static void read_fps(ErrorList &);
+	static void mark_fps(ElapsedTime &);
+	static void unmatchedfps_log();
+	static void datacheck_log();
 
 	Datacheck(Route*, std::string, std::string, std::string, std::string, std::string);
 

siteupdate/cplusplus/classes/GraphGeneration/GraphListEntry.cpp

@@ -6,13 +6,6 @@
 std::vector<GraphListEntry> GraphListEntry::entries;
 size_t GraphListEntry::num; // iterator for entries
 
-// master graph constructor
-GraphListEntry::GraphListEntry(char f, unsigned int v, unsigned int e, unsigned int t):
-	root("tm-master"), descr("All Travel Mapping Data"),
-	vertices(v), edges(e), travelers(t),
-	form(f), cat('M') {}
-
-// subgraph constructor
 GraphListEntry::GraphListEntry(std::string r, std::string d, char f, char c, std::list<Region*> *rg, std::list<HighwaySystem*> *sys, PlaceRadius *pr):
 	regions(rg), systems(sys), placeradius(pr),
 	root(r), descr(d), form(f), cat(c) {}

siteupdate/cplusplus/classes/GraphGeneration/GraphListEntry.h

@@ -29,7 +29,6 @@ class GraphListEntry
 	static size_t num; // iterator for entries
 	std::string tag();
 
-	GraphListEntry(char, unsigned int, unsigned int, unsigned int); // < master graph ctor | v----- subgraph ctor -----v 
 	GraphListEntry(std::string, std::string, char, char, std::list<Region*>*, std::list<HighwaySystem*>*, PlaceRadius*);
 	static void add_group(std::string&&,  std::string&&,  char, std::list<Region*>*, std::list<HighwaySystem*>*, PlaceRadius*);
 };

siteupdate/cplusplus/classes/GraphGeneration/HighwayGraph.cpp

@@ -257,6 +257,10 @@ void HighwayGraph::write_master_graphs_tmg()
 	simplefile.close();
 	collapfile.close();
 	travelfile.close();
+	GraphListEntry* g = GraphListEntry::entries.data();
+	g[0].vertices = vertices.size(); g[0].edges = se; g[0].travelers = 0;
+	g[1].vertices = cv;		 g[1].edges = ce; g[1].travelers = 0;
+	g[2].vertices = tv;		 g[2].edges = te; g[2].travelers = TravelerList::allusers.size;
 }
 
 // write a subset of the data,
@@ -286,9 +290,9 @@ void HighwayGraph::write_subgraphs_tmg
 	}
       #ifdef threading_enabled
 	term->lock();
+      #endif
 	if (g->cat != g[-1].cat)
 		std::cout << '\n' << et->et() << "Writing " << g->category() << " graphs.\n";
-      #endif
 	std::cout << g->tag()
 		  << '(' << mv.size() << ',' << mse.size() << ") "
 		  << '(' << cv_count << ',' << mce.size() << ") "

siteupdate/cplusplus/functions/sql_file.cpp

@@ -425,16 +425,6 @@ void sqlfile1
 		delete[] systemupdate;
 	}
 	sqlfile << ";\n";
-	sqlfile.close();
-      #ifdef threading_enabled
-	term_mtx->lock();
-	std::cout << '\n' << et->et() << "Pause writing database file " << Args::databasename << ".sql.\n" << std::flush;
-	term_mtx->unlock();
-      #endif
-     }
-
-void sqlfile2(ElapsedTime *et, std::list<std::array<std::string,3>> *graph_types)
-{	std::ofstream sqlfile(Args::databasename+".sql", std::ios::app);
 
 	// datacheck errors into the db
       #ifndef threading_enabled
@@ -459,6 +449,16 @@ void sqlfile2(ElapsedTime *et, std::list<std::array<std::string,3>> *graph_types
 		}
 	}
 	sqlfile << ";\n";
+	sqlfile.close();
+      #ifdef threading_enabled
+	term_mtx->lock();
+	std::cout << '\n' << et->et() << "Pause writing database file " << Args::databasename << ".sql.\n" << std::flush;
+	term_mtx->unlock();
+      #endif
+     }
+
+void sqlfile2(ElapsedTime *et, std::list<std::array<std::string,3>> *graph_types)
+{	std::ofstream sqlfile(Args::databasename+".sql", std::ios::app);
 
 	// update graph info in DB if graphs were generated
 	if (!Args::skipgraphs)

siteupdate/cplusplus/siteupdate.cpp

@@ -175,7 +175,24 @@ int main(int argc, char *argv[])
 	#include "tasks/threaded/StatsCsv.cpp"
 
 	cout << et.et() << "Reading datacheckfps.csv." << endl;
-	Datacheck::read_fps(Args::datapath, el);
+	Datacheck::read_fps(el);
+	cout << et.et() << "Marking datacheck false positives." << flush;
+	Datacheck::mark_fps(et);
+	cout << et.et() << "Writing log of unmatched datacheck FP entries." << endl;
+	Datacheck::unmatchedfps_log();
+	cout << et.et() << "Writing datacheck.log" << endl;
+	Datacheck::datacheck_log();
+
+	cout << et.et() << "Reading subgraph descriptions and checking for errors." << endl;
+	#include "tasks/graph_setup.cpp"
+
+	// See if we have any errors that should be fatal to the site update process
+	if (el.error_list.size())
+	{	cout << et.et() << "ABORTING due to " << el.error_list.size() << " errors:" << endl;
+		for (unsigned int i = 0; i < el.error_list.size(); i++)
+			cout << i+1 << ": " << el.error_list[i] << endl;
+		return 1;
+	}
 
       #ifdef threading_enabled
 	thread sqlthread;
@@ -185,14 +202,10 @@ int main(int argc, char *argv[])
 	}
       #endif
 
-	#include "tasks/graph_generation.cpp"
-
-	cout << et.et() << "Marking datacheck false positives." << flush;
-	Datacheck::mark_fps(Args::logfilepath, et);
-	cout << et.et() << "Writing log of unmatched datacheck FP entries." << endl;
-	Datacheck::unmatchedfps_log(Args::logfilepath);
-	cout << et.et() << "Writing datacheck.log" << endl;
-	Datacheck::datacheck_log(Args::logfilepath);
+	if (!Args::skipgraphs && !Args::errorcheck)
+	{	// Build a graph structure out of all highway data in active and preview systems
+		#include "tasks/graph_generation.cpp"
+	} else	cout << et.et() << "SKIPPING generation of graphs." << endl;
 
 	if   (Args::errorcheck)
 		cout << et.et() << "SKIPPING database file." << endl;
@@ -207,14 +220,6 @@ int main(int argc, char *argv[])
 		sqlfile2(&et, &graph_types);
 	     }
 
-	// See if we have any errors that should be fatal to the site update process
-	if (el.error_list.size())
-	{	cout << et.et() << "ABORTING due to " << el.error_list.size() << " errors:" << endl;
-		for (unsigned int i = 0; i < el.error_list.size(); i++)
-			cout << i+1 << ": " << el.error_list[i] << endl;
-		return 1;
-	}
-
 	// print some statistics
 	cout << et.et() << "Processed " << HighwaySystem::syslist.size << " highway systems." << endl;
 	unsigned int routes = 0;

siteupdate/cplusplus/tasks/graph_generation.cpp

@@ -1,5 +1,3 @@
-// Build a graph structure out of all highway data in active and
-// preview systems
 cout << et.et() << "Setting up for graphs of highway data." << endl;
 HighwayGraph graph_data(all_waypoints, et);
 
@@ -10,19 +8,8 @@ for (string& line : graph_data.waypoint_naming_log)
 wslogfile.close();
 graph_data.waypoint_naming_log.clear();
 
-// create list of graph information for the DB
-list<array<string,3>> graph_types;
-
 // start generating graphs and making entries for graph DB table
-if (Args::skipgraphs || Args::errorcheck)
-	cout << et.et() << "SKIPPING generation of subgraphs." << endl;
-else {	list<Region*> *regions;
-	list<HighwaySystem*> *systems;
-	GraphListEntry::entries.emplace_back('s', graph_data.vertices.size(), graph_data.se, 0);
-	GraphListEntry::entries.emplace_back('c', graph_data.cv, graph_data.ce, 0);
-	GraphListEntry::entries.emplace_back('t', graph_data.tv, graph_data.te, TravelerList::allusers.size);
-	graph_types.push_back({"master", "All Travel Mapping Data",
-				"These graphs contain all routes currently plotted in the Travel Mapping project."});
+{	// Let's keep these braces here, for easily commenting out subgraph generation when developing waypoint simplification routines
 	GraphListEntry::num = 3;
 
 	cout << et.et() << "Writing master TM graph files." << endl;
@@ -31,30 +18,21 @@ else {	list<Region*> *regions;
 	std::cout << "Collapsed graph has " << graph_data.cv << " vertices, " << graph_data.ce << " edges." << std::endl;
 	std::cout << " Traveled graph has " << graph_data.tv << " vertices, " << graph_data.te << " edges." << std::endl;
 
-      #ifndef threading_enabled
-	graph_data.write_master_graphs_tmg();
-      #else
-	cout << et.et() << "Setting up subgraphs." << endl;
-      #endif
-	HighwaySystem *h, *const sys_end = HighwaySystem::syslist.end();
-	#include "subgraphs/continent.cpp"
-	#include "subgraphs/multisystem.cpp"
-	#include "subgraphs/system.cpp"
-	#include "subgraphs/country.cpp"
-	#include "subgraphs/multiregion.cpp"
-	#include "subgraphs/fullcustom.cpp"
-	#include "subgraphs/region.cpp"
-	#include "subgraphs/area.cpp"
-      #ifdef threading_enabled
 	// write graph vector entries to disk
+      #ifdef threading_enabled
 	thr[0] = thread(MasterTmgThread, &graph_data, &list_mtx, &term_mtx, &all_waypoints, &et);
 	// start at t=1, because MasterTmgThread will spawn another SubgraphThread when finished
 	for (unsigned int t = 1; t < thr.size(); t++)
 	  thr[t] = thread(SubgraphThread, t, &list_mtx, &term_mtx, &graph_data, &all_waypoints, &et);
 	THREADLOOP thr[t].join();
-	cout << '!' << endl;
+      #else
+	for (	graph_data.write_master_graphs_tmg();
+		GraphListEntry::num < GraphListEntry::entries.size();
+		GraphListEntry::num += 3
+	    )	graph_data.write_subgraphs_tmg(GraphListEntry::num, 0, &all_waypoints, &et, &term_mtx);
       #endif
-     }
+	cout << '!' << endl;
+} //*/
 
 cout << et.et() << "Clearing HighwayGraph contents from memory." << endl;
 graph_data.clear();

siteupdate/cplusplus/tasks/graph_setup.cpp

@@ -0,0 +1,15 @@
+list<Region*> *regions;
+list<HighwaySystem*> *systems;
+list<array<string,3>> graph_types; // create list of graph information for the DB
+graph_types.push_back({"master", "All Travel Mapping Data",
+			"These graphs contain all routes currently plotted in the Travel Mapping project."});
+GraphListEntry::add_group("tm-master", "All Travel Mapping Data", 'M', nullptr, nullptr, nullptr);
+HighwaySystem *h, *const sys_end = HighwaySystem::syslist.end();
+#include "subgraphs/continent.cpp"
+#include "subgraphs/multisystem.cpp"
+#include "subgraphs/system.cpp"
+#include "subgraphs/country.cpp"
+#include "subgraphs/multiregion.cpp"
+#include "subgraphs/fullcustom.cpp"
+#include "subgraphs/region.cpp"
+#include "subgraphs/area.cpp"

siteupdate/cplusplus/tasks/subgraphs/area.cpp

@@ -1,11 +1,7 @@
 // graphs restricted by place/area - from areagraphs.csv file
-#ifndef threading_enabled
-cout << et.et() << "Creating area data graphs." << endl;
-#endif
 file.open(Args::datapath+"/graphs/areagraphs.csv");
 getline(file, line);  // ignore header line
 
-// add entries to graph vector
 while (getline(file, line))
 {	if (line.empty()) continue;
 	vector<char*> fields;
@@ -44,13 +40,5 @@ while (getline(file, line))
 	delete[] cline;
 }
 file.close();
-#ifndef threading_enabled
-// write new graph vector entries to disk
-while (GraphListEntry::num < GraphListEntry::entries.size())
-{	graph_data.write_subgraphs_tmg(GraphListEntry::num, 0, &all_waypoints, &et, &term_mtx);
-	GraphListEntry::num += 3;
-}
-cout << '!' << endl;
-#endif
 graph_types.push_back({"area", "Routes Within a Given Radius of a Place",
 		       "These graphs contain all routes currently plotted within the given distance radius of the given place."});