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
David's patch: replace != by strcmp
[simgrid.git]
/
src
/
surf
/
maxmin_private.h
diff --git
a/src/surf/maxmin_private.h
b/src/surf/maxmin_private.h
index
947e1c8
..
7b82d55
100644
(file)
--- a/
src/surf/maxmin_private.h
+++ b/
src/surf/maxmin_private.h
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-20,7
+19,7
@@
typedef struct lmm_element {
lmm_constraint_t constraint;
lmm_variable_t variable;
double value;
lmm_constraint_t constraint;
lmm_variable_t variable;
double value;
-} s_lmm_element_t
, *lmm_element_t
;
+} s_lmm_element_t;
#define make_elem_active(elem) xbt_swag_insert_at_head(elem,&(elem->constraint->active_element_set))
#define make_elem_inactive(elem) xbt_swag_remove(elem,&(elem->constraint->active_element_set))
#define make_elem_active(elem) xbt_swag_insert_at_head(elem,&(elem->constraint->active_element_set))
#define make_elem_inactive(elem) xbt_swag_remove(elem,&(elem->constraint->active_element_set))
@@
-28,10
+27,11
@@
typedef struct lmm_constraint {
/* hookup to system */
s_xbt_swag_hookup_t constraint_set_hookup;
s_xbt_swag_hookup_t active_constraint_set_hookup;
/* hookup to system */
s_xbt_swag_hookup_t constraint_set_hookup;
s_xbt_swag_hookup_t active_constraint_set_hookup;
+ s_xbt_swag_hookup_t modified_constraint_set_hookup;
s_xbt_swag_hookup_t saturated_constraint_set_hookup;
s_xbt_swag_hookup_t saturated_constraint_set_hookup;
- s_xbt_swag_t element_set; /* a list of lmm_mat_element_t */
- s_xbt_swag_t active_element_set; /* a list of lmm_mat_element_t */
+ s_xbt_swag_t element_set;
/* a list of lmm_mat_element_t */
+ s_xbt_swag_t active_element_set;
/* a list of lmm_mat_element_t */
double bound;
double lambda;
double new_lambda;
double bound;
double lambda;
double new_lambda;
@@
-39,6
+39,7
@@
typedef struct lmm_constraint {
int shared;
double usage;
void *id;
int shared;
double usage;
void *id;
+ int id_int;
} s_lmm_constraint_t;
typedef struct lmm_variable {
} s_lmm_constraint_t;
typedef struct lmm_variable {
@@
-53,24
+54,28
@@
typedef struct lmm_variable {
double bound;
double value;
void *id;
double bound;
double value;
void *id;
- int i
ndex; /* FOR SDP ONLY */
+ int i
d_int;
/* \begin{For Lagrange only} */
double mu;
double new_mu;
/* \begin{For Lagrange only} */
double mu;
double new_mu;
- double df; /* Total delay of flow */
- double (* func_fpi) (struct lmm_variable *var, double x); /* (f')^{-1} */
+ double (*func_f) (struct lmm_variable * var, double x); /* (f) */
+ double (*func_fp) (struct lmm_variable * var, double x); /* (f') */
+ double (*func_fpi) (struct lmm_variable * var, double x); /* (f')^{-1} */
/* \end{For Lagrange only} */
} s_lmm_variable_t;
typedef struct lmm_system {
int modified;
/* \end{For Lagrange only} */
} s_lmm_variable_t;
typedef struct lmm_system {
int modified;
- s_xbt_swag_t variable_set; /* a list of lmm_variable_t */
- s_xbt_swag_t constraint_set; /* a list of lmm_constraint_t */
+ int selective_update_active; /* flag to update partially the system only selecting changed portions */
+
+ s_xbt_swag_t variable_set; /* a list of lmm_variable_t */
+ s_xbt_swag_t constraint_set; /* a list of lmm_constraint_t */
- s_xbt_swag_t active_constraint_set; /* a list of lmm_constraint_t */
+ s_xbt_swag_t active_constraint_set; /* a list of lmm_constraint_t */
+ s_xbt_swag_t modified_constraint_set; /* a list of modified lmm_constraint_t */
- s_xbt_swag_t saturated_variable_set; /* a list of lmm_variable_t */
- s_xbt_swag_t saturated_constraint_set; /* a list of lmm_constraint_t_t */
+ s_xbt_swag_t saturated_variable_set;
/* a list of lmm_variable_t */
+ s_xbt_swag_t saturated_constraint_set;
/* a list of lmm_constraint_t_t */
xbt_mallocator_t variable_mallocator;
} s_lmm_system_t;
xbt_mallocator_t variable_mallocator;
} s_lmm_system_t;
@@
-87,8
+92,13
@@
typedef struct lmm_system {
#define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst)
static void lmm_var_free(lmm_system_t sys, lmm_variable_t var);
#define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst)
static void lmm_var_free(lmm_system_t sys, lmm_variable_t var);
-static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst);
+static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,
+ lmm_constraint_t cnst);
void lmm_print(lmm_system_t sys);
void lmm_print(lmm_system_t sys);
-#endif /* _SURF_MAXMIN_PRIVATE_H */
+extern double (*func_f_def) (lmm_variable_t, double);
+extern double (*func_fp_def) (lmm_variable_t, double);
+extern double (*func_fpi_def) (lmm_variable_t, double);
+
+#endif /* _SURF_MAXMIN_PRIVATE_H */