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

remove possibility to choose algorithm but only use brute force and farthest insertion

Browse Source
This commit is contained in:
Huyen Chau Nguyen
2015-08-20 16:42:50 +02:00
parent e6eea67eeb
commit e773a80b06
5 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/trip.hpp
+2 -13
View File
@@ -270,21 +270,10 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
NodeIDIterator start = std::begin(scc.component) + scc.range[k];
NodeIDIterator end = std::begin(scc.component) + scc.range[k+1];
// Compute the Trip with the given algorithm
if (route_parameters.trip_algo == "BF" && route_parameters.coordinates.size() < BF_MAX_FEASABLE) {
SimpleLogger().Write() << "Running brute force";
if (component_size < BF_MAX_FEASABLE) {
scc_route = osrm::trip::BruteForceTrip(start, end, number_of_locations, result_table);
route_result.push_back(scc_route);
} else if (route_parameters.trip_algo == "NN") {
SimpleLogger().Write() << "Running nearest neighbour";
scc_route = osrm::trip::NearestNeighbourTrip(start, end, number_of_locations, result_table);
route_result.push_back(scc_route);
} else if (route_parameters.trip_algo == "FI") {
SimpleLogger().Write() << "Running farthest insertion";
scc_route = osrm::trip::FarthestInsertionTrip(start, end, number_of_locations, result_table);
route_result.push_back(scc_route);
} else{
SimpleLogger().Write() << "Running farthest insertion";
} else {
scc_route = osrm::trip::FarthestInsertionTrip(start, end, number_of_locations, result_table);
route_result.push_back(scc_route);
}