sync, 2019-04-23 - #85
Merged
Merged
Conversation
in preparation for "traveled" graph implementation
* Separate collection of "traveled" edges implemented. * fmt_mask allows new collapsed/traveled edges to be constructed together or separately as needed. * HighwayGraph.matching_vertices calculates & returns # of vertices for traveled graph, though this info is not used yet. * Traveled graph partially implemented: for now, just a glorified collapsed graph with a few extra vertices & edges. * Traveler numbers and hex codes are not yet implemented. * Subgraphs are not yet implemented.
Due to using std::list::splice, when compressing a vertex into both traveled & "normal" collapsed edges separately, the intermediate points were removed from edge2's list during collapsed edge construction, and thus no longer available to be spliced into the new traveled edge's list. This resulted in traveled edges with missing intermediate points.
plus a bugfix: added a mutex around writing to traveler_lists when reading .list files from disk
concurrency sanity checks http://forum.travelmapping.net/index.php?topic=2976.msg13621#msg13621 .list line replacement http://forum.travelmapping.net/index.php?topic=2926.msg13689#msg13689
Not currently something that shows up in the real world, but should still be fixed. #207
C++: traveled graphs, and region-splitting support
* Cannot use w->colocated instead of waypoint_at_same_point(w), because singleton points would not increase the unique_locations count. * sprintf in WaypointQuadtree::str(): done. * WaypointQuadtree::size() used when printing stats @ and of program. Otherwise, commented-out debug text in NMP search. Speed is OK; leave as-is, optimized for RAM.
I think this referred to trying `concurrent` as an unordered_set. * That's actually slower * and results in non-deterministic segment_name()s. Nope!
Was reminder to change siteupdate.py. See 5635614
Were reminders to change siteupdate.py. See b2de340
C++ sync, 2019-04-23
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.