rename AsGeneric into AsRoutedGraph

diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_RoutedGraph.cpp
similarity index 96%
rename from src/surf/surf_routing_generic.cpp
rename to src/surf/surf_routing_RoutedGraph.cpp
index 526b4d2..c4c5982 100644 (file)
--- a/src/surf/surf_routing_generic.cpp
+++ b/src/surf/surf_routing_RoutedGraph.cpp
@@ -4,6 +4,8 @@
 /* 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. */
 
+#include "surf_routing_RoutedGraph.hpp"
+
 #include <cstdlib>
 
 #include <algorithm>
@@ -16,7 +18,6 @@
 
 #include "simgrid/platf_interface.h"    // platform creation API internal interface
 
-#include "surf_routing_generic.hpp"
 #include "surf_routing_private.hpp"
 #include "network_interface.hpp"
 
@@ -35,17 +36,17 @@ void routing_route_free(sg_platf_route_cbarg_t route)
 namespace simgrid {
 namespace surf {
   
-AsGeneric::AsGeneric(const char*name)
+AsRoutedGraph::AsRoutedGraph(const char*name)
   : As(name)
 {
 }
 
-AsGeneric::~AsGeneric()
+AsRoutedGraph::~AsRoutedGraph()
 {
   xbt_dict_free(&bypassRoutes_);
 }
 
-void AsGeneric::parseBypassroute(sg_platf_route_cbarg_t e_route)
+void AsRoutedGraph::parseBypassroute(sg_platf_route_cbarg_t e_route)
 {
   char *src = (char*)(e_route->src);
   char *dst = (char*)(e_route->dst);
@@ -132,7 +133,7 @@ xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d,
 namespace simgrid {
 namespace surf {
 
-void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
+void AsRoutedGraph::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
 {
   int src, dst;
   int table_size = xbt_dynar_length(vertices_);
@@ -195,7 +196,7 @@ void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
   }
 }
 
-sg_platf_route_cbarg_t AsGeneric::getBypassRoute(NetCard *src,
+sg_platf_route_cbarg_t AsRoutedGraph::getBypassRoute(NetCard *src,
                                                NetCard *dst,
                                                double *lat)
 {
@@ -333,7 +334,7 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(NetCard *src,
 /* ************************************************************************** */
 /* ************************* GENERIC AUX FUNCTIONS ************************** */
 /* change a route containing link names into a route containing link entities */
-sg_platf_route_cbarg_t AsGeneric::newExtendedRoute(e_surf_routing_hierarchy_t hierarchy,
+sg_platf_route_cbarg_t AsRoutedGraph::newExtendedRoute(e_surf_routing_hierarchy_t hierarchy,
       sg_platf_route_cbarg_t routearg, int change_order) {
 
   sg_platf_route_cbarg_t result;
@@ -371,7 +372,7 @@ sg_platf_route_cbarg_t AsGeneric::newExtendedRoute(e_surf_routing_hierarchy_t hi
   return result;
 }
 
-void AsGeneric::getRouteCheckParams(NetCard *src, NetCard *dst)
+void AsRoutedGraph::getRouteCheckParams(NetCard *src, NetCard *dst)
 {
   xbt_assert(src,"Cannot find a route from NULL to %s", dst->name());
   xbt_assert(dst,"Cannot find a route from %s to NULL", src->name());
@@ -386,7 +387,7 @@ void AsGeneric::getRouteCheckParams(NetCard *src, NetCard *dst)
       "Internal error: route destination %s@%s is not in AS %s as expected (route source: %s@%s). Please report that bug.",
         src->name(), dst->name(),  src_as->name_, dst_as->name_,  name_);
 }
-void AsGeneric::addRouteCheckParams(sg_platf_route_cbarg_t route) {
+void AsRoutedGraph::addRouteCheckParams(sg_platf_route_cbarg_t route) {
   const char *srcName = route->src;
   const char *dstName = route->dst;
   NetCard *src = sg_netcard_by_name_or_null(srcName);

diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_RoutedGraph.hpp
similarity index 89%
rename from src/surf/surf_routing_generic.hpp
rename to src/surf/surf_routing_RoutedGraph.hpp
index 073a2d4..dcb5ee6 100644 (file)
--- a/src/surf/surf_routing_generic.hpp
+++ b/src/surf/surf_routing_RoutedGraph.hpp
@@ -14,12 +14,12 @@
 namespace simgrid {
 namespace surf {
 
-class XBT_PRIVATE AsGeneric;
+class XBT_PRIVATE AsRoutedGraph;
 
-class XBT_PRIVATE AsGeneric : public As {
+class XBT_PRIVATE AsRoutedGraph : public As {
 public:
-  AsGeneric(const char*name);
-  ~AsGeneric();
+  AsRoutedGraph(const char*name);
+  ~AsRoutedGraph();
 
   virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
   virtual sg_platf_route_cbarg_t getBypassRoute(NetCard *src, NetCard *dst, double *lat) override;

diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp
index 12f3eea..c0ae31a 100644 (file)
--- a/src/surf/surf_routing_dijkstra.cpp
+++ b/src/surf/surf_routing_dijkstra.cpp
@@ -343,7 +343,7 @@ AsDijkstra::~AsDijkstra()
 /* Creation routing model functions */
 
 AsDijkstra::AsDijkstra(const char*name, bool cached)
-  : AsGeneric(name)
+  : AsRoutedGraph(name)
 {
   if (cached)
     routeCache_ = xbt_dict_new_homogeneous(&route_cache_elem_free);

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index b745657..ae5e000 100644 (file)
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -6,7 +6,7 @@
 
 #include <xbt/base.h>
 
-#include "surf_routing_generic.hpp"
+#include "surf_routing_RoutedGraph.hpp"
 
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
 #define SURF_ROUTING_DIJKSTRA_HPP_
@@ -35,7 +35,7 @@ namespace surf {
 class XBT_PRIVATE AsDijkstra;
 
 /** Dijkstra routing data: fast initialization, slow lookup, small memory requirements, shortest path routing only */
-class AsDijkstra : public AsGeneric {
+class AsDijkstra : public AsRoutedGraph {
 public:
   AsDijkstra(const char*name, bool cached);
   void Seal() override;

diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp
index 61afe49..0ce0fe6 100644 (file)
--- a/src/surf/surf_routing_floyd.cpp
+++ b/src/surf/surf_routing_floyd.cpp
@@ -18,7 +18,7 @@ namespace simgrid {
 namespace surf {
 
 AsFloyd::AsFloyd(const char*name)
-  : AsGeneric(name)
+  : AsRoutedGraph(name)
 {
   predecessorTable_ = NULL;
   costTable_ = NULL;

diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp
index 50bd652..67f1f6d 100644 (file)
--- a/src/surf/surf_routing_floyd.hpp
+++ b/src/surf/surf_routing_floyd.hpp
@@ -10,7 +10,7 @@
 
 #include <xbt/base.h>
 
-#include "surf_routing_generic.hpp"
+#include "surf_routing_RoutedGraph.hpp"
 
 namespace simgrid {
 namespace surf {
@@ -21,7 +21,7 @@ namespace surf {
 class XBT_PRIVATE AsFloyd;
 
 /** Floyd routing data: slow initialization, fast lookup, lesser memory requirements, shortest path routing only */
-class AsFloyd: public AsGeneric {
+class AsFloyd: public AsRoutedGraph {
 public:
   AsFloyd(const char *name);
   ~AsFloyd();

diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp
index d452c3e..f23626a 100644 (file)
--- a/src/surf/surf_routing_full.cpp
+++ b/src/surf/surf_routing_full.cpp
@@ -15,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
 namespace simgrid {
 namespace surf {
   AsFull::AsFull(const char*name)
-    : AsGeneric(name)
+    : AsRoutedGraph(name)
   {
   }
 

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index 9dfc1e2..30dd1cb 100644 (file)
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -9,7 +9,7 @@
 
 #include <xbt/base.h>
 
-#include "surf_routing_generic.hpp"
+#include "surf_routing_RoutedGraph.hpp"
 
 namespace simgrid {
 namespace surf {
@@ -20,7 +20,7 @@ namespace surf {
 class XBT_PRIVATE AsFull;
 
 /** Full routing: fast, large memory requirements, fully expressive */
-class AsFull: public AsGeneric {
+class AsFull: public AsRoutedGraph {
 public:
 
   AsFull(const char*name);

diff --git a/src/surf/surf_routing_vivaldi.cpp b/src/surf/surf_routing_vivaldi.cpp
index 2bba1db..377c13f 100644 (file)
--- a/src/surf/surf_routing_vivaldi.cpp
+++ b/src/surf/surf_routing_vivaldi.cpp
@@ -25,7 +25,7 @@ static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dyn
 namespace simgrid {
 namespace surf {
   AsVivaldi::AsVivaldi(const char *name)
-    : AsGeneric(name)
+    : AsRoutedGraph(name)
   {}
 
 void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)

diff --git a/src/surf/surf_routing_vivaldi.hpp b/src/surf/surf_routing_vivaldi.hpp
index 003b942..3ab9c59 100644 (file)
--- a/src/surf/surf_routing_vivaldi.hpp
+++ b/src/surf/surf_routing_vivaldi.hpp
@@ -4,9 +4,9 @@
 /* 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. */
 
+#include "surf_routing_RoutedGraph.hpp"
 #include "xbt/swag.h"
 
-#include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_VIVALDI_HPP_
 #define SURF_ROUTING_VIVALDI_HPP_
@@ -23,7 +23,7 @@ namespace surf {
  ***********/
 class XBT_PRIVATE AsVivaldi;
 
-class AsVivaldi: public AsGeneric {
+class AsVivaldi: public AsRoutedGraph {
 public:
   AsVivaldi(const char *name);
   ~AsVivaldi() {};

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index d49e39f..cc3b711 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -75,7 +75,7 @@ set(EXTRA_DIST
   src/surf/surf_routing_dijkstra.hpp
   src/surf/surf_routing_floyd.hpp
   src/surf/surf_routing_full.hpp
-  src/surf/surf_routing_generic.hpp
+  src/surf/surf_routing_RoutedGraph.hpp
   src/surf/surf_routing_none.hpp
   src/surf/surf_routing_private.hpp
   src/surf/surf_routing_vivaldi.hpp
@@ -333,7 +333,7 @@ set(SURF_SRC
   src/surf/surf_routing_dijkstra.cpp
   src/surf/surf_routing_floyd.cpp
   src/surf/surf_routing_full.cpp
-  src/surf/surf_routing_generic.cpp
+  src/surf/surf_routing_RoutedGraph.cpp
   src/surf/surf_routing_none.cpp
   src/surf/surf_routing_vivaldi.cpp
   src/surf/surfxml_parse.cpp