From 0e33f638e64f36dff59b158f7c9cee47fc6b48af Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 22 Nov 2013 18:43:01 +0100 Subject: [PATCH] move implementation details out of templat'ized container code --- DataStructures/EdgeBasedNode.h | 10 +++++++--- DataStructures/StaticRTree.h | 6 ------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/DataStructures/EdgeBasedNode.h b/DataStructures/EdgeBasedNode.h index 654de96de..8fafed71c 100644 --- a/DataStructures/EdgeBasedNode.h +++ b/DataStructures/EdgeBasedNode.h @@ -23,6 +23,10 @@ struct EdgeBasedNode { FixedPointCoordinate & nearest_location, double & r ) const { + if( ignoreInGrid ) { + return std::numeric_limits::max(); + } + const double x = inputPoint.lat/COORDINATE_PRECISION; const double y = inputPoint.lon/COORDINATE_PRECISION; const double a = lat1/COORDINATE_PRECISION; @@ -83,9 +87,9 @@ struct EdgeBasedNode { return centroid; } - inline bool isIgnored() const { - return ignoreInGrid; - } + // inline bool isIgnored() const { + // return ignoreInGrid; + // } NodeID id; int lat1; diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 62ca89530..6d9464b1c 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -675,9 +675,6 @@ public: ) { continue; } - if(current_edge.isIgnored()) { - continue; - } double current_minimum_distance = ApproximateDistance( input_coordinate.lat, @@ -781,9 +778,6 @@ public: if(ignore_tiny_components && current_edge.belongsToTinyComponent) { continue; } - if(current_edge.isIgnored()) { - continue; - } double current_ratio = 0.; double current_perpendicular_distance = current_edge.ComputePerpendicularDistance(