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
Df parameter of Low models is replaced by weight because it means the same to maxmin...
[simgrid.git]
/
src
/
include
/
surf
/
maxmin.h
diff --git
a/src/include/surf/maxmin.h
b/src/include/surf/maxmin.h
index
b1524f5
..
240ad93
100644
(file)
--- a/
src/include/surf/maxmin.h
+++ b/
src/include/surf/maxmin.h
@@
-8,8
+8,8
@@
#ifndef _SURF_MAXMIN_H
#define _SURF_MAXMIN_H
#ifndef _SURF_MAXMIN_H
#define _SURF_MAXMIN_H
+#include "portable.h"
#include "xbt/misc.h"
#include "xbt/misc.h"
-#include "portable.h"
#define MAXMIN_PRECISION 0.00001
static XBT_INLINE void double_update(double *variable, double value)
#define MAXMIN_PRECISION 0.00001
static XBT_INLINE void double_update(double *variable, double value)
@@
-23,6
+23,7
@@
static XBT_INLINE int double_positive(double value)
return (value>MAXMIN_PRECISION);
}
return (value>MAXMIN_PRECISION);
}
+typedef struct lmm_element *lmm_element_t;
typedef struct lmm_variable *lmm_variable_t;
typedef struct lmm_constraint *lmm_constraint_t;
typedef struct lmm_system *lmm_system_t;
typedef struct lmm_variable *lmm_variable_t;
typedef struct lmm_constraint *lmm_constraint_t;
typedef struct lmm_system *lmm_system_t;
@@
-34,6
+35,7
@@
void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var);
XBT_PUBLIC(lmm_constraint_t) lmm_constraint_new(lmm_system_t sys, void *id,
double bound_value);
void lmm_constraint_shared(lmm_constraint_t cnst);
XBT_PUBLIC(lmm_constraint_t) lmm_constraint_new(lmm_system_t sys, void *id,
double bound_value);
void lmm_constraint_shared(lmm_constraint_t cnst);
+int lmm_constraint_is_shared(lmm_constraint_t cnst);
void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst);
void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst);
@@
-42,7
+44,7
@@
XBT_PUBLIC(lmm_variable_t) lmm_variable_new(lmm_system_t sys, void *id,
double bound, int number_of_constraints);
void lmm_variable_free(lmm_system_t sys, lmm_variable_t var);
XBT_PUBLIC(double) lmm_variable_getvalue(lmm_variable_t var);
double bound, int number_of_constraints);
void lmm_variable_free(lmm_system_t sys, lmm_variable_t var);
XBT_PUBLIC(double) lmm_variable_getvalue(lmm_variable_t var);
-
+XBT_PUBLIC(double) lmm_variable_getbound(lmm_variable_t var);
XBT_PUBLIC(void) lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
lmm_variable_t var, double value);
XBT_PUBLIC(void) lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
lmm_variable_t var, double value);
@@
-56,7
+58,7
@@
lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var);
lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys,
lmm_constraint_t cnst,
int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var);
lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys,
lmm_constraint_t cnst,
- lmm_
variable_t * var
);
+ lmm_
element_t * elem
);
lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t sys);
lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint_t cnst);
lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t sys);
lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint_t cnst);
@@
-70,16
+72,11
@@
void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
double bound);
double bound);
-void lmm_update_variable_latency(lmm_system_t sys, lmm_variable_t var,
- double delta);
-
-
-
XBT_PUBLIC(void) lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
double weight);
double lmm_get_variable_weight(lmm_variable_t var);
XBT_PUBLIC(void) lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
double weight);
double lmm_get_variable_weight(lmm_variable_t var);
-
void
lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
+
XBT_PUBLIC(void)
lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
double bound);
int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst);
double bound);
int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst);
@@
-88,27
+85,32
@@
int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst);
XBT_PUBLIC(void) lmm_solve(lmm_system_t sys);
#ifdef HAVE_SDP
XBT_PUBLIC(void) lmm_solve(lmm_system_t sys);
#ifdef HAVE_SDP
-
void
sdp_solve(lmm_system_t sys);
+
XBT_PUBLIC(void)
sdp_solve(lmm_system_t sys);
#endif /* HAVE_SDP */
#endif /* HAVE_SDP */
-void lagrange_solve(lmm_system_t sys);
-
-void lagrange_dicotomi_solve(lmm_system_t sys);
-
-
+XBT_PUBLIC(void) lagrange_solve(lmm_system_t sys);
+XBT_PUBLIC(void) bottleneck_solve(lmm_system_t sys);
/**
* Default functions associated to the chosen protocol. When
* using the lagrangian approach.
*/
/**
* Default functions associated to the chosen protocol. When
* using the lagrangian approach.
*/
-double (* func_fpi_def ) (lmm_variable_t , double);
+XBT_PUBLIC(void) lmm_set_default_protocol_function(double (* func_f) (lmm_variable_t var, double x),
+ double (* func_fp) (lmm_variable_t var, double x),
+ double (* func_fpi)(lmm_variable_t var, double x));
-void lmm_set_default_protocol_functions(double (* func_fpi) (lmm_variable_t var, double x));
+XBT_PUBLIC(double func_reno_f) (lmm_variable_t var, double x);
+XBT_PUBLIC(double func_reno_fp) (lmm_variable_t var, double x);
+XBT_PUBLIC(double func_reno_fpi)(lmm_variable_t var, double x);
-double func_reno_fpi(lmm_variable_t var, double x);
+XBT_PUBLIC(double func_reno2_f) (lmm_variable_t var, double x);
+XBT_PUBLIC(double func_reno2_fp) (lmm_variable_t var, double x);
+XBT_PUBLIC(double func_reno2_fpi)(lmm_variable_t var, double x);
-double func_vegas_fpi(lmm_variable_t var, double x);
+XBT_PUBLIC(double func_vegas_f) (lmm_variable_t var, double x);
+XBT_PUBLIC(double func_vegas_fp) (lmm_variable_t var, double x);
+XBT_PUBLIC(double func_vegas_fpi)(lmm_variable_t var, double x);
#endif /* _SURF_MAXMIN_H */
#endif /* _SURF_MAXMIN_H */