5d468f2897
This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
49 lines
1.3 KiB
C++
49 lines
1.3 KiB
C++
#ifndef OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_
|
|
#define OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_
|
|
|
|
#include "util/dynamic_graph.hpp"
|
|
#include <algorithm>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace contractor
|
|
{
|
|
|
|
struct ContractorEdgeData
|
|
{
|
|
ContractorEdgeData()
|
|
: weight{0}, duration{0}, distance{0}, id(0), originalEdges(0), shortcut(0), forward(0),
|
|
backward(0)
|
|
{
|
|
}
|
|
ContractorEdgeData(EdgeWeight weight,
|
|
EdgeDuration duration,
|
|
EdgeDistance distance,
|
|
unsigned original_edges,
|
|
unsigned id,
|
|
bool shortcut,
|
|
bool forward,
|
|
bool backward)
|
|
: weight(weight), duration(duration), distance(distance), id(id),
|
|
originalEdges(std::min((1u << 29) - 1u, original_edges)), shortcut(shortcut),
|
|
forward(forward), backward(backward)
|
|
{
|
|
}
|
|
EdgeWeight weight;
|
|
EdgeDuration duration;
|
|
EdgeDistance distance;
|
|
unsigned id;
|
|
unsigned originalEdges : 29;
|
|
bool shortcut : 1;
|
|
bool forward : 1;
|
|
bool backward : 1;
|
|
};
|
|
|
|
using ContractorGraph = util::DynamicGraph<ContractorEdgeData>;
|
|
using ContractorEdge = ContractorGraph::InputEdge;
|
|
|
|
} // namespace contractor
|
|
} // namespace osrm
|
|
|
|
#endif // OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_
|