Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
More explicit names
authoralegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 9 Dec 2004 01:51:16 +0000 (01:51 +0000)
committeralegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 9 Dec 2004 01:51:16 +0000 (01:51 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@568 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/surf/maxmin.c

index 513ad7a..6390b6a 100644 (file)
@@ -190,7 +190,7 @@ void *lmm_variable_id(lmm_variable_t var)
   return var->id;
 }
 
-static void saturated_constraints_update(lmm_system_t sys,
+static void saturated_constraint_set_update(lmm_system_t sys,
                                         lmm_constraint_t cnst,
                                         xbt_maxmin_float_t * min_usage)
 {
@@ -212,15 +212,13 @@ static void saturated_constraints_update(lmm_system_t sys,
   }
 }
 
-static void saturated_variables_update(lmm_system_t sys)
+static void saturated_variable_set_update(lmm_system_t sys)
 {
   lmm_constraint_t cnst = NULL;
   xbt_swag_t cnst_list = NULL;
   lmm_element_t elem = NULL;
   xbt_swag_t elem_list = NULL;
 
-  sys->modified = 1;
-
   cnst_list = &(sys->saturated_constraint_set);
   while ((cnst = xbt_swag_getFirst(cnst_list))) {
 /*   xbt_swag_foreach(cnst, cnst_list) { */
@@ -265,10 +263,10 @@ void lmm_solve(lmm_system_t sys)
     }
 
     /* Saturated constraints update */
-    saturated_constraints_update(sys, cnst, &min_usage);
+    saturated_constraint_set_update(sys, cnst, &min_usage);
   }
 
-  saturated_variables_update(sys);
+  saturated_variable_set_update(sys);
 
   /* Saturated variables update */
 
@@ -307,9 +305,9 @@ void lmm_solve(lmm_system_t sys)
     cnst_list = &(sys->active_constraint_set);
     min_usage = -1;
     xbt_swag_foreach(cnst, cnst_list) {
-      saturated_constraints_update(sys, cnst, &min_usage);
+      saturated_constraint_set_update(sys, cnst, &min_usage);
     }
-    saturated_variables_update(sys);
+    saturated_variable_set_update(sys);
 
   } while (xbt_swag_size(&(sys->saturated_variable_set)));