diff options
| author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-01-28 11:04:04 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:37:20 +0300 |
| commit | 34f5f3f9064b1566a73278e9ff51fa60d6bce4c0 (patch) | |
| tree | 21989903be2c98f37edbfec3df7f73a34c08df65 /3party/osrm | |
| parent | 482ecf9d18585a4071b07a05776f16c054a4a56f (diff) | |
New many-to-many engine for cross routing
Diffstat (limited to '3party/osrm')
| -rw-r--r-- | 3party/osrm/osrm-backend/DataStructures/RawRouteData.h | 2 | ||||
| -rw-r--r-- | 3party/osrm/osrm-backend/RoutingAlgorithms/ManyToManyRouting.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/3party/osrm/osrm-backend/DataStructures/RawRouteData.h b/3party/osrm/osrm-backend/DataStructures/RawRouteData.h index d92242e7fa..9191a90113 100644 --- a/3party/osrm/osrm-backend/DataStructures/RawRouteData.h +++ b/3party/osrm/osrm-backend/DataStructures/RawRouteData.h @@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../DataStructures/TurnInstructions.h" #include "../typedefs.h" -#include <osrm/Coordinate.h> +#include "../Include/osrm/Coordinate.h" #include <vector> diff --git a/3party/osrm/osrm-backend/RoutingAlgorithms/ManyToManyRouting.h b/3party/osrm/osrm-backend/RoutingAlgorithms/ManyToManyRouting.h index 6761c25ca8..bf4631b3a7 100644 --- a/3party/osrm/osrm-backend/RoutingAlgorithms/ManyToManyRouting.h +++ b/3party/osrm/osrm-backend/RoutingAlgorithms/ManyToManyRouting.h @@ -209,7 +209,7 @@ template <class DataFacadeT> class ManyToManyRouting final : public BasicRouting { for (auto edge : super::facade->GetAdjacentEdgeRange(node)) { - const auto &data = super::facade->GetEdgeData(edge); + const auto &data = super::facade->GetEdgeData(edge,node); const bool direction_flag = (forward_direction ? data.forward : data.backward); if (direction_flag) { @@ -242,7 +242,7 @@ template <class DataFacadeT> class ManyToManyRouting final : public BasicRouting { for (auto edge : super::facade->GetAdjacentEdgeRange(node)) { - const auto &data = super::facade->GetEdgeData(edge); + const auto &data = super::facade->GetEdgeData(edge, node); const bool reverse_flag = ((!forward_direction) ? data.forward : data.backward); if (reverse_flag) { |