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

fix edge duration truncation in partition, pending global fix

Browse Source 
fix windows compilation
no multi line warnings
sanitze on mason with newer TBB
This commit is contained in:
Moritz Kobitzsch
2017-02-15 10:19:33 +01:00
committed by Patrick Niklaus
parent b5d63e5ed5
commit d473acb56d
7 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/partition/annotated_partition.hpp
+5 -5
View File
@@ -31,13 +31,13 @@ namespace partition
// layout into:
//
// _____o__________
// / | \
// o | \
// / \ | \
// / | \ 
// o | \ 
// / \ | \ 
// a b o _o_
// / \ / \
// / \ / \ 
// c d o o
// / \ / \
// / \ / \ 
// e f g h
class AnnotatedPartition
{
include/partition/compressed_node_based_graph_reader.hpp
+1
View File
@@ -3,6 +3,7 @@
#include "storage/io.hpp"
#include "util/coordinate.hpp"
#include "util/typedefs.hpp"
#include <string>
#include <vector>
include/partition/dinic_max_flow.hpp
+1 -1
View File
@@ -52,7 +52,7 @@ class DinicMaxFlow
// (starting with 0 for all source nodes) and assign the hop distance in the residual graph as
// the level of the node.
// a
// / \
// / \ 
// s t
// \ /
// b
include/partition/edge_based_graph_reader.hpp
+2 -1
View File
@@ -1,6 +1,7 @@
#ifndef OSRM_EDGE_BASED_GRAPH_READER_HPP
#define OSRM_EDGE_BASED_GRAPH_READER_HPP
#include "extractor/edge_based_edge.hpp"
#include "storage/io.hpp"
#include "util/coordinate.hpp"
#include "util/dynamic_graph.hpp"
@@ -130,7 +131,7 @@ struct EdgeBasedGraphReader
forward_edge.target = reverse_edge.target = target;
forward_edge.data.edge_id = reverse_edge.data.edge_id = edges[i].edge_id;
forward_edge.data.weight = reverse_edge.data.weight = INVALID_EDGE_WEIGHT;
forward_edge.data.duration = reverse_edge.data.duration = MAXIMAL_EDGE_DURATION;
forward_edge.data.duration = reverse_edge.data.duration = MAXIMAL_EDGE_DURATION_INT_30;
forward_edge.data.forward = reverse_edge.data.backward = true;
forward_edge.data.backward = reverse_edge.data.forward = false;