-/* Copyright (c) 2004-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2017. 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. */
-#ifndef _SURF_MAXMIN_PRIVATE_H
-#define _SURF_MAXMIN_PRIVATE_H
-
-#include <xbt/base.h>
+#ifndef SURF_MAXMIN_PRIVATE_H
+#define SURF_MAXMIN_PRIVATE_H
#include "surf/maxmin.h"
#include "xbt/swag.h"
* @brief LMM element
* Elements can be seen as glue between constraint objects and variable objects.
* Basically, each variable will have a set of elements, one for each constraint where it is involved.
- * Then, it is used to list all variables involved in constraint through constraint's element_set lists, or vice-versa list all constraints for a given variable.
+ * Then, it is used to list all variables involved in constraint through constraint's xxx_element_set lists, or vice-versa list all constraints for a given variable.
*/
typedef struct lmm_element {
/* hookup to constraint */
- s_xbt_swag_hookup_t element_set_hookup;
+ s_xbt_swag_hookup_t enabled_element_set_hookup;
+ s_xbt_swag_hookup_t disabled_element_set_hookup;
s_xbt_swag_hookup_t active_element_set_hookup;
lmm_constraint_t constraint;
* \li Enabled elements which variable's weight is non-zero. They are utilized in some LMM functions.
* \li Active elements which variable's weight is non-zero (i.e. it is enabled) AND its element value is non-zero. LMM_solve iterates over active elements during resolution, dynamically making them active or unactive.
*
- * Also note that we maintain element_set such that all enabled elements (i.e. var->weight>0) come before disabled elements.
*/
typedef struct lmm_constraint {
/* hookup to system */
s_xbt_swag_hookup_t modified_constraint_set_hookup;
s_xbt_swag_hookup_t saturated_constraint_set_hookup;
- //TODO we could split element_set in, say, enabled_element_set and disabled_element_set depending on var->weight
- //Could make code more readable and should not pose implementation issues (only lmm_print does not stop at the end of enabled elements
- s_xbt_swag_t element_set; /* a list of lmm_element_t */
+ s_xbt_swag_t enabled_element_set; /* a list of lmm_element_t */
+ s_xbt_swag_t disabled_element_set; /* a list of lmm_element_t */
s_xbt_swag_t active_element_set; /* a list of lmm_element_t */
double remaining;
double usage;
double bound;
double value;
short int concurrency_share; /* The maximum number of elements that variable will add to a constraint */
- void *id;
+ simgrid::surf::Action* id;
int id_int;
unsigned visited; /* used by lmm_update_modified_set */
/* \begin{For Lagrange only} */
*/
typedef struct lmm_system {
int modified;
- int selective_update_active; /* flag to update partially the system only selecting changed portions */
+ bool selective_update_active; /* flag to update partially the system only selecting changed portions */
unsigned visited_counter; /* used by lmm_update_modified_set and lmm_remove_modified_set to cleverly (un-)flag the constraints (more details in these functions)*/
s_xbt_swag_t variable_set; /* a list of lmm_variable_t */
s_xbt_swag_t constraint_set; /* a list of lmm_constraint_t */
simgrid::surf::ActionLmmListPtr keep_track;
xbt_mallocator_t variable_mallocator;
+
+ void (*solve_fun)(lmm_system_t self);
} s_lmm_system_t;
#define extract_variable(sys) xbt_swag_extract(&(sys->variable_set))
xbt_swag_remove(cnst, &sys->modified_constraint_set); } while (0)
/** @ingroup SURF_lmm
- * @brief Print informations about a lmm system
+ * @brief Print information about a lmm system
*
* @param sys A lmm system
*/
extern XBT_PRIVATE double (*func_fp_def) (lmm_variable_t, double);
extern XBT_PRIVATE double (*func_fpi_def) (lmm_variable_t, double);
-#endif /* _SURF_MAXMIN_PRIVATE_H */
-
-
+#endif /* SURF_MAXMIN_PRIVATE_H */
