NetZoneImpl: simpler constructor

[simgrid.git] / include / simgrid / kernel / routing / NetPoint.hpp

diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp
index e6cc4b3..c5f5535 100644 (file)
--- a/include/simgrid/kernel/routing/NetPoint.hpp
+++ b/include/simgrid/kernel/routing/NetPoint.hpp
@@ -28,7 +28,7 @@ class NetPoint : public xbt::Extendable<NetPoint> {
 public:
   enum class Type { Host, Router, NetZone };
 
 public:
   enum class Type { Host, Router, NetZone };
 

-  NetPoint(const std::string& name, NetPoint::Type component_type, NetZoneImpl* netzone_p);
+  NetPoint(const std::string& name, NetPoint::Type component_type);

 
   // Our rank in the vertices_ array of the netzone that contains us.
   unsigned int id() const { return id_; }
 
   // Our rank in the vertices_ array of the netzone that contains us.
   unsigned int id() const { return id_; }


@@ -36,6 +36,8 @@ public:
   const char* get_cname() const { return name_.c_str(); }
   /** @brief the NetZone in which this NetPoint is included */
   NetZoneImpl* get_englobing_zone() { return englobing_zone_; }
   const char* get_cname() const { return name_.c_str(); }
   /** @brief the NetZone in which this NetPoint is included */
   NetZoneImpl* get_englobing_zone() { return englobing_zone_; }

+  /** @brief Set the NetZone in which this NetPoint is included */
+  NetPoint* set_englobing_zone(NetZoneImpl* netzone_p);

 
   bool is_netzone() const { return component_type_ == Type::NetZone; }
   bool is_host() const { return component_type_ == Type::Host; }
 
   bool is_netzone() const { return component_type_ == Type::NetZone; }
   bool is_host() const { return component_type_ == Type::Host; }


@@ -46,7 +48,7 @@ public:
   bool operator<(const NetPoint& rhs) const { return name_ < rhs.name_; }
 
 private:
   bool operator<(const NetPoint& rhs) const { return name_ < rhs.name_; }
 
 private:

-  unsigned int id_;
+  unsigned int id_ = -1;

   std::string name_;
   NetPoint::Type component_type_;
   NetZoneImpl* englobing_zone_;
   std::string name_;
   NetPoint::Type component_type_;
   NetZoneImpl* englobing_zone_;