X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec38e1b35a34ad8c6ce3e75506ea5bcd8d96e323..265e908745398dd4e9cc55187aa267650468c57c:/src/kernel/lmm/lagrange.cpp

diff --git a/src/kernel/lmm/lagrange.cpp b/src/kernel/lmm/lagrange.cpp
index c244c67063..7d2afe0e98 100644
--- a/src/kernel/lmm/lagrange.cpp
+++ b/src/kernel/lmm/lagrange.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
@@ -37,7 +37,7 @@ double (*func_fpi_def)(const Variable&, double);
  * Local prototypes to implement the Lagrangian optimization with optimal step, also called dichotomy.
  */
 // solves the proportional fairness using a Lagrangian optimization with dichotomy step
-void lagrange_solve(lmm_system_t sys);
+void lagrange_solve(kernel::lmm::System* sys);
 // computes the value of the dichotomy using a initial values, init, with a specific variable or constraint
 static double dichotomy(double init, double diff(double, const Constraint&), const Constraint& cnst, double min_error);
 // computes the value of the differential of constraint cnst applied to lambda
@@ -49,7 +49,7 @@ static int __check_feasible(const CnstList& cnst_list, const VarList& var_list,
   for (Constraint const& cnst : cnst_list) {
     double tmp = 0;
     for (Element const& elem : cnst.enabled_element_set) {
-      lmm_variable_t var = elem.variable;
+      Variable* var = elem.variable;
       xbt_assert(var->sharing_weight > 0);
       tmp += var->value;
     }
@@ -137,7 +137,7 @@ static double dual_objective(const VarList& var_list, const CnstList& cnst_list)
   return obj;
 }
 
-void lagrange_solve(lmm_system_t sys)
+void lagrange_solve(kernel::lmm::System* sys)
 {
   /* Lagrange Variables. */
   int max_iterations       = 100;
@@ -422,9 +422,9 @@ static double partial_diff_lambda(double lambda, const Constraint& cnst)
  *  programming.
  *
  */
-void lmm_set_default_protocol_function(double (*func_f)(const Variable& var, double x),
-                                       double (*func_fp)(const Variable& var, double x),
-                                       double (*func_fpi)(const Variable& var, double x))
+void set_default_protocol_function(double (*func_f)(const Variable& var, double x),
+                                   double (*func_fp)(const Variable& var, double x),
+                                   double (*func_fpi)(const Variable& var, double x))
 {
   func_f_def   = func_f;
   func_fp_def  = func_fp;