- const char* srcName = src->get_cname();
- const char* dstName = dst->get_cname();
-
- add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
-
- /* Create the topology graph */
- if (not route_graph_)
- route_graph_ = xbt_graph_new_graph(1, nullptr);
-
- /* we don't check whether the route already exist, because the algorithm may find another path through some other
- * nodes */
-
- /* Add the route to the base */
- RouteCreationArgs* e_route = new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
- new_route(src->id(), dst->id(), e_route);
-
- // Symmetrical YES
- if (symmetrical == true) {
-
- xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_);
- xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src->id(), xbt_node_t);
- xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst->id(), xbt_node_t);
- xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_e_v, node_s_v);
-
- if (not gw_dst || not gw_src) {
- XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName);
- if (edge)
- THROWF(arg_error, 0, "Route from %s to %s already exists", dstName, srcName);
- } else {
- XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, gw_dst->get_cname(), srcName, gw_src->get_cname());
- if (edge)
- THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, gw_dst->get_cname(), srcName,
- gw_src->get_cname());
- }
-
- if (gw_dst && gw_src) {
- NetPoint* gw_tmp = gw_src;
- gw_src = gw_dst;
- gw_dst = gw_tmp;
- }
- RouteCreationArgs* link_route_back =
- new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0);
- new_route(dst->id(), src->id(), link_route_back);
+ XBT_DEBUG("Create Route from '%d' to '%d'", 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);
+ if (src == nullptr)
+ src = route_graph_new_node(src_id);
+
+ xbt_node_t dst = node_map_search(dst_id);
+ if (dst == nullptr)
+ dst = route_graph_new_node(dst_id);
+
+ // Make sure that this graph edge was not already added to the graph
+ if (xbt_graph_get_edge(route_graph_.get(), src, dst) != nullptr) {
+ if (route->gw_dst_ == nullptr || route->gw_src_ == nullptr)
+ throw std::invalid_argument(
+ xbt::string_printf("Route from %s to %s already exists", route->src_->get_cname(), route->dst_->get_cname()));
+ else
+ throw std::invalid_argument(xbt::string_printf("Route from %s@%s to %s@%s already exists",
+ route->src_->get_cname(), route->gw_src_->get_cname(),
+ route->dst_->get_cname(), route->gw_dst_->get_cname()));