Rename simgrid::kernel::lmm::lmm_set_default_protocol_function -> set_default_protoco...

diff --git a/src/kernel/lmm/lagrange.cpp b/src/kernel/lmm/lagrange.cpp
index c244c67..f9d999d 100644 (file)
--- a/src/kernel/lmm/lagrange.cpp
+++ b/src/kernel/lmm/lagrange.cpp
@@ -422,9 +422,9 @@ static double partial_diff_lambda(double lambda, const Constraint& cnst)
  *  programming.
  *
  */
  *  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;
 {
   func_f_def   = func_f;
   func_fp_def  = func_fp;

diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp
index 59fd827..608d6f4 100644 (file)
--- a/src/kernel/lmm/maxmin.hpp
+++ b/src/kernel/lmm/maxmin.hpp
@@ -145,9 +145,9 @@ XBT_PUBLIC(void) bottleneck_solve(lmm_system_t sys);
 /** Default functions associated to the chosen protocol. When using the lagrangian approach. */
 
 XBT_PUBLIC(void)
 /** Default functions associated to the chosen protocol. When using the lagrangian approach. */
 
 XBT_PUBLIC(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));
+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));

 
 XBT_PUBLIC(double) func_reno_f(const Variable& var, double x);
 XBT_PUBLIC(double) func_reno_fp(const Variable& var, double x);
 
 XBT_PUBLIC(double) func_reno_f(const Variable& var, double x);
 XBT_PUBLIC(double) func_reno_fp(const Variable& var, double x);

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 149b176..e199003 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -87,8 +87,8 @@ void surf_network_model_init_Reno()
   if (surf_network_model)
     return;
 
   if (surf_network_model)
     return;
 

-  lmm_set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
-                                    simgrid::kernel::lmm::func_reno_fpi);
+  set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
+                                simgrid::kernel::lmm::func_reno_fpi);

 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);


@@ -104,8 +104,8 @@ void surf_network_model_init_Reno2()
   if (surf_network_model)
     return;
 
   if (surf_network_model)
     return;
 

-  lmm_set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp,
-                                    simgrid::kernel::lmm::func_reno2_fpi);
+  set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp,
+                                simgrid::kernel::lmm::func_reno2_fpi);

 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);


@@ -120,8 +120,8 @@ void surf_network_model_init_Vegas()
   if (surf_network_model)
     return;
 
   if (surf_network_model)
     return;
 

-  lmm_set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
-                                    simgrid::kernel::lmm::func_vegas_fpi);
+  set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
+                                simgrid::kernel::lmm::func_vegas_fpi);

 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
 
   xbt_cfg_setdefault_double("network/latency-factor", 13.01);
   xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);

diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp
index 7fdd77e..47e16ab 100644 (file)
--- a/teshsuite/surf/lmm_usage/lmm_usage.cpp
+++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp
@@ -92,11 +92,11 @@ static void test1(method_t method)
   double b = 10.0;
 
   if (method == LAGRANGE_VEGAS)
   double b = 10.0;
 
   if (method == LAGRANGE_VEGAS)

-    simgrid::kernel::lmm::lmm_set_default_protocol_function(
-        simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp, simgrid::kernel::lmm::func_vegas_fpi);
+    set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
+                                  simgrid::kernel::lmm::func_vegas_fpi);

   else if (method == LAGRANGE_RENO)
   else if (method == LAGRANGE_RENO)

-    simgrid::kernel::lmm::lmm_set_default_protocol_function(
-        simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fpi, simgrid::kernel::lmm::func_reno_fpi);
+    set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fpi,
+                                  simgrid::kernel::lmm::func_reno_fpi);

 
   lmm_system_t Sys    = new simgrid::kernel::lmm::System(true);
   lmm_constraint_t L1 = Sys->constraint_new(nullptr, a);
 
   lmm_system_t Sys    = new simgrid::kernel::lmm::System(true);
   lmm_constraint_t L1 = Sys->constraint_new(nullptr, a);


@@ -180,11 +180,11 @@ static void test1(method_t method)
 static void test2(method_t method)
 {
   if (method == LAGRANGE_VEGAS)
 static void test2(method_t method)
 {
   if (method == LAGRANGE_VEGAS)

-    lmm_set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
-                                      simgrid::kernel::lmm::func_vegas_fpi);
+    set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
+                                  simgrid::kernel::lmm::func_vegas_fpi);

   if (method == LAGRANGE_RENO)
   if (method == LAGRANGE_RENO)

-    lmm_set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
-                                      simgrid::kernel::lmm::func_reno_fpi);
+    set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
+                                  simgrid::kernel::lmm::func_reno_fpi);

 
   lmm_system_t Sys      = new simgrid::kernel::lmm::System(true);
   lmm_constraint_t CPU1 = Sys->constraint_new(nullptr, 200.0);
 
   lmm_system_t Sys      = new simgrid::kernel::lmm::System(true);
   lmm_constraint_t CPU1 = Sys->constraint_new(nullptr, 200.0);


@@ -253,11 +253,11 @@ static void test3(method_t method)
   A[14][15] =                                        1.0;
 
   if (method == LAGRANGE_VEGAS)
   A[14][15] =                                        1.0;
 
   if (method == LAGRANGE_VEGAS)

-    lmm_set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
-                                      simgrid::kernel::lmm::func_vegas_fpi);
+    set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
+                                  simgrid::kernel::lmm::func_vegas_fpi);

   if (method == LAGRANGE_RENO)
   if (method == LAGRANGE_RENO)

-    lmm_set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
-                                      simgrid::kernel::lmm::func_reno_fpi);
+    set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
+                                  simgrid::kernel::lmm::func_reno_fpi);

 
   lmm_system_t Sys = new simgrid::kernel::lmm::System(true);
 
 
   lmm_system_t Sys = new simgrid::kernel::lmm::System(true);