Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity
simplify_cmake
osrm-backend/include/contractor/contractor_graph.hpp

46 lines
1.3 KiB
C++
Raw Permalink Normal View History

refactor graph contractor for readability move to a dedicated dijkstra, separate code and header reduce heap size, we don't use more than 2000 nodes, so why allocate 170k?
2017-01-13 02:32:17 -05:00
#ifndef OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_
#define OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_
#include "util/dynamic_graph.hpp"
#include <algorithm>
Use nested namespace It's a mechanical change to modernize the code base
2022-12-11 04:10:26 -05:00
namespace osrm::contractor
refactor graph contractor for readability move to a dedicated dijkstra, separate code and header reduce heap size, we don't use more than 2000 nodes, so why allocate 170k?
2017-01-13 02:32:17 -05:00
{
struct ContractorEdgeData
{
ContractorEdgeData()
Make edge metrics strongly typed (#6421) 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.
2022-10-28 10:16:12 -04:00
: weight{0}, duration{0}, distance{0}, id(0), originalEdges(0), shortcut(0), forward(0),
Replace dynamic distance calculation for table plugin with pre-calculated distances on shortcuts, avoiding unpacking cost. Adds approx 10% to total data size. Speeds up large table requests by 2 orders of magnitude. Co-authored-by: Kajari Ghosh <ghoshkaj@gmail.com>
2018-10-30 00:47:49 -04:00
backward(0)
refactor graph contractor for readability move to a dedicated dijkstra, separate code and header reduce heap size, we don't use more than 2000 nodes, so why allocate 170k?
2017-01-13 02:32:17 -05:00
{
}
Allow specifing a weight for routing that is independent of duration
2016-05-12 12:50:10 -04:00
ContractorEdgeData(EdgeWeight weight,
Make edge metrics strongly typed (#6421) 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.
2022-10-28 10:16:12 -04:00
EdgeDuration duration,
Replace dynamic distance calculation for table plugin with pre-calculated distances on shortcuts, avoiding unpacking cost. Adds approx 10% to total data size. Speeds up large table requests by 2 orders of magnitude. Co-authored-by: Kajari Ghosh <ghoshkaj@gmail.com>
2018-10-30 00:47:49 -04:00
EdgeDistance distance,
refactor graph contractor for readability move to a dedicated dijkstra, separate code and header reduce heap size, we don't use more than 2000 nodes, so why allocate 170k?
2017-01-13 02:32:17 -05:00
unsigned original_edges,
unsigned id,
bool shortcut,
bool forward,
bool backward)
Replace dynamic distance calculation for table plugin with pre-calculated distances on shortcuts, avoiding unpacking cost. Adds approx 10% to total data size. Speeds up large table requests by 2 orders of magnitude. Co-authored-by: Kajari Ghosh <ghoshkaj@gmail.com>
2018-10-30 00:47:49 -04:00
: weight(weight), duration(duration), distance(distance), id(id),
Make renumbering transparent to contraction
2017-08-19 06:37:24 -04:00
originalEdges(std::min((1u << 29) - 1u, original_edges)), shortcut(shortcut),
forward(forward), backward(backward)
refactor graph contractor for readability move to a dedicated dijkstra, separate code and header reduce heap size, we don't use more than 2000 nodes, so why allocate 170k?
2017-01-13 02:32:17 -05:00
{
}
Allow specifing a weight for routing that is independent of duration
2016-05-12 12:50:10 -04:00
EdgeWeight weight;
Make edge metrics strongly typed (#6421) 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.
2022-10-28 10:16:12 -04:00
EdgeDuration duration;
Replace dynamic distance calculation for table plugin with pre-calculated distances on shortcuts, avoiding unpacking cost. Adds approx 10% to total data size. Speeds up large table requests by 2 orders of magnitude. Co-authored-by: Kajari Ghosh <ghoshkaj@gmail.com>
2018-10-30 00:47:49 -04:00
EdgeDistance distance;
refactor graph contractor for readability move to a dedicated dijkstra, separate code and header reduce heap size, we don't use more than 2000 nodes, so why allocate 170k?
2017-01-13 02:32:17 -05:00
unsigned id;
Make renumbering transparent to contraction
2017-08-19 06:37:24 -04:00
unsigned originalEdges : 29;
refactor graph contractor for readability move to a dedicated dijkstra, separate code and header reduce heap size, we don't use more than 2000 nodes, so why allocate 170k?
2017-01-13 02:32:17 -05:00
bool shortcut : 1;
bool forward : 1;
bool backward : 1;
};
using ContractorGraph = util::DynamicGraph<ContractorEdgeData>;
using ContractorEdge = ContractorGraph::InputEdge;
Fix formatting
2022-12-20 12:00:11 -05:00
} // namespace osrm::contractor
refactor graph contractor for readability move to a dedicated dijkstra, separate code and header reduce heap size, we don't use more than 2000 nodes, so why allocate 170k?
2017-01-13 02:32:17 -05:00
#endif // OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_
Reference in New Issue Copy Permalink