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

Quick fix for negative distances bug.

Browse Source
This commit is contained in:
Daniel Patterson 2019-02-10 02:09:30 -08:00
parent aed7df6173
commit 986252c4f9
No known key found for this signature in database
GPG Key ID: 19C12BE1725A028B
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "osrm", "name": "osrm",
"version": "5.21.0-customsnapping.8", "version": "5.21.0-customsnapping.9",
"private": false, "private": false,
"description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.", "description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.",
"dependencies": { "dependencies": {

8
src/engine/plugins/table.cpp
View File

@ -112,7 +112,7 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
// here, but tiny numbers is what this adjustment lambda is all about, // here, but tiny numbers is what this adjustment lambda is all about,
// so we do try to be reasonable. // so we do try to be reasonable.
const auto average_speed = const auto average_speed =
duration == 0 ? 10 : distance / duration == 0 ? 10 : std::abs(distance) /
(duration / 10.); // duration is in deciseconds, we need m/sec (duration / 10.); // duration is in deciseconds, we need m/sec
// The following reference has a nice model (equations 9 through 12) // The following reference has a nice model (equations 9 through 12)
@ -141,7 +141,7 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
BOOST_ASSERT(distance_to_full_speed >= 0); BOOST_ASSERT(distance_to_full_speed >= 0);
if (distance_to_full_speed > distance / 2) if (distance_to_full_speed > std::abs(distance) / 2)
{ {
// Because equation 12 requires velocity at halfway, and // Because equation 12 requires velocity at halfway, and
// solving equation 11 for t requires a Lambert W function, // solving equation 11 for t requires a Lambert W function,
@ -149,13 +149,13 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
// over distance_to_full_speed using s = ut + 1/2at^2 // over distance_to_full_speed using s = ut + 1/2at^2
const auto average_acceleration = const auto average_acceleration =
2 * distance_to_full_speed / (time_to_full_speed * time_to_full_speed); 2 * distance_to_full_speed / (time_to_full_speed * time_to_full_speed);
const auto time_to_halfway = std::sqrt(distance / average_acceleration); const auto time_to_halfway = std::sqrt(std::abs(distance) / average_acceleration);
BOOST_ASSERT(time_to_halfway >= 0); BOOST_ASSERT(time_to_halfway >= 0);
return (2 * time_to_halfway) * 10; // result is in deciseconds return (2 * time_to_halfway) * 10; // result is in deciseconds
} }
else else
{ {
const auto cruising_distance = distance - 2 * distance_to_full_speed; const auto cruising_distance = std::abs(distance) - 2 * distance_to_full_speed;
const auto cruising_time = cruising_distance / average_speed; const auto cruising_time = cruising_distance / average_speed;
BOOST_ASSERT(cruising_time >= 0); BOOST_ASSERT(cruising_time >= 0);
return (cruising_time + 2 * time_to_full_speed) * 10; // result is in deciseconds return (cruising_time + 2 * time_to_full_speed) * 10; // result is in deciseconds