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
[routing] rename routing_global_t -> routing_platf_t (and friends)
[simgrid.git]
/
src
/
surf
/
maxmin.c
diff --git
a/src/surf/maxmin.c
b/src/surf/maxmin.c
index
db76f87
..
349093c
100644
(file)
--- a/
src/surf/maxmin.c
+++ b/
src/surf/maxmin.c
@@
-320,6
+320,16
@@
XBT_INLINE lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
return NULL;
}
return NULL;
}
+XBT_INLINE double lmm_get_cnst_weight_from_var(lmm_system_t sys,
+ lmm_variable_t var,
+ int num)
+{
+ if (num < var->cnsts_number)
+ return (var->cnsts[num].value);
+ else
+ return 0.0;
+}
+
XBT_INLINE int lmm_get_number_of_cnst_from_var(lmm_system_t sys,
lmm_variable_t var)
{
XBT_INLINE int lmm_get_number_of_cnst_from_var(lmm_system_t sys,
lmm_variable_t var)
{
@@
-350,7
+360,7
@@
XBT_INLINE void *lmm_variable_id(lmm_variable_t var)
return var->id;
}
return var->id;
}
-static XBT_INLINE
void
saturated_constraint_set_update(lmm_system_t sys,
+static XBT_INLINE
int
saturated_constraint_set_update(lmm_system_t sys,
lmm_constraint_t
cnst,
double *min_usage)
lmm_constraint_t
cnst,
double *min_usage)
@@
-360,11
+370,11
@@
static XBT_INLINE void saturated_constraint_set_update(lmm_system_t sys,
XBT_IN("sys=%p, cnst=%p, min_usage=%f", sys, cnst, *min_usage);
if (cnst->usage <= 0) {
XBT_OUT();
XBT_IN("sys=%p, cnst=%p, min_usage=%f", sys, cnst, *min_usage);
if (cnst->usage <= 0) {
XBT_OUT();
- return;
+ return
1
;
}
if (cnst->remaining <= 0) {
XBT_OUT();
}
if (cnst->remaining <= 0) {
XBT_OUT();
- return;
+ return
1
;
}
if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
*min_usage = cnst->remaining / cnst->usage;
}
if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
*min_usage = cnst->remaining / cnst->usage;
@@
-380,6
+390,7
@@
static XBT_INLINE void saturated_constraint_set_update(lmm_system_t sys,
xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
}
XBT_OUT();
xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
}
XBT_OUT();
+ return 0;
}
static XBT_INLINE void saturated_variable_set_update(lmm_system_t sys)
}
static XBT_INLINE void saturated_variable_set_update(lmm_system_t sys)
@@
-500,6
+511,7
@@
void lmm_solve(lmm_system_t sys)
{
lmm_variable_t var = NULL;
lmm_constraint_t cnst = NULL;
{
lmm_variable_t var = NULL;
lmm_constraint_t cnst = NULL;
+ lmm_constraint_t cnst_next = NULL;
lmm_element_t elem = NULL;
xbt_swag_t cnst_list = NULL;
xbt_swag_t var_list = NULL;
lmm_element_t elem = NULL;
xbt_swag_t cnst_list = NULL;
xbt_swag_t var_list = NULL;
@@
-533,7
+545,7
@@
void lmm_solve(lmm_system_t sys)
}
}
}
}
- xbt_swag_foreach
(cns
t, cnst_list) {
+ xbt_swag_foreach
_safe(cnst, cnst_nex
t, cnst_list) {
/* INIT */
cnst->remaining = cnst->bound;
if (cnst->remaining == 0)
/* INIT */
cnst->remaining = cnst->bound;
if (cnst->remaining == 0)
@@
-557,6
+569,10
@@
void lmm_solve(lmm_system_t sys)
}
XBT_DEBUG("Constraint Usage '%d' : %f", cnst->id_int, cnst->usage);
/* Saturated constraints update */
}
XBT_DEBUG("Constraint Usage '%d' : %f", cnst->id_int, cnst->usage);
/* Saturated constraints update */
+ if(cnst->usage>0) {
+ xbt_swag_remove(cnst, cnst_list);
+ xbt_swag_insert_at_head(cnst, cnst_list);
+ }
saturated_constraint_set_update(sys, cnst, &min_usage);
}
saturated_variable_set_update(sys);
saturated_constraint_set_update(sys, cnst, &min_usage);
}
saturated_variable_set_update(sys);
@@
-611,6
+627,10
@@
void lmm_solve(lmm_system_t sys)
if (cnst->shared) {
double_update(&(cnst->remaining), elem->value * var->value);
double_update(&(cnst->usage), elem->value / var->weight);
if (cnst->shared) {
double_update(&(cnst->remaining), elem->value * var->value);
double_update(&(cnst->usage), elem->value / var->weight);
+ if(cnst->usage<=0 || cnst->remaining<=0) {
+ xbt_swag_remove(cnst, cnst_list);
+ xbt_swag_insert_at_tail(cnst, cnst_list);
+ }
make_elem_inactive(elem);
} else { /* FIXME one day: We recompute usage.... :( */
cnst->usage = 0.0;
make_elem_inactive(elem);
} else { /* FIXME one day: We recompute usage.... :( */
cnst->usage = 0.0;
@@
-637,8
+657,9
@@
void lmm_solve(lmm_system_t sys)
/* Find out which variables reach the maximum */
min_usage = -1;
min_bound = -1;
/* Find out which variables reach the maximum */
min_usage = -1;
min_bound = -1;
+
xbt_swag_foreach(cnst, cnst_list) {
xbt_swag_foreach(cnst, cnst_list) {
-
saturated_constraint_set_update(sys, cnst, &min_usage)
;
+
if(saturated_constraint_set_update(sys, cnst, &min_usage)) break
;
}
saturated_variable_set_update(sys);
}
saturated_variable_set_update(sys);