A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
give a default value at field declaration, not everywhere in subclasses
[simgrid.git]
/
src
/
surf
/
surf_routing_floyd.hpp
diff --git
a/src/surf/surf_routing_floyd.hpp
b/src/surf/surf_routing_floyd.hpp
index
56b6805
..
7619697
100644
(file)
--- a/
src/surf/surf_routing_floyd.hpp
+++ b/
src/surf/surf_routing_floyd.hpp
@@
-1,21
+1,31
@@
-#include "surf_routing_generic.hpp"
+/* Copyright (c) 2013-2015. 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. */
+
#ifndef SURF_ROUTING_FLOYD_HPP_
#define SURF_ROUTING_FLOYD_HPP_
#ifndef SURF_ROUTING_FLOYD_HPP_
#define SURF_ROUTING_FLOYD_HPP_
+#include <xbt/base.h>
+
+#include "surf_routing_generic.hpp"
+
+namespace simgrid {
+namespace surf {
/***********
* Classes *
***********/
/***********
* Classes *
***********/
-class AsFloyd;
-typedef AsFloyd *AsFloydPtr;
+class XBT_PRIVATE AsFloyd;
class AsFloyd: public AsGeneric {
public:
AsFloyd();
~AsFloyd();
class AsFloyd: public AsGeneric {
public:
AsFloyd();
~AsFloyd();
- void getRouteAndLatency(RoutingEdge
Ptr src, RoutingEdgePtr
dst, sg_platf_route_cbarg_t into, double *latency);
+ void getRouteAndLatency(RoutingEdge
*src, RoutingEdge *
dst, sg_platf_route_cbarg_t into, double *latency);
xbt_dynar_t getOneLinkRoutes();
void parseASroute(sg_platf_route_cbarg_t route);
void parseRoute(sg_platf_route_cbarg_t route);
xbt_dynar_t getOneLinkRoutes();
void parseASroute(sg_platf_route_cbarg_t route);
void parseRoute(sg_platf_route_cbarg_t route);
@@
-23,14
+33,14
@@
public:
//void parseASroute(sg_platf_route_cbarg_t route);
//void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
//void parseASroute(sg_platf_route_cbarg_t route);
//void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
- //sg_platf_route_cbarg_t getBypassRoute(RoutingEdge
Ptr src, RoutingEdgePtr
dst, double *lat);
+ //sg_platf_route_cbarg_t getBypassRoute(RoutingEdge
*src, RoutingEdge *
dst, double *lat);
/* The parser calls the following functions to inform the routing models
* that a new element is added to the AS currently built.
*
* Of course, only the routing model of this AS is informed, not every ones */
/* The parser calls the following functions to inform the routing models
* that a new element is added to the AS currently built.
*
* Of course, only the routing model of this AS is informed, not every ones */
- //int parsePU(RoutingEdge
Ptr
elm); /* A host or a router, whatever */
- //int parseAS(RoutingEdge
Ptr
elm);
+ //int parsePU(RoutingEdge
*
elm); /* A host or a router, whatever */
+ //int parseAS(RoutingEdge
*
elm);
//virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
//virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
@@
-40,6
+50,7
@@
public:
sg_platf_route_cbarg_t *p_linkTable;
};
sg_platf_route_cbarg_t *p_linkTable;
};
-
+}
+}
#endif /* SURF_ROUTING_FLOYD_HPP_ */
#endif /* SURF_ROUTING_FLOYD_HPP_ */