Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Revert "use more osrm::irange"

Browse Source 
This reverts commit d6c6fbfe03.
This commit is contained in:
Dennis Luxen
2014-08-20 15:47:48 +02:00
parent d6c6fbfe03
commit 05b939760c
5 changed files with 74 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/DistanceTablePlugin.h
+5 -6
View File
@@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Algorithms/ObjectToBase64.h"
#include "../DataStructures/JSONContainer.h"
#include "../DataStructures/QueryEdge.h"
#include "../DataStructures/Range.h"
#include "../DataStructures/SearchEngine.h"
#include "../Descriptors/BaseDescriptor.h"
#include "../Util/SimpleLogger.h"
@@ -92,10 +91,10 @@ template <class DataFacadeT> class DistanceTablePlugin : public BasePlugin
}
const bool checksum_OK = (route_parameters.check_sum == raw_route.check_sum);
auto max_locations =
std::min((std::size_t)100u, raw_route.raw_via_node_coordinates.size());
unsigned max_locations =
std::min(100u, static_cast<unsigned>(raw_route.raw_via_node_coordinates.size()));
PhantomNodeArray phantom_node_vector(max_locations);
for (const auto i : osrm::range<std::size_t>(0, max_locations))
for (unsigned i = 0; i < max_locations; ++i)
{
if (checksum_OK && i < route_parameters.hints.size() &&
!route_parameters.hints[i].empty())
@@ -128,8 +127,8 @@ template <class DataFacadeT> class DistanceTablePlugin : public BasePlugin
}
JSON::Object json_object;
JSON::Array json_array;
const auto number_of_locations = phantom_node_vector.size();
for (const auto row : osrm::irange<std::size_t>(0, number_of_locations))
const unsigned number_of_locations = static_cast<unsigned>(phantom_node_vector.size());
for (unsigned row = 0; row < number_of_locations; ++row)
{
JSON::Array json_row;
auto row_begin_iterator = result_table->begin() + (row * number_of_locations);
Plugins/ViaRoutePlugin.h
+2 -3
View File
@@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Algorithms/ObjectToBase64.h"
#include "../DataStructures/QueryEdge.h"
#include "../DataStructures/Range.h"
#include "../DataStructures/SearchEngine.h"
#include "../Descriptors/BaseDescriptor.h"
#include "../Descriptors/GPXDescriptor.h"
@@ -95,7 +94,7 @@ template <class DataFacadeT> class ViaRoutePlugin : public BasePlugin
std::vector<PhantomNode> phantom_node_vector(raw_route.raw_via_node_coordinates.size());
const bool checksum_OK = (route_parameters.check_sum == raw_route.check_sum);
for (const auto i : osrm::irange<std::size_t>(0, raw_route.raw_via_node_coordinates.size()))
for (unsigned i = 0; i < raw_route.raw_via_node_coordinates.size(); ++i)
{
if (checksum_OK && i < route_parameters.hints.size() &&
!route_parameters.hints[i].empty())
@@ -112,7 +111,7 @@ template <class DataFacadeT> class ViaRoutePlugin : public BasePlugin
}
PhantomNodes current_phantom_node_pair;
for (const auto i : osrm::irange<std::size_t>(0, phantom_node_vector.size() - 1))
for (unsigned i = 0; i < phantom_node_vector.size() - 1; ++i)
{
current_phantom_node_pair.source_phantom = phantom_node_vector[i];
current_phantom_node_pair.target_phantom = phantom_node_vector[i + 1];