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
Revert "Uses alpha and beta from LegrandVelho model to compute finishing time of...
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
3180bbb
..
a1d6ebf
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-16,9
+16,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
int use_sdp_solver = 0;
int use_lagrange_solver = 0;
int use_sdp_solver = 0;
int use_lagrange_solver = 0;
-extern double alpha_legrandvelho;
-extern double beta_legrandvelho;
-
/* Additional declarations for Windows potability. */
#ifndef MAX_DRIVE
/* Additional declarations for Windows potability. */
#ifndef MAX_DRIVE
@@
-209,11
+206,9
@@
double generic_maxmin_share_resources(xbt_swag_t running_actions,
if (!action)
return -1.0;
if (!action)
return -1.0;
- double action_latency= lmm_variable_getdf(VARIABLE(action));
-
if (value > 0) {
if(action->remains>0)
if (value > 0) {
if(action->remains>0)
- min =
(action->remains / (value*alpha_legrandvelho)) + beta_legrandvelho*action_latency
;
+ min =
action->remains / value
;
else
min = 0.0;
if ((action->max_duration >= 0) && (action->max_duration < min))
else
min = 0.0;
if ((action->max_duration >= 0) && (action->max_duration < min))
@@
-228,7
+223,7
@@
double generic_maxmin_share_resources(xbt_swag_t running_actions,
value = lmm_variable_getvalue(VARIABLE(action));
if (value > 0) {
if(action->remains>0)
value = lmm_variable_getvalue(VARIABLE(action));
if (value > 0) {
if(action->remains>0)
- value =
(action->remains / (value*alpha_legrandvelho)) + beta_legrandvelho*action_latency
;
+ value =
action->remains / value
;
else
value = 0.0;
if (value < min) {
else
value = 0.0;
if (value < min) {