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.
84 lines
2.5 KiB
C++
84 lines
2.5 KiB
C++
#ifndef QUERYEDGE_HPP
|
|
#define QUERYEDGE_HPP
|
|
|
|
#include "util/typedefs.hpp"
|
|
|
|
#include <tuple>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace contractor
|
|
{
|
|
|
|
struct QueryEdge
|
|
{
|
|
NodeID source;
|
|
NodeID target;
|
|
struct EdgeData
|
|
{
|
|
explicit EdgeData()
|
|
: turn_id(0), shortcut(false), weight{0}, duration(0), forward(false),
|
|
backward(false), distance{0}
|
|
{
|
|
}
|
|
|
|
EdgeData(const NodeID turn_id,
|
|
const bool shortcut,
|
|
const EdgeWeight weight,
|
|
const EdgeDuration duration,
|
|
const EdgeDistance distance,
|
|
const bool forward,
|
|
const bool backward)
|
|
: turn_id(turn_id), shortcut(shortcut), weight(weight), duration(duration),
|
|
forward(forward), backward(backward), distance(distance)
|
|
{
|
|
}
|
|
|
|
template <class OtherT> EdgeData(const OtherT &other)
|
|
{
|
|
weight = other.weight;
|
|
duration = other.duration;
|
|
shortcut = other.shortcut;
|
|
turn_id = other.id;
|
|
forward = other.forward;
|
|
backward = other.backward;
|
|
distance = other.distance;
|
|
}
|
|
// this ID is either the middle node of the shortcut, or the ID of the edge based node (node
|
|
// based edge) storing the appropriate data. If `shortcut` is set to true, we get the middle
|
|
// node. Otherwise we see the edge based node to access node data.
|
|
NodeID turn_id : 31;
|
|
bool shortcut : 1;
|
|
EdgeWeight weight;
|
|
EdgeDuration::value_type duration : 30;
|
|
std::uint32_t forward : 1;
|
|
std::uint32_t backward : 1;
|
|
EdgeDistance distance;
|
|
} data;
|
|
|
|
QueryEdge() : source(SPECIAL_NODEID), target(SPECIAL_NODEID) {}
|
|
|
|
QueryEdge(NodeID source, NodeID target, const EdgeData &data)
|
|
: source(source), target(target), data(data)
|
|
{
|
|
}
|
|
|
|
bool operator<(const QueryEdge &rhs) const
|
|
{
|
|
return std::tie(source, target) < std::tie(rhs.source, rhs.target);
|
|
}
|
|
|
|
bool operator==(const QueryEdge &right) const
|
|
{
|
|
return (source == right.source && target == right.target &&
|
|
data.weight == right.data.weight && data.duration == right.data.duration &&
|
|
data.shortcut == right.data.shortcut && data.forward == right.data.forward &&
|
|
data.backward == right.data.backward && data.turn_id == right.data.turn_id &&
|
|
data.distance == right.data.distance);
|
|
}
|
|
};
|
|
} // namespace contractor
|
|
} // namespace osrm
|
|
|
|
#endif // QUERYEDGE_HPP
|