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
Extern "C" is not needed anymore here.
[simgrid.git]
/
src
/
include
/
surf
/
maxmin.hpp
diff --git
a/src/include/surf/maxmin.hpp
b/src/include/surf/maxmin.hpp
index
1df5043
..
68f3f40
100644
(file)
--- a/
src/include/surf/maxmin.hpp
+++ b/
src/include/surf/maxmin.hpp
@@
-7,17
+7,11
@@
#define SURF_MAXMIN_HPP
#include "src/internal_config.h"
#define SURF_MAXMIN_HPP
#include "src/internal_config.h"
-#include "surf/
datatypes.h
"
+#include "surf/
surf.hpp
"
#include "xbt/asserts.h"
#include "xbt/misc.h"
#include <cmath>
#include "xbt/asserts.h"
#include "xbt/misc.h"
#include <cmath>
-namespace simgrid {
-namespace surf {
-class Action;
-}
-}
-
/** @addtogroup SURF_lmm
* @details
* A linear maxmin solver to resolve inequations systems.
/** @addtogroup SURF_lmm
* @details
* A linear maxmin solver to resolve inequations systems.
@@
-153,8
+147,6
@@
static inline int double_equals(double value1, double value2, double precision)
return (fabs(value1 - value2) < precision);
}
return (fabs(value1 - value2) < precision);
}
-extern "C" {
-
/** @{ @ingroup SURF_lmm */
/**
* @brief Create a new Linear MaxMim system
/** @{ @ingroup SURF_lmm */
/**
* @brief Create a new Linear MaxMim system
@@
-189,13
+181,6
@@
XBT_PUBLIC(void) lmm_constraint_shared(lmm_constraint_t cnst);
*/
XBT_PUBLIC(int) lmm_constraint_sharing_policy(lmm_constraint_t cnst);
*/
XBT_PUBLIC(int) lmm_constraint_sharing_policy(lmm_constraint_t cnst);
-/**
- * @brief Free a constraint
- * @param sys The system associated to the constraint
- * @param cnst The constraint to free
- */
-XBT_PUBLIC(void) lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst);
-
/**
* @brief Get the usage of the constraint after the last lmm solve
* @param cnst A constraint
/**
* @brief Get the usage of the constraint after the last lmm solve
* @param cnst A constraint
@@
-272,14
+257,6
@@
XBT_PUBLIC(double) lmm_variable_getbound(lmm_variable_t var);
*/
XBT_PUBLIC(void) lmm_variable_concurrency_share_set(lmm_variable_t var, short int concurrency_share);
*/
XBT_PUBLIC(void) lmm_variable_concurrency_share_set(lmm_variable_t var, short int concurrency_share);
-/**
- * @brief Remove a variable from a constraint
- * @param sys A system
- * @param cnst A constraint
- * @param var The variable to remove
- */
-XBT_PUBLIC(void) lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var);
-
/**
* @brief Associate a variable to a constraint with a coefficient
* @param sys A system
/**
* @brief Associate a variable to a constraint with a coefficient
* @param sys A system
@@
-305,7
+282,7
@@
XBT_PUBLIC(void) lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst, lmm_var
* @param num The rank of constraint we want to get
* @return The numth constraint
*/
* @param num The rank of constraint we want to get
* @return The numth constraint
*/
-XBT_PUBLIC(lmm_constraint_t) lmm_get_cnst_from_var(lmm_system_t sys, lmm_variable_t var,
int
num);
+XBT_PUBLIC(lmm_constraint_t) lmm_get_cnst_from_var(lmm_system_t sys, lmm_variable_t var,
unsigned
num);
/**
* @brief Get the weigth of the numth constraint associated to the variable
/**
* @brief Get the weigth of the numth constraint associated to the variable
@@
-314,7
+291,7
@@
XBT_PUBLIC(lmm_constraint_t) lmm_get_cnst_from_var(lmm_system_t sys, lmm_variabl
* @param num The rank of constraint we want to get
* @return The numth constraint
*/
* @param num The rank of constraint we want to get
* @return The numth constraint
*/
-XBT_PUBLIC(double) lmm_get_cnst_weight_from_var(lmm_system_t sys, lmm_variable_t var,
int
num);
+XBT_PUBLIC(double) lmm_get_cnst_weight_from_var(lmm_system_t sys, lmm_variable_t var,
unsigned
num);
/**
* @brief Get the number of constraint associated to a variable
/**
* @brief Get the number of constraint associated to a variable
@@
-461,6
+438,5
@@
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_fpi(lmm_variable_t var, double x);
/** @} */
-}
#endif
#endif