class GraphNodeData {
public:
- explicit GraphNodeData(int id) : id_(id) {}
- int id_;
+ explicit GraphNodeData(unsigned long id) : id_(id) {}
+ unsigned long id_;
unsigned long graph_id_ = UINT_MAX; /* used for caching internal graph id's */
};
}
}
-xbt_node_t DijkstraZone::route_graph_new_node(int id)
+xbt_node_t DijkstraZone::route_graph_new_node(unsigned long id)
{
xbt_node_t node = xbt_graph_new_node(route_graph_.get(), new GraphNodeData(id));
graph_node_map_.emplace(id, node);
return node;
}
-xbt_node_t DijkstraZone::node_map_search(int id)
+xbt_node_t DijkstraZone::node_map_search(unsigned long id)
{
auto ret = graph_node_map_.find(id);
return ret == graph_node_map_.end() ? nullptr : ret->second;
void DijkstraZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat)
{
get_route_check_params(src, dst);
- int src_id = src->id();
- int dst_id = dst->id();
+ unsigned long src_id = src->id();
+ unsigned long dst_id = dst->id();
const_xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_.get());
new_extended_route(get_hierarchy(), gw_dst, gw_src, get_link_list_impl(link_list, true), false));
}
-void DijkstraZone::new_edge(int src_id, int dst_id, Route* route)
+void DijkstraZone::new_edge(unsigned long src_id, unsigned long dst_id, Route* route)
{
- XBT_DEBUG("Create Route from '%d' to '%d'", src_id, dst_id);
+ XBT_DEBUG("Create Route from '%lu' to '%lu'", src_id, dst_id);
// Get the extremities, or create them if they don't exist yet
xbt_node_t src = node_map_search(src_id);