X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..47ba551ee792c3cc4a5960dfb0dc9c42d08509d3:/include/simgrid/kernel/routing/RoutedZone.hpp
diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp
index f3c6698c36..0e657cc710 100644
--- a/include/simgrid/kernel/routing/RoutedZone.hpp
+++ b/include/simgrid/kernel/routing/RoutedZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. 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.
*
*
* Comparison of the RoutedZone subclasses
@@ -50,31 +50,17 @@ namespace routing {
class XBT_PRIVATE RoutedZone : public NetZoneImpl {
public:
- explicit RoutedZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel);
-
- void get_graph(const s_xbt_graph_t* graph, std::map>* nodes,
- std::map>* edges) override;
+ explicit RoutedZone(const std::string& name);
protected:
- RouteCreationArgs* new_extended_route(RoutingMode hierarchy, NetPoint* gw_src, NetPoint* gw_dst,
- const std::vector& link_list, bool preserve_order);
- XBT_ATTRIB_DEPRECATED_v330("Please drop 2nd, 3rd and 7th parameters") virtual RouteCreationArgs* new_extended_route(
- RoutingMode hierarchy, NetPoint* /* src */, NetPoint* /* dst */, NetPoint* gw_src, NetPoint* gw_dst,
- std::vector& link_list, bool /* symmetrical */, bool preserve_order)
- {
- return new_extended_route(hierarchy, gw_src, gw_dst, link_list, preserve_order);
- }
- void get_route_check_params(NetPoint* src, NetPoint* dst) const;
+ Route* new_extended_route(RoutingMode hierarchy, NetPoint* gw_src, NetPoint* gw_dst,
+ const std::vector& 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& link_list, bool symmetrical) const;
+ const std::vector& link_list, bool symmetrical) const;
};
} // namespace routing
} // namespace kernel
} // namespace simgrid
-XBT_PRIVATE xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name,
- std::map>* nodes);
-XBT_PRIVATE xbt_edge_t new_xbt_graph_edge(const s_xbt_graph_t* graph, xbt_node_t s, xbt_node_t d,
- std::map>* edges);
-
#endif /* SIMGRID_ROUTING_GENERIC_HPP_ */