range for loop cleanup

 * Retrieve elements by value rather than reference. Same principle as in #270, just without the big speed increase. Best practice nonetheless.

 * Convert traditional for loops to range for loops where possible, for cleaner more concise code.

Author: yakra

siteupdate/cplusplus/classes/GraphGeneration/HighwayGraph.cpp

@@ -96,7 +96,7 @@ class HighwayGraph
 		// compress edges adjacent to hidden vertices
 		counter = 0;
 		std::cout << et.et() + "Compressing collapsed edges" << std::flush;
-		for (std::pair<const Waypoint*, HGVertex*> wv : vertices)
+		for (std::pair<Waypoint* const, HGVertex*>& wv : vertices)
 		{	if (counter % 10000 == 0) std::cout << '.' << std::flush;
 			counter++;
 			if (!wv.second->visibility)
@@ -146,7 +146,7 @@ class HighwayGraph
 	} // end ctor
 
 	void clear()
-	{	for (std::pair<const Waypoint*, HGVertex*> wv : vertices) delete wv.second;
+	{	for (std::pair<Waypoint* const, HGVertex*>& wv : vertices) delete wv.second;
 		vertex_names.clear();
 		waypoint_naming_log.clear();
 		vertices.clear();

siteupdate/cplusplus/classes/HighwaySegment/HighwaySegment.cpp

@@ -49,19 +49,15 @@ unsigned int HighwaySegment::index()
 /*std::string HighwaySegment::concurrent_travelers_sanity_check()
 {	if (route->system->devel()) return "";
 	if (concurrent)
-	  for (HighwaySegment *conc : *concurrent)
-	  {	if (clinched_by.size() != conc->clinched_by.size())
-		{	if (conc->route->system->devel()) continue;
+	  for (HighwaySegment *other : *concurrent)
+	  {	if (clinched_by.size() != other->clinched_by.size())
+		{	if (other->route->system->devel()) continue;
 			return "[" + str() + "] clinched by " + std::to_string(clinched_by.size()) + " travelers; [" \
-			     + conc->str() + "] clinched by " + std::to_string(conc->clinched_by.size()) + '\n';
+			     + other->str() + "] clinched by " + std::to_string(other->clinched_by.size()) + '\n';
 		}
 		else	for (TravelerList *t : clinched_by)
-			{	std::list<TravelerList*>::iterator ct;
-				for (ct = conc->clinched_by.begin(); ct != conc->clinched_by.end(); ct++)
-				  if (*ct == t) break;
-				if (ct == conc->clinched_by.end())
-				  return t->traveler_name + " has clinched [" + str() + "], but not [" + conc->str() + "]\n";
-			}
+			  if (other->clinched_by.find(t) == other->clinched_by.end())
+			    return t->traveler_name + " has clinched [" + str() + "], but not [" + other->str() + "]\n";
 	  }
 	return "";
 }//*/

siteupdate/cplusplus/classes/HighwaySystem.cpp

@@ -128,7 +128,7 @@ class HighwaySystem
 	/* Return total system mileage across all regions */
 	double total_mileage()
 	{	double mi = 0;
-		for (std::pair<Region*, double> rm : mileage_by_region) mi += rm.second;
+		for (std::pair<Region* const, double>& rm : mileage_by_region) mi += rm.second;
 		return mi;
 	}
 

siteupdate/cplusplus/classes/Region.cpp

@@ -1,6 +1,6 @@
 std::pair<std::string, std::string> *country_or_continent_by_code(std::string code, std::vector<std::pair<std::string, std::string>> &pair_vector)
-{	for (std::vector<std::pair<std::string, std::string>>::iterator c = pair_vector.begin(); c != pair_vector.end(); c++)
-		if (c->first == code) return &*c;
+{	for (std::pair<std::string, std::string>& c : pair_vector)
+		if (c.first == code) return &c;
 	return 0;
 }
 

siteupdate/cplusplus/classes/TravelerList/TravelerList.cpp

@@ -165,9 +165,9 @@ class TravelerList
 				}
 				if (point_indices.size() != 2)
 				{	bool invalid_char = 0;
-					for (size_t c = 0; c < trim_line.size(); c++)
-					  if (iscntrl(trim_line[c]))
-					  {	trim_line[c] = '?';
+					for (char& c : trim_line)
+					  if (iscntrl(c))
+					  {	c = '?';
 						invalid_char = 1;
 					  }
 					log << "Waypoint label(s) not found in line: " << trim_line;
@@ -189,9 +189,9 @@ class TravelerList
 			    }
 			catch (const std::out_of_range& oor)
 			    {	bool invalid_char = 0;
-				for (size_t c = 0; c < trim_line.size(); c++)
-				  if (iscntrl(trim_line[c]))
-				  {	trim_line[c] = '?';
+				for (char& c : trim_line)
+				  if (iscntrl(c))
+				  {	c = '?';
 					invalid_char = 1;
 				  }
 				log << "Unknown region/highway combo in line: " << trim_line;
@@ -209,21 +209,21 @@ class TravelerList
 	/* Return active mileage across all regions */
 	double active_only_miles()
 	{	double mi = 0;
-		for (std::pair<Region*, double> rm : active_only_mileage_by_region) mi += rm.second;
+		for (std::pair<Region* const, double>& rm : active_only_mileage_by_region) mi += rm.second;
 		return mi;
 	}
 
 	/* Return active+preview mileage across all regions */
 	double active_preview_miles()
 	{	double mi = 0;
-		for (std::pair<Region*, double> rm : active_preview_mileage_by_region) mi += rm.second;
+		for (std::pair<Region* const, double>& rm : active_preview_mileage_by_region) mi += rm.second;
 		return mi;
 	}
 
 	/* Return mileage across all regions for a specified system */
 	double system_region_miles(HighwaySystem *h)
 	{	double mi = 0;
-		for (std::pair<Region*, double> rm : system_region_mileages.at(h)) mi += rm.second;
+		for (std::pair<Region* const, double>& rm : system_region_mileages.at(h)) mi += rm.second;
 		return mi;
 	}
 

siteupdate/cplusplus/classes/WaypointQuadtree/WaypointQuadtree.cpp

@@ -259,7 +259,7 @@ void WaypointQuadtree::write_qt_tmg(std::string filename)
 	std::ofstream tmgfile(filename);
 	tmgfile << "TMG 1.0 simple\n";
 	tmgfile << vertices.size() << ' ' << edges.size() << '\n';
-	for (std::string v : vertices)	tmgfile << v << '\n';
-	for (std::string e : edges)	tmgfile << e << '\n';
+	for (std::string& v : vertices)	tmgfile << v << '\n';
+	for (std::string& e : edges)	tmgfile << e << '\n';
 	tmgfile.close();
 }

siteupdate/cplusplus/functions/graph_generation.cpp

@@ -5,7 +5,7 @@ HighwayGraph graph_data(all_waypoints, highway_systems, datacheckerrors, args.nu
 
 cout << et.et() << "Writing graph waypoint simplification log." << endl;
 ofstream wslogfile(args.logfilepath + "/waypointsimplification.log");
-for (string line : graph_data.waypoint_naming_log)
+for (string& line : graph_data.waypoint_naming_log)
 	wslogfile << line << '\n';
 wslogfile.close();
 graph_data.waypoint_naming_log.clear();
@@ -34,7 +34,8 @@ else {	list<Region*> *regions;
 	graph_vector[0].edges = 0;	graph_vector[0].vertices = graph_data.vertices.size();
 	graph_vector[1].edges = 0;	graph_vector[1].vertices = 0;
 	graph_vector[2].edges = 0;	graph_vector[2].vertices = 0;
-	for (std::pair<const Waypoint*, HGVertex*> wv : graph_data.vertices)
+	// get master graph vertex & edge counts for terminal output before writing files
+	for (std::pair<Waypoint* const, HGVertex*>& wv : graph_data.vertices)
 	{	graph_vector[0].edges += wv.second->incident_s_edges.size();
 		if (wv.second->visibility >= 1)
 		{	graph_vector[2].vertices++;

siteupdate/cplusplus/functions/sql_file.cpp

@@ -273,7 +273,7 @@ void sqlfile1
 	first = 1;
 	for (HighwaySystem *h : *highway_systems)
 	  if (h->active_or_preview())
-	    for (std::pair<Region*,double> rm : h->mileage_by_region)
+	    for (std::pair<Region* const,double>& rm : h->mileage_by_region)
 	    {	if (!first) sqlfile << ',';
 		first = 0;
 		char fstr[35];
@@ -293,7 +293,7 @@ void sqlfile1
 	sqlfile << "INSERT INTO clinchedOverallMileageByRegion VALUES\n";
 	first = 1;
 	for (TravelerList *t : *traveler_lists)
-	  for (std::pair<Region*,double> rm : t->active_preview_mileage_by_region)
+	  for (std::pair<Region* const,double>& rm : t->active_preview_mileage_by_region)
 	  {	if (!first) sqlfile << ',';
 		first = 0;
 		double active_miles = 0;

siteupdate/cplusplus/siteupdate.cpp

@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
 		}
 		cout << endl;
 		// at the end, print the lines ignored
-		for (string l : ignoring) cout << l << endl;
+		for (string& l : ignoring) cout << l << endl;
 		ignoring.clear();
 	     }
 	file.close();
@@ -285,9 +285,8 @@ int main(int argc, char *argv[])
       #else
 	for (HighwaySystem* h : highway_systems)
 	{	std::cout << h->systemname << std::flush;
-		for (std::list<Route>::iterator r = h->route_list.begin(); r != h->route_list.end(); r++)
-		{	r->read_wpt(&all_waypoints, &el, args.highwaydatapath+"/hwy_data", datacheckerrors, &all_wpt_files);
-		}
+		for (Route& r : h->route_list)
+			r.read_wpt(&all_waypoints, &el, args.highwaydatapath+"/hwy_data", datacheckerrors, &all_wpt_files);
 		std::cout << "!" << std::endl;
 	}
       #endif
@@ -529,7 +528,7 @@ int main(int argc, char *argv[])
 	    {	inusefile << r.root << '(' << r.point_list.size() << "):";
 		list<string> liu_list(r.labels_in_use.begin(), r.labels_in_use.end());
 		liu_list.sort();
-		for (string label : liu_list) inusefile << ' ' << label;
+		for (string& label : liu_list) inusefile << ' ' << label;
 		inusefile << '\n';
 		r.labels_in_use.clear();
 	    }
@@ -546,7 +545,7 @@ int main(int argc, char *argv[])
 				string ual_entry = r.root + '(' + to_string(r.unused_alt_labels.size()) + "):";
 				list<string> ual_list(r.unused_alt_labels.begin(), r.unused_alt_labels.end());
 				ual_list.sort();
-				for (string label : ual_list) ual_entry += ' ' + label;
+				for (string& label : ual_list) ual_entry += ' ' + label;
 				r.unused_alt_labels.clear();
 				unused_alt_labels.push_back(ual_entry);
 			}
@@ -656,15 +655,15 @@ int main(int argc, char *argv[])
 		region_entries.push_back(region->code + fstr);
 	  }
 	region_entries.sort();
-	for (string e : region_entries) hdstatsfile << e;
+	for (string& e : region_entries) hdstatsfile << e;
 
 	for (HighwaySystem *h : highway_systems)
 	{	sprintf(fstr, ") total: %.2f mi\n", h->total_mileage());
 		hdstatsfile << "System " << h->systemname << " (" << h->level_name() << fstr;
 		if (h->mileage_by_region.size() > 1)
 		{	hdstatsfile << "System " << h->systemname << " by region:\n";
 			list<Region*> regions_in_system;
-			for (pair<Region*, double> rm : h->mileage_by_region)
+			for (pair<Region* const, double>& rm : h->mileage_by_region)
 				regions_in_system.push_back(rm.first);
 			regions_in_system.sort(sort_regions_by_code);
 			for (Region *r : regions_in_system)
@@ -673,19 +672,19 @@ int main(int argc, char *argv[])
 			}
 		}
 		hdstatsfile << "System " << h->systemname << " by route:\n";
-		for (list<ConnectedRoute>::iterator cr = h->con_route_list.begin(); cr != h->con_route_list.end(); cr++)
+		for (ConnectedRoute& cr : h->con_route_list)
 		{	double con_total_miles = 0;
 			string to_write = "";
-			for (Route *r : cr->roots)
+			for (Route *r : cr.roots)
 			{	sprintf(fstr, ": %.2f mi\n", r->mileage);
 				to_write += "  " + r->readable_name() + fstr;
 				con_total_miles += r->mileage;
 			}
-			cr->mileage = con_total_miles; //FIXME?
+			cr.mileage = con_total_miles; //FIXME?
 			sprintf(fstr, ": %.2f mi", con_total_miles);
-			hdstatsfile << cr->readable_name() << fstr;
-			if (cr->roots.size() == 1)
-				hdstatsfile << " (" << cr->roots[0]->readable_name() << " only)\n";
+			hdstatsfile << cr.readable_name() << fstr;
+			if (cr.roots.size() == 1)
+				hdstatsfile << " (" << cr.roots[0]->readable_name() << " only)\n";
 			else	hdstatsfile << '\n' << to_write;
 		}
 	}
@@ -733,7 +732,7 @@ int main(int argc, char *argv[])
 	allfile << '\n';
 	for (TravelerList *t : traveler_lists)
 	{	double t_total_mi = 0;
-		for (std::pair<Region*, double> rm : t->active_only_mileage_by_region)
+		for (std::pair<Region* const, double>& rm : t->active_only_mileage_by_region)
 			t_total_mi += rm.second;
 		sprintf(fstr, "%.2f", t_total_mi);
 		allfile << t->traveler_name << ',' << fstr;
@@ -771,7 +770,7 @@ int main(int argc, char *argv[])
 	allfile << '\n';
 	for (TravelerList *t : traveler_lists)
 	{	double t_total_mi = 0;
-		for (std::pair<Region*, double> rm : t->active_preview_mileage_by_region)
+		for (std::pair<Region* const, double>& rm : t->active_preview_mileage_by_region)
 			t_total_mi += rm.second;
 		sprintf(fstr, "%.2f", t_total_mi);
 		allfile << t->traveler_name << ',' << fstr;
@@ -799,7 +798,7 @@ int main(int argc, char *argv[])
 		sysfile << "Traveler,Total";
 		regions.clear();
 		total_mi = 0;
-		for (std::pair<Region*, double> rm : h->mileage_by_region)
+		for (std::pair<Region* const, double>& rm : h->mileage_by_region)
 		{	regions.push_back(rm.first);
 			total_mi += rm.second;		//TODO is this right?
 		}
@@ -835,7 +834,7 @@ int main(int argc, char *argv[])
 	cout << et.et() << "Reading datacheckfps.csv." << endl;
 	file.open(args.highwaydatapath+"/datacheckfps.csv");
 	getline(file, line); // ignore header line
-	list<array<string, 6>> datacheckfps; //FIXME try implementing as an unordered_multiset; see if speed increases
+	list<array<string, 6>> datacheckfps;
 	unordered_set<string> datacheck_always_error
 	({	"BAD_ANGLE", "DUPLICATE_LABEL", "HIDDEN_TERMINUS",
 		"INVALID_FINAL_CHAR", "INVALID_FIRST_CHAR",
@@ -881,22 +880,22 @@ int main(int argc, char *argv[])
 	fpfile << "Log file created at: " << ctime(&timestamp);
 	unsigned int counter = 0;
 	unsigned int fpcount = 0;
-	for (list<DatacheckEntry>::iterator d = datacheckerrors->entries.begin(); d != datacheckerrors->entries.end(); d++)
+	for (DatacheckEntry& d : datacheckerrors->entries)
 	{	//cout << "Checking: " << d->str() << endl;
 		counter++;
 		if (counter % 1000 == 0) cout << '.' << flush;
 		for (list<array<string, 6>>::iterator fp = datacheckfps.begin(); fp != datacheckfps.end(); fp++)
-		  if (d->match_except_info(*fp))
-		    if (d->info == (*fp)[5])
+		  if (d.match_except_info(*fp))
+		    if (d.info == (*fp)[5])
 		    {	//cout << "Match!" << endl;
-			d->fp = 1;
+			d.fp = 1;
 			fpcount++;
 			datacheckfps.erase(fp);
 			break;
 		    }
 		    else
 		    {	fpfile << "FP_ENTRY: " << (*fp)[0] << ';' << (*fp)[1] << ';' << (*fp)[2] << ';' << (*fp)[3] << ';' << (*fp)[4] << ';' << (*fp)[5] << '\n';
-			fpfile << "CHANGETO: " << (*fp)[0] << ';' << (*fp)[1] << ';' << (*fp)[2] << ';' << (*fp)[3] << ';' << (*fp)[4] << ';' << d->info << '\n';
+			fpfile << "CHANGETO: " << (*fp)[0] << ';' << (*fp)[1] << ';' << (*fp)[2] << ';' << (*fp)[3] << ';' << (*fp)[4] << ';' << d.info << '\n';
 		    }
 	}
 	fpfile.close();
@@ -910,8 +909,8 @@ int main(int argc, char *argv[])
 	timestamp = time(0);
 	fpfile << "Log file created at: " << ctime(&timestamp);
 	if (datacheckfps.empty()) fpfile << "No unmatched FP entries.\n";
-	else	for (array<string, 6> entry : datacheckfps)
-			fpfile << entry[0] << ';' << entry[1] << ';' << entry[2] << ';' << entry[3] << ';' << entry[4] << ';' << entry[5] << '\n';
+	else	for (array<string, 6>& entry : datacheckfps)
+		  fpfile << entry[0] << ';' << entry[1] << ';' << entry[2] << ';' << entry[3] << ';' << entry[4] << ';' << entry[5] << '\n';
 	fpfile.close();
 
 	// datacheck.log file
@@ -999,7 +998,7 @@ int main(int argc, char *argv[])
 	unsigned other_count = 0;
 	unsigned int total_rtes = 0;
 	for (HighwaySystem *h : highway_systems)
-	  for (Route r : h->route_list)
+	  for (Route& r : h->route_list)
 	  {	total_rtes++;
 		if (h->devel()) d_count++;
 		else {	if (h->active()) a_count++;