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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
network_cm02.cpp
diff --git
a/src/surf/network_cm02.cpp
b/src/surf/network_cm02.cpp
index
fd81be3
..
21f8106
100644
(file)
--- a/
src/surf/network_cm02.cpp
+++ b/
src/surf/network_cm02.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2013-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-161,7
+161,8
@@
void surf_network_model_init_Vegas(void)
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
-void NetworkCm02Model::initialize()
+NetworkCm02Model::NetworkCm02Model()
+ :NetworkModel()
{
char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
int select =
{
char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
int select =
@@
-689,8
+690,4
@@
void NetworkCm02Action::updateRemainingLazy(double now)
m_lastUpdate = now;
m_lastValue = lmm_variable_getvalue(getVariable());
}
m_lastUpdate = now;
m_lastValue = lmm_variable_getvalue(getVariable());
}
-void NetworkCm02Action::recycle()
-{
- return;
-}