I don't think it does what it should now but at least it looks better and

[simgrid.git] / src / surf / maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 8c6ba2d..c962d74 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -7,7 +7,7 @@
 
 
 #include "xbt/sysdep.h"
-#include "xbt/error.h"
+#include "xbt/log.h"
 #include "maxmin_private.h"
 #include <stdlib.h>
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(maxmin, surf,
@@ -101,11 +101,17 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
 
   cnst->bound = bound_value;
   cnst->usage = 0;
+  cnst->shared = 1;
   insert_constraint(sys, cnst);
 
   return cnst;
 }
 
+void lmm_constraint_shared(lmm_constraint_t cnst)
+{
+  cnst->shared = 0;
+}
+
 void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst)
 {
   remove_constraint(sys, cnst);
@@ -177,6 +183,19 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
   make_constraint_active(sys, cnst);
 }
 
+void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst,
+                   lmm_variable_t var, double value)
+{
+  int i ; 
+  sys->modified = 1;
+
+  for(i=0; i< var->cnsts_number ; i++)
+    if(var->cnsts[i].constraint == cnst) break;
+  
+  if(i<var->cnsts_number) var->cnsts[i].value +=value;
+  else lmm_expand(sys,cnst,var,value);
+}
+
 lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
                                       lmm_variable_t var, int num)
 {
@@ -270,6 +289,7 @@ void lmm_solve(lmm_system_t sys)
 
   /* Init */
   var_list = &(sys->variable_set);
+  DEBUG1("Variable set : %d", xbt_swag_size(var_list));
   xbt_swag_foreach(var, var_list) {
     var->value = 0.0;
   }
@@ -278,15 +298,19 @@ void lmm_solve(lmm_system_t sys)
   /* Compute Usage and store the variables that reach the maximum */
 
   cnst_list = &(sys->active_constraint_set);
+  DEBUG1("cnst_list : %d", xbt_swag_size(cnst_list));
   xbt_swag_foreach(cnst, cnst_list) {
     /* INIT */
-    elem_list = &(cnst->element_set);
     cnst->remaining = cnst->bound;
     cnst->usage = 0;
+    elem_list = &(cnst->element_set);
     xbt_swag_foreach(elem, elem_list) {
       if(elem->variable->weight <=0) break;
       if ((elem->value > 0)) {
-       cnst->usage += elem->value / elem->variable->weight;
+       if(cnst->shared)
+         cnst->usage += elem->value / elem->variable->weight;
+       else 
+         cnst->usage = 1;
        make_elem_active(elem);
       }
     }
@@ -303,7 +327,6 @@ void lmm_solve(lmm_system_t sys)
     /* Fix the variables that have to be */
     var_list = &(sys->saturated_variable_set);
 
-
     xbt_swag_foreach(var, var_list) {
       /* First check if some of these variables have reach their upper
          bound and update min_usage accordingly. */
@@ -323,8 +346,10 @@ void lmm_solve(lmm_system_t sys)
       for (i = 0; i < var->cnsts_number; i++) {
        elem = &var->cnsts[i];
        cnst = elem->constraint;
-       cnst->remaining -= elem->value * var->value;
-       cnst->usage -= elem->value / var->weight;
+       if(cnst->shared) {
+         cnst->remaining -= elem->value * var->value;
+         cnst->usage -= elem->value / var->weight;
+       }
        make_elem_inactive(elem);
       }
       xbt_swag_remove(var, var_list);