no need for a NetCard and a NetCardImpl when both are in the same file

[simgrid.git] / src / surf / surf_routing.hpp

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index e18ccc5..72680dc 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2016. 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. */
@@ -11,7 +10,6 @@
 #include <xbt/signal.hpp>
 
 #include "surf_interface.hpp"
-#include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML.
 #include "src/kernel/routing/AsImpl.hpp"
 
 #include <float.h>
@@ -43,36 +41,30 @@ class RoutingPlatf;
  */
 class NetCard {
 public:
-  virtual ~NetCard()            = default;
-  virtual unsigned int id()=0; // Our rank in the vertices_ array of our containing AS.
-  virtual std::string name()    = 0;
-  virtual AsImpl *containingAS()=0; // This is the AS in which I am
-  virtual bool isAS()=0;
-  virtual bool isHost()=0;
-  virtual bool isRouter()=0;
   enum class Type {
     Host, Router, As
   };
-};
 
-struct XBT_PRIVATE NetCardImpl : public NetCard {
-public:
-  NetCardImpl(std::string name, NetCard::Type componentType, AsImpl* containingAS)
+  NetCard(std::string name, NetCard::Type componentType, AsImpl* containingAS)
       : name_(name), componentType_(componentType), containingAS_(containingAS)
   {
     if (containingAS != nullptr)
       id_ = containingAS->addComponent(this);
     simgrid::kernel::routing::netcardCreatedCallbacks(this);
   }
-  ~NetCardImpl() = default;
+  ~NetCard() = default;
 
-  unsigned int id()  override {return id_;}
-  std::string name() override { return name_; }
-  AsImpl *containingAS() override {return containingAS_;}
+  // Our rank in the vertices_ array of our containing AS.
+  unsigned int id()      {return id_;}
+  std::string name()     { return name_; }
+  const char* cname()    { return name_.c_str(); }
+  // This is the AS in which I am
+  AsImpl *containingAS() {return containingAS_;}
+
+  bool isAS()            {return componentType_ == Type::As;}
+  bool isHost()          {return componentType_ == Type::Host;}
+  bool isRouter()        {return componentType_ == Type::Router;}
 
-  bool isAS()        override {return componentType_ == Type::As;}
-  bool isHost()      override {return componentType_ == Type::Host;}
-  bool isRouter()    override {return componentType_ == Type::Router;}
 
 private:
   unsigned int id_;
@@ -100,17 +92,6 @@ public:
   Link* link_;
 };
 
-/** @ingroup SURF_routing_interface
- * @brief The class representing a whole routing platform
- */
-XBT_PUBLIC_CLASS RoutingPlatf {
-public:
-  explicit RoutingPlatf();
-  ~RoutingPlatf();
-  AsImpl *root_ = nullptr;
-  void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
-};
-
 }}}
 
 #endif /* NETWORK_ROUTING_HPP_ */