Fat trees progress

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

diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp
index 1c39826..1430c43 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -53,7 +53,7 @@ public:
   ~AsClusterFatTree();
   virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
                                   sg_platf_route_cbarg_t into,
-                                  double *latency) const;
+                                  double *latency);
   // virtual void getRouteAndLatency(const int src, const int dst,
   //                                 std::vector<NetworkLink> *route,
   //                                 double *latency) const;
@@ -65,15 +65,15 @@ public:
 protected:
   //description of a PGFT (TODO : better doc)
   unsigned int levels;
-  std::vector<int> lowerLevelNodesNumber;
-  std::vector<int> upperLevelNodesNumber;
+  std::vector<int> lowerLevelNodesNumber; // number of children by node
+  std::vector<int> upperLevelNodesNumber; // number of parents by node
   std::vector<int> lowerLevelPortsNumber;
   
   std::vector<FatTreeNode*> nodes;
   std::map<std::pair<int,int>, FatTreeLink*> links;
-  std::vector<int> nodesByLevel;
+  std::vector<unsigned int> nodesByLevel;
 
   void addLink(FatTreeNode *parent, FatTreeNode *child);
-  void getLevelPosition(const int level, int &position, int &size);
+  void getLevelPosition(const unsigned int level, int *position, int *size);
 };
 #endif