X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..929bbf2f78b5c0151713d61bf5b163943b8b9343:/src/include/surf/maxmin.hpp diff --git a/src/include/surf/maxmin.hpp b/src/include/surf/maxmin.hpp index 1df50434b3..e5e896b0cd 100644 --- 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" -#include "surf/datatypes.h" +#include "surf/surf.hpp" #include "xbt/asserts.h" #include "xbt/misc.h" #include -namespace simgrid { -namespace surf { -class Action; -} -} - /** @addtogroup SURF_lmm * @details * A linear maxmin solver to resolve inequations systems. @@ -153,103 +147,7 @@ static inline int double_equals(double value1, double value2, double precision) return (fabs(value1 - value2) < precision); } -extern "C" { - /** @{ @ingroup SURF_lmm */ -/** - * @brief Create a new Linear MaxMim system - * @param selective_update whether we should do lazy updates - */ -XBT_PUBLIC(lmm_system_t) lmm_system_new(bool selective_update); - -/** - * @brief Free an existing Linear MaxMin system - * @param sys The lmm system to free - */ -XBT_PUBLIC(void) lmm_system_free(lmm_system_t sys); - -/** - * @brief Create a new Linear MaxMin constraint - * @param sys The system in which we add a constraint - * @param id Data associated to the constraint (e.g.: a network link) - * @param bound_value The bound value of the constraint - */ -XBT_PUBLIC(lmm_constraint_t) lmm_constraint_new(lmm_system_t sys, void* id, double bound_value); - -/** - * @brief Share a constraint - * @param cnst The constraint to share - */ -XBT_PUBLIC(void) lmm_constraint_shared(lmm_constraint_t cnst); - -/** - * @brief Check if a constraint is shared (shared by default) - * @param cnst The constraint to share - * @return 1 if shared, 0 otherwise - */ -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 - * @return The usage of the constraint - */ -XBT_PUBLIC(double) lmm_constraint_get_usage(lmm_constraint_t cnst); - -XBT_PUBLIC(int) lmm_constraint_get_variable_amount(lmm_constraint_t cnst); - -/** - * @brief Sets the concurrency limit for this constraint - * @param cnst A constraint - * @param concurrency_limit The concurrency limit to use for this constraint - */ -XBT_PUBLIC(void) lmm_constraint_concurrency_limit_set(lmm_constraint_t cnst, int concurrency_limit); - -/** - * @brief Gets the concurrency limit for this constraint - * @param cnst A constraint - * @return The concurrency limit used by this constraint - */ -XBT_PUBLIC(int) lmm_constraint_concurrency_limit_get(lmm_constraint_t cnst); - -/** - * @brief Reset the concurrency maximum for a given variable (we will update the maximum to reflect constraint - * evolution). - * @param cnst A constraint -*/ -XBT_PUBLIC(void) lmm_constraint_concurrency_maximum_reset(lmm_constraint_t cnst); - -/** - * @brief Get the concurrency maximum for a given variable (which reflects constraint evolution). - * @param cnst A constraint - * @return the maximum concurrency of the constraint - */ -XBT_PUBLIC(int) lmm_constraint_concurrency_maximum_get(lmm_constraint_t cnst); - -/** - * @brief Create a new Linear MaxMin variable - * @param sys The system in which we add a constaint - * @param id Data associated to the variable (e.g.: a network communication) - * @param weight_value The weight of the variable (0.0 if not used) - * @param bound The maximum value of the variable (-1.0 if no maximum value) - * @param number_of_constraints The maximum number of constraint to associate to the variable - */ -XBT_PUBLIC(lmm_variable_t) -lmm_variable_new(lmm_system_t sys, simgrid::surf::Action* id, double weight_value, double bound, - int number_of_constraints); -/** - * @brief Free a variable - * @param sys The system associated to the variable - * @param var The variable to free - */ -XBT_PUBLIC(void) lmm_variable_free(lmm_system_t sys, lmm_variable_t var); /** * @brief Get the value of the variable after the last lmm solve @@ -272,32 +170,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); -/** - * @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 - * @param cnst A constraint - * @param var A variable - * @param value The coefficient associated to the variable in the constraint - */ -XBT_PUBLIC(void) lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, double value); - -/** - * @brief Add value to the coefficient between a constraint and a variable or create one - * @param sys A system - * @param cnst A constraint - * @param var A variable - * @param value The value to add to the coefficient associated to the variable in the constraint - */ -XBT_PUBLIC(void) lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, double value); - /** * @brief Get the numth constraint associated to the variable * @param sys The system associated to the variable (not used) @@ -305,7 +177,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 */ -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 @@ -314,7 +186,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 */ -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 @@ -324,53 +196,6 @@ XBT_PUBLIC(double) lmm_get_cnst_weight_from_var(lmm_system_t sys, lmm_variable_t */ XBT_PUBLIC(int) lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var); -/** - * @brief Get a var associated to a constraint - * @details Get the first variable of the next variable of elem if elem is not NULL - * @param sys The system associated to the variable (not used) - * @param cnst A constraint - * @param elem A element of constraint of the constraint or NULL - * @return A variable associated to a constraint - */ -XBT_PUBLIC(lmm_variable_t) lmm_get_var_from_cnst(lmm_system_t sys, lmm_constraint_t cnst, lmm_element_t* elem); - -/** - * @brief Get a var associated to a constraint - * @details Get the first variable of the next variable of elem if elem is not NULL - * @param cnst A constraint - * @param elem A element of constraint of the constraint or NULL - * @param nextelem A element of constraint of the constraint or NULL, the one after elem - * @param numelem parameter representing the number of elements to go - * - * @return A variable associated to a constraint - */ -XBT_PUBLIC(lmm_variable_t) -lmm_get_var_from_cnst_safe(lmm_system_t sys, lmm_constraint_t cnst, lmm_element_t* elem, lmm_element_t* nextelem, - int* numelem); - -/** - * @brief Get the first active constraint of a system - * @param sys A system - * @return The first active constraint - */ -XBT_PUBLIC(lmm_constraint_t) lmm_get_first_active_constraint(lmm_system_t sys); - -/** - * @brief Get the next active constraint of a constraint in a system - * @param sys A system - * @param cnst An active constraint of the system - * - * @return The next active constraint - */ -XBT_PUBLIC(lmm_constraint_t) lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint_t cnst); - -/** - * @brief Get the data associated to a constraint - * @param cnst A constraint - * @return The data associated to the constraint - */ -XBT_PUBLIC(void*) lmm_constraint_id(lmm_constraint_t cnst); - /** * @brief Get the data associated to a variable * @param var A variable @@ -378,31 +203,6 @@ XBT_PUBLIC(void*) lmm_constraint_id(lmm_constraint_t cnst); */ XBT_PUBLIC(void*) lmm_variable_id(lmm_variable_t var); -/** - * @brief Update the value of element linking the constraint and the variable - * @param sys A system - * @param cnst A constraint - * @param var A variable - * @param value The new value - */ -XBT_PUBLIC(void) lmm_update(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, double value); - -/** - * @brief Update the bound of a variable - * @param sys A system - * @param var A constraint - * @param bound The new bound - */ -XBT_PUBLIC(void) lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var, double bound); - -/** - * @brief Update the weight of a variable - * @param sys A system - * @param var A variable - * @param weight The new weight of the variable - */ -XBT_PUBLIC(void) lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var, double weight); - /** * @brief Get the weight of a variable * @param var A variable @@ -410,28 +210,6 @@ XBT_PUBLIC(void) lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var */ XBT_PUBLIC(double) lmm_get_variable_weight(lmm_variable_t var); -/** - * @brief Update a constraint bound - * @param sys A system - * @param cnst A constraint - * @param bound The new bound of the consrtaint - */ -XBT_PUBLIC(void) lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst, double bound); - -/** - * @brief [brief description] - * @param sys A system - * @param cnst A constraint - * @return [description] - */ -XBT_PUBLIC(int) lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst); - -/** - * @brief Print the lmm system - * @param sys The lmm system to print - */ -XBT_PUBLIC(void) lmm_print(lmm_system_t sys); - /** * @brief Solve the lmm system * @param sys The lmm system to solve @@ -461,6 +239,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); /** @} */ -} #endif