X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d805d3e2b617db73c7c28cf4e4683cd9e6b928d4..47ba551ee792c3cc4a5960dfb0dc9c42d08509d3:/include/simgrid/kernel/routing/RoutedZone.hpp

diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp
index 443cd4e311..0e657cc710 100644
--- a/include/simgrid/kernel/routing/RoutedZone.hpp
+++ b/include/simgrid/kernel/routing/RoutedZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -15,7 +15,7 @@ namespace routing {
 /** @ingroup ROUTING_API
  *  @brief NetZone with an explicit routing (abstract class)
  *
- * This abstract class factorizes code between its subclasses: Full, Dijkstra and Floyd.
+ * This abstract class factors code between its subclasses: Full, Dijkstra and Floyd.
  *
  * <table>
  * <caption>Comparison of the RoutedZone subclasses</caption>
@@ -50,26 +50,17 @@ namespace routing {
 
 class XBT_PRIVATE RoutedZone : public NetZoneImpl {
 public:
-  explicit RoutedZone(NetZone* father, std::string name);
-
-  void get_graph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
-                 std::map<std::string, xbt_edge_t>* edges) override;
-  virtual RouteCreationArgs* newExtendedRoute(RoutingMode hierarchy, NetPoint* src, NetPoint* dst, NetPoint* gw_src,
-                                              NetPoint* gw_dst, std::vector<resource::LinkImpl*>& link_list,
-                                              bool symmetrical, bool change_order);
+  explicit RoutedZone(const std::string& name);
 
 protected:
-  void getRouteCheckParams(NetPoint* src, NetPoint* dst);
-  void addRouteCheckParams(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
-                           std::vector<resource::LinkImpl*>& link_list, bool symmetrical);
+  Route* new_extended_route(RoutingMode hierarchy, NetPoint* gw_src, NetPoint* gw_dst,
+                            const std::vector<resource::StandardLinkImpl*>& link_list, bool preserve_order);
+  void get_route_check_params(const NetPoint* src, const NetPoint* dst) const;
+  void add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+                              const std::vector<s4u::LinkInRoute>& link_list, bool symmetrical) const;
 };
 } // namespace routing
 } // namespace kernel
 } // namespace simgrid
 
-XBT_PRIVATE xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name,
-                                          std::map<std::string, xbt_node_t>* nodes);
-XBT_PRIVATE xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d,
-                                          std::map<std::string, xbt_edge_t>* edges);
-
 #endif /* SIMGRID_ROUTING_GENERIC_HPP_ */