X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bcc1dbe28f658ea786ba234a679601edd30758a..2f4b313c80827568ce888a6bc1575739d002a6c3:/src/surf/network_ib.hpp

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index 26a27eaf46..df41a8873a 100644
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
+/* Copyright (c) 2014-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,51 +7,60 @@
 #ifndef SURF_NETWORK_IB_HPP_
 #define SURF_NETWORK_IB_HPP_
 
-#include <xbt/base.h>
-
-#include "network_smpi.hpp"
-class XBT_PRIVATE IBNode;
-
-class XBT_PRIVATE ActiveComm{
-public :
-  //IBNode* origin;
-  IBNode* destination;
-  NetworkAction *action;
-  double init_rate;
-  ActiveComm() : destination(NULL),action(NULL),init_rate(-1){};
-  ~ActiveComm(){};
-};
-
-class IBNode{
-public :
-  int id;
-    //store related links, to ease computation of the penalties
-  std::vector<ActiveComm*> ActiveCommsUp;
-  //store the number of comms received from each node
-  std::map<IBNode*, int> ActiveCommsDown;
-  //number of comms the node is receiving
-  int nbActiveCommsDown;
-  IBNode(int id) : id(id),nbActiveCommsDown(0){};
-  ~IBNode(){};
-};
-
-class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
-private:
-  void updateIBfactors_rec(IBNode *root, bool* updatedlist);
-  void computeIBfactors(IBNode *root);
-public:
-  NetworkIBModel();
-  NetworkIBModel(const char *name);
-  ~NetworkIBModel();
-  void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
-  
-  xbt_dict_t active_nodes;
-  std::map<NetworkAction *, std::pair<IBNode*,IBNode*> > active_comms;
-  
-  double Bs;
-  double Be;
-  double ys;
-
-};
+#include "src/surf/network_smpi.hpp"
+#include "xbt/base.h"
+
+#include <unordered_map>
+#include <vector>
+
+namespace simgrid {
+  namespace surf {
+
+    class XBT_PRIVATE IBNode;
+
+    class XBT_PRIVATE ActiveComm{
+    public :
+      //IBNode* origin;
+      IBNode* destination;
+      NetworkAction *action;
+      double init_rate;
+      ActiveComm() : destination(nullptr),action(nullptr),init_rate(-1){};
+      virtual ~ActiveComm() = default;
+    };
+
+    class IBNode{
+    public :
+      int id;
+      //store related links, to ease computation of the penalties
+      std::vector<ActiveComm*> ActiveCommsUp;
+      //store the number of comms received from each node
+      std::map<IBNode*, int> ActiveCommsDown;
+      //number of comms the node is receiving
+      int nbActiveCommsDown;
+      explicit IBNode(int id) : id(id),nbActiveCommsDown(0){};
+      virtual ~IBNode() = default;
+    };
+
+    class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
+    private:
+      void updateIBfactors_rec(IBNode* root, std::vector<bool>& updatedlist);
+      void computeIBfactors(IBNode *root);
+    public:
+      NetworkIBModel();
+      explicit NetworkIBModel(const char *name);
+      ~NetworkIBModel() override;
+      void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
+
+      std::unordered_map<std::string, IBNode*> active_nodes;
+      std::unordered_map<NetworkAction*, std::pair<IBNode*, IBNode*>> active_comms;
+
+      double Bs;
+      double Be;
+      double ys;
+
+    };
+
+  }
+}
 
 #endif