From 5a23b43b6715de543dcb4def9916e7974da80e79 Mon Sep 17 00:00:00 2001 From: eric bryant Date: Fri, 26 Apr 2019 16:04:26 -0400 Subject: [PATCH] HIDDEN_JUNCTION datacheck cleanup colocated point lists come pre-sorted, making most of this unnecessary. --- .../cplusplus/classes/GraphGeneration/HighwayGraph.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/siteupdate/cplusplus/classes/GraphGeneration/HighwayGraph.cpp b/siteupdate/cplusplus/classes/GraphGeneration/HighwayGraph.cpp index 78868a3a..2032f8b7 100644 --- a/siteupdate/cplusplus/classes/GraphGeneration/HighwayGraph.cpp +++ b/siteupdate/cplusplus/classes/GraphGeneration/HighwayGraph.cpp @@ -107,12 +107,9 @@ class HighwayGraph } // if >2 edges, flag HIDDEN_JUNCTION, mark as visible, and do not compress if (wv.second->incident_c_edges.size() > 2) - { std::list::iterator it = wv.second->first_waypoint->colocated->begin(); - Waypoint *dcw = *it; // "datacheck waypoint" - for (it++; it != wv.second->first_waypoint->colocated->end(); it++) - if (dcw->root_at_label() > (*it)->root_at_label()) - dcw->root_at_label() = (*it)->root_at_label(); //TODO: WHAT THE...? How is this actually working? (Or is it?) - datacheckerrors->add(dcw->route, dcw->label, "", "", "HIDDEN_JUNCTION", std::to_string(wv.second->incident_c_edges.size())); + { datacheckerrors->add(wv.first->colocated->front()->route, + wv.first->colocated->front()->label, + "", "", "HIDDEN_JUNCTION", std::to_string(wv.second->incident_c_edges.size())); wv.second->visibility = 2; continue; }