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 lmm into base to avoid diamond inheritance
[simgrid.git]
/
src
/
surf
/
network_cm02.hpp
diff --git
a/src/surf/network_cm02.hpp
b/src/surf/network_cm02.hpp
index
67a2085
..
1f72f35
100644
(file)
--- a/
src/surf/network_cm02.hpp
+++ b/
src/surf/network_cm02.hpp
@@
-11,11
+11,11
@@
class NetworkCm02Model;
typedef NetworkCm02Model *NetworkCm02ModelPtr;
class NetworkCm02Model;
typedef NetworkCm02Model *NetworkCm02ModelPtr;
-class NetworkCm02Link
Lmm
;
-typedef NetworkCm02Link
Lmm *NetworkCm02LinkLmm
Ptr;
+class NetworkCm02Link;
+typedef NetworkCm02Link
*NetworkCm02Link
Ptr;
-class NetworkCm02Action
Lmm
;
-typedef NetworkCm02Action
Lmm *NetworkCm02ActionLmm
Ptr;
+class NetworkCm02Action;
+typedef NetworkCm02Action
*NetworkCm02Action
Ptr;
/*********
* Tools *
/*********
* Tools *
@@
-60,9
+60,9
@@
public:
* Resource *
************/
* Resource *
************/
-class NetworkCm02Link
Lmm : public NetworkLinkLmm
{
+class NetworkCm02Link
: public NetworkLink
{
public:
public:
- NetworkCm02Link
Lmm
(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props,
+ NetworkCm02Link(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props,
lmm_system_t system,
double constraint_value,
tmgr_history_t history,
lmm_system_t system,
double constraint_value,
tmgr_history_t history,
@@
-81,12
+81,12
@@
public:
* Action *
**********/
* Action *
**********/
-class NetworkCm02Action
Lmm : public NetworkActionLmm
{
+class NetworkCm02Action
: public NetworkAction
{
friend ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate);
public:
friend ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate);
public:
- NetworkCm02Action
Lmm
(ModelPtr model, double cost, bool failed)
- : Action(model, cost, failed) {};
+ NetworkCm02Action(ModelPtr model, double cost, bool failed)
+ :
Network
Action(model, cost, failed) {};
void updateRemainingLazy(double now);
void recycle();
};
void updateRemainingLazy(double now);
void recycle();
};