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

add timer to check runtime of round trip algorithm

Browse Source
This commit is contained in:
chaupow 2015-05-27 01:46:12 +02:00 committed by Huyen Chau Nguyen
parent a2dc8378f5
commit ca7d406787
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/round_trip.hpp
View File

@ -171,8 +171,6 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
min_loc_permutation = loc_permutation; min_loc_permutation = loc_permutation;
} }
} }
SimpleLogger().Write() << "Shortest route " << min_route.shortest_path_length;
} }
public: public:
@ -231,7 +229,12 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
// compute TSP round trip // compute TSP round trip
InternalRouteResult min_route; InternalRouteResult min_route;
std::vector<int> min_loc_permutation; std::vector<int> min_loc_permutation;
TIMER_START(tsp_nn);
NearestNeighbour(route_parameters, phantom_node_vector, *result_table, min_route, min_loc_permutation); NearestNeighbour(route_parameters, phantom_node_vector, *result_table, min_route, min_loc_permutation);
TIMER_STOP(tsp_nn);
SimpleLogger().Write() << "Distance " << min_route.shortest_path_length;
SimpleLogger().Write() << "Time " << TIMER_MSEC(tsp_nn);
// return result to json // return result to json
std::unique_ptr<BaseDescriptor<DataFacadeT>> descriptor; std::unique_ptr<BaseDescriptor<DataFacadeT>> descriptor;
@ -242,7 +245,9 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
osrm::json::Array json_loc_permutation; osrm::json::Array json_loc_permutation;
json_loc_permutation.values.insert(json_loc_permutation.values.end(), min_loc_permutation.begin(), min_loc_permutation.end()); json_loc_permutation.values.insert(json_loc_permutation.values.end(), min_loc_permutation.begin(), min_loc_permutation.end());
json_result.values["loc_permutation"] = json_loc_permutation; json_result.values["nn_loc_permutation"] = json_loc_permutation;
json_result.values["nn_distance"] = min_route.shortest_path_length;
json_result.values["nn_runtime"] = TIMER_MSEC(tsp_nn);
return 200; return 200;
} }