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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[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
5f498f4
..
e5258f8
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 <xbt/base.h>
-#include "surf_routing_
generic
.hpp"
+#include "surf_routing_
RoutedGraph
.hpp"
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
@@
-20,22
+20,21
@@
namespace surf {
***********/
class XBT_PRIVATE AsFloyd;
***********/
class XBT_PRIVATE AsFloyd;
-class AsFloyd: public AsGeneric {
+/** Floyd routing data: slow initialization, fast lookup, lesser memory requirements, shortest path routing only */
+class AsFloyd: public AsRoutedGraph {
public:
public:
- AsFloyd();
+ AsFloyd(
const char *name
);
~AsFloyd();
void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
~AsFloyd();
void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
- xbt_dynar_t getOneLinkRoutes() override;
- void parseASroute(sg_platf_route_cbarg_t route) override;
- void parseRoute(sg_platf_route_cbarg_t route) override;
- void end();
+ void addRoute(sg_platf_route_cbarg_t route) override;
+ void Seal() override;
private:
/* vars to compute the Floyd algorithm. */
private:
/* vars to compute the Floyd algorithm. */
- int *p
_predecessorTable
;
- double *
p_costTable
;
- sg_platf_route_cbarg_t *
p_linkTable
;
+ int *p
redecessorTable_
;
+ double *
costTable_
;
+ sg_platf_route_cbarg_t *
linkTable_
;
};
}
};
}