Cleanups and cosmetics

[simgrid.git] / src / surf / maxmin_private.h

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 1a1e4e6..947e1c8 100644 (file)
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -1,10 +1,16 @@
-/* Authors: Arnaud Legrand                                                  */
+/*     $Id$     */
+
+/* Copyright (c) 2004 Arnaud Legrand. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#ifndef _SURF_MAXMIN_PRIVATE_H
+#define _SURF_MAXMIN_PRIVATE_H
 
 #include "surf/maxmin.h"
 #include "xbt/swag.h"
+#include "xbt/mallocator.h"
 
 typedef struct lmm_element {
   /* hookup to constraint */
@@ -13,11 +19,10 @@ typedef struct lmm_element {
 
   lmm_constraint_t constraint;
   lmm_variable_t variable;
-  FLOAT value;  
+  double value;
 } s_lmm_element_t, *lmm_element_t;
-#define insert_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->element_set))
-#define insert_active_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->active_element_set))
-#define remove_active_elem_in_constraint(elem) xbt_swag_extract(elem,&(elem->constraint->active_element_set))
+#define make_elem_active(elem) xbt_swag_insert_at_head(elem,&(elem->constraint->active_element_set))
+#define make_elem_inactive(elem) xbt_swag_remove(elem,&(elem->constraint->active_element_set))
 
 typedef struct lmm_constraint {
   /* hookup to system */
@@ -27,10 +32,13 @@ typedef struct lmm_constraint {
 
   s_xbt_swag_t element_set;    /* a list of lmm_mat_element_t */
   s_xbt_swag_t active_element_set;     /* a list of lmm_mat_element_t */
-  FLOAT bound;
-  FLOAT remaining;
-  FLOAT usage;
-  char *id;
+  double bound;
+  double lambda;
+  double new_lambda;
+  double remaining;
+  int shared;
+  double usage;
+  void *id;
 } s_lmm_constraint_t;
 
 typedef struct lmm_variable {
@@ -41,36 +49,46 @@ typedef struct lmm_variable {
   s_lmm_element_t *cnsts;
   int cnsts_size;
   int cnsts_number;
-  FLOAT weight;
-  FLOAT bound;
-  FLOAT value;
-  char *id;
+  double weight;
+  double bound;
+  double value;
+  void *id;
+  int index; /* FOR SDP ONLY */
+  /* \begin{For Lagrange only} */
+  double mu;
+  double new_mu;
+  double df; /* Total delay of flow */
+  double (* func_fpi)  (struct lmm_variable *var, double x);  /* (f')^{-1}    */
+  /* \end{For Lagrange only} */
 } s_lmm_variable_t;
 
 typedef struct lmm_system {
+  int modified;
   s_xbt_swag_t variable_set;   /* a list of lmm_variable_t */
   s_xbt_swag_t constraint_set; /* a list of lmm_constraint_t */
 
   s_xbt_swag_t active_constraint_set;  /* a list of lmm_constraint_t */
 
   s_xbt_swag_t saturated_variable_set; /* a list of lmm_variable_t */
-  s_xbt_swag_t saturated_constraint_set;/* a list of lmm_constraint_t_t */
+  s_xbt_swag_t saturated_constraint_set;       /* a list of lmm_constraint_t_t */
+
+  xbt_mallocator_t variable_mallocator;
 } s_lmm_system_t;
 
-#define extract_variable(sys) xbt_swag_extract(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set))
-#define extract_constraint(sys) xbt_swag_extract(xbt_swag_getFirst(&(sys->constraint_set)),&(sys->constraint_set))
-#define insert_variable(sys,var) xbt_swag_insert(var,&(sys->variable_set))
+#define extract_variable(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set))
+#define extract_constraint(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->constraint_set)),&(sys->constraint_set))
 #define insert_constraint(sys,cnst) xbt_swag_insert(cnst,&(sys->constraint_set))
-#define remove_variable(sys,var) do {xbt_swag_extract(var,&(sys->variable_set));\
-                                 xbt_swag_extract(var,&(sys->saturated_variable_set));} while(0)
-#define remove_constraint(sys,cnst) do {xbt_swag_extract(cnst,&(sys->constraint_set));\
-                                        xbt_swag_extract(cnst,&(sys->saturated_constraint_set));} while(0)
-#define remove_active_constraint(sys,cnst) xbt_swag_extract(cnst,&(sys->active_constraint_set))
+#define remove_variable(sys,var) do {xbt_swag_remove(var,&(sys->variable_set));\
+                                 xbt_swag_remove(var,&(sys->saturated_variable_set));} while(0)
+#define remove_constraint(sys,cnst) do {xbt_swag_remove(cnst,&(sys->constraint_set));\
+                                        xbt_swag_remove(cnst,&(sys->saturated_constraint_set));} while(0)
+#define remove_active_constraint(sys,cnst) xbt_swag_remove(cnst,&(sys->active_constraint_set))
 #define make_constraint_active(sys,cnst) xbt_swag_insert(cnst,&(sys->active_constraint_set))
 #define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst)
 
 static void lmm_var_free(lmm_system_t sys, lmm_variable_t var);
 static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst);
 
-/* #define UNDEFINED_VALUE -1.0 */
-#define UNUSED_CONSTRAINT -2.0
+void lmm_print(lmm_system_t sys);
+
+#endif                         /* _SURF_MAXMIN_PRIVATE_H */