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
model-checker : don't need to reset the result of simcal actually, remove unnecessary...
[simgrid.git]
/
src
/
surf
/
maxmin.c
diff --git
a/src/surf/maxmin.c
b/src/surf/maxmin.c
index
a441d1e
..
3d49f84
100644
(file)
--- a/
src/surf/maxmin.c
+++ b/
src/surf/maxmin.c
@@
-21,7
+21,7
@@
typedef struct s_dyn_light {
int size;
} s_dyn_light_t, *dyn_light_t;
int size;
} s_dyn_light_t, *dyn_light_t;
-
double
sg_maxmin_precision = 0.00001;
+
XBT_EXPORT_NO_IMPORT(double)
sg_maxmin_precision = 0.00001;
static void *lmm_variable_mallocator_new_f(void);
static void lmm_variable_mallocator_free_f(void *var);
static void *lmm_variable_mallocator_new_f(void);
static void lmm_variable_mallocator_free_f(void *var);
@@
-32,6
+32,10
@@
static void lmm_remove_all_modified_set(lmm_system_t sys);
static int Global_debug_id = 1;
static int Global_const_debug_id = 1;
static int Global_debug_id = 1;
static int Global_const_debug_id = 1;
+static void lmm_var_free(lmm_system_t sys, lmm_variable_t var);
+static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,
+ lmm_constraint_t cnst);
+
lmm_system_t lmm_system_new(int selective_update)
{
lmm_system_t l = NULL;
lmm_system_t lmm_system_new(int selective_update)
{
lmm_system_t l = NULL;
@@
-385,7
+389,7
@@
static XBT_INLINE void saturated_constraint_set_update(double usage,
} else if (*min_usage == usage) {
if(saturated_constraint_set->pos == saturated_constraint_set->size) { // realloc the size
saturated_constraint_set->size *= 2;
} else if (*min_usage == usage) {
if(saturated_constraint_set->pos == saturated_constraint_set->size) { // realloc the size
saturated_constraint_set->size *= 2;
- saturated_constraint_set->data = realloc(saturated_constraint_set->data, (saturated_constraint_set->size) * sizeof(int));
+ saturated_constraint_set->data =
xbt_
realloc(saturated_constraint_set->data, (saturated_constraint_set->size) * sizeof(int));
}
saturated_constraint_set->data[saturated_constraint_set->pos] = cnst_light_num;
saturated_constraint_set->pos++;
}
saturated_constraint_set->data[saturated_constraint_set->pos] = cnst_light_num;
saturated_constraint_set->pos++;
@@
-659,7
+663,6
@@
void lmm_solve(lmm_system_t sys)
make_elem_inactive(elem);
elem_list = &(cnst->element_set);
xbt_swag_foreach(elem, elem_list) {
make_elem_inactive(elem);
elem_list = &(cnst->element_set);
xbt_swag_foreach(elem, elem_list) {
- make_elem_active(elem);
if (elem->variable->weight <= 0 || elem->variable->value > 0)
break;
if (elem->value > 0)
if (elem->variable->weight <= 0 || elem->variable->value > 0)
break;
if (elem->value > 0)