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 "Added a get Df function in order to implement beta*df during share_resources."
[simgrid.git]
/
src
/
include
/
surf
/
maxmin.h
diff --git
a/src/include/surf/maxmin.h
b/src/include/surf/maxmin.h
index
6618349
..
d4356ac
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,6
+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);
@@
-55,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);
@@
-106,6
+109,10
@@
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);
XBT_PUBLIC(double func_reno_fp) (lmm_variable_t var, double x);
XBT_PUBLIC(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);
+
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);
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);