vt

yakra · Jan 14, 2021 · e3e708e · e3e708e
2 parents c200686 + 7a67ce4
commit e3e708e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/siteupdate/cplusplus/classes/GraphGeneration/HighwayGraph.cpp b/siteupdate/cplusplus/classes/GraphGeneration/HighwayGraph.cpp
@@ -165,7 +165,6 @@ inline void HighwayGraph::matching_vertices_and_edges
 	std::list<HGVertex*> rvlist;	// union of all lists in regions
 	std::list<HGVertex*> svlist;	// union of all lists in systems
 	std::list<HGVertex*> pvlist;	// set of vertices within placeradius
-	std::unordered_set<TravelerList*> trav_set;
 
 	if (g.regions)
 	  for (Region *r : *g.regions)
@@ -233,7 +232,11 @@ inline void HighwayGraph::matching_vertices_and_edges
 			    }
 			if (system_match)
 			{	mte.insert(e);
-				for (TravelerList *t : e->segment->clinched_by) trav_set.insert(t);
+				for (TravelerList *t : e->segment->clinched_by)
+				  if (!t->in_subgraph[threadnum])
+				  {	traveler_lists.push_back(t);
+					t->in_subgraph[threadnum] = 1;
+				  }
 			}
 		    }
 		if (v->visibility < 2) continue;
@@ -251,7 +254,7 @@ inline void HighwayGraph::matching_vertices_and_edges
 			if (system_match) mce.insert(e);
 		    }
 	}
-	traveler_lists.assign(trav_set.begin(), trav_set.end());
+	for (TravelerList* t : traveler_lists) t->in_subgraph[threadnum] = 0;
 	traveler_lists.sort(sort_travelers_by_name);
 }
 

diff --git a/siteupdate/cplusplus/classes/TravelerList/TravelerList.cpp b/siteupdate/cplusplus/classes/TravelerList/TravelerList.cpp
@@ -18,8 +18,10 @@ TravelerList::TravelerList(std::string travname, std::string* updarr[], ErrorLis
 	preview_systems_traveled = 0;
 	preview_systems_clinched = 0;
 	unsigned int list_entries = 0;
+	in_subgraph = new bool[args->numthreads];
 	traveler_num = new unsigned int[args->numthreads];
 		       // deleted on termination of program
+	for (size_t i = 0; i < args->numthreads; i++) in_subgraph[i] = 0;
 	traveler_name = travname.substr(0, travname.size()-5); // strip ".list" from end of travname
 	if (traveler_name.size() > DBFieldLength::traveler)
 	  el->add_error("Traveler name " + traveler_name + " > " + std::to_string(DBFieldLength::traveler) + "bytes");

diff --git a/siteupdate/cplusplus/classes/TravelerList/TravelerList.h b/siteupdate/cplusplus/classes/TravelerList/TravelerList.h
@@ -30,6 +30,7 @@ class TravelerList
 	std::unordered_map<Region*, double> active_only_mileage_by_region;				// total mileage per region, active only
 	std::unordered_map<HighwaySystem*, std::unordered_map<Region*, double>> system_region_mileages;	// mileage per region per system
 	std::unordered_set<Route*> routes;
+	bool* in_subgraph;
 	unsigned int *traveler_num;
 	unsigned int active_systems_traveled;
 	unsigned int active_systems_clinched;