Merge pull request #256 from Flamefire/master

[simgrid.git] / teshsuite / surf / lmm_usage / lmm_usage.cpp

diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp
index 68ce738..c4ea52e 100644 (file)
--- a/teshsuite/surf/lmm_usage/lmm_usage.cpp
+++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp
@@ -1,6 +1,6 @@
 /* A few tests for the maxmin library                                       */
 
-/* Copyright (c) 2007-2017. The SimGrid Team.
+/* Copyright (c) 2007-2018s. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -92,21 +92,21 @@ static void test1(method_t method)
   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)
-    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::s_lmm_system_t(true);
-  lmm_constraint_t L1 = Sys->constraint_new(nullptr, a);
-  lmm_constraint_t L2 = Sys->constraint_new(nullptr, b);
-  lmm_constraint_t L3 = Sys->constraint_new(nullptr, a);
+  lmm_system_t Sys    = new simgrid::kernel::lmm::System(true);
+  simgrid::kernel::lmm::Constraint* L1 = Sys->constraint_new(nullptr, a);
+  simgrid::kernel::lmm::Constraint* L2 = Sys->constraint_new(nullptr, b);
+  simgrid::kernel::lmm::Constraint* L3 = Sys->constraint_new(nullptr, a);
 
-  lmm_variable_t R_1_2_3 = Sys->variable_new(nullptr, 1.0, -1.0, 3);
-  lmm_variable_t R_1     = Sys->variable_new(nullptr, 1.0, -1.0, 1);
-  lmm_variable_t R_2     = Sys->variable_new(nullptr, 1.0, -1.0, 1);
-  lmm_variable_t R_3     = Sys->variable_new(nullptr, 1.0, -1.0, 1);
+  simgrid::kernel::lmm::Variable* R_1_2_3 = Sys->variable_new(nullptr, 1.0, -1.0, 3);
+  simgrid::kernel::lmm::Variable* R_1     = Sys->variable_new(nullptr, 1.0, -1.0, 1);
+  simgrid::kernel::lmm::Variable* R_2     = Sys->variable_new(nullptr, 1.0, -1.0, 1);
+  simgrid::kernel::lmm::Variable* R_3     = Sys->variable_new(nullptr, 1.0, -1.0, 1);
 
   Sys->update_variable_weight(R_1_2_3, 1.0);
   Sys->update_variable_weight(R_1, 1.0);
@@ -180,18 +180,18 @@ static void test1(method_t method)
 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)
-    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::s_lmm_system_t(true);
-  lmm_constraint_t CPU1 = Sys->constraint_new(nullptr, 200.0);
-  lmm_constraint_t CPU2 = Sys->constraint_new(nullptr, 100.0);
+  lmm_system_t Sys      = new simgrid::kernel::lmm::System(true);
+  simgrid::kernel::lmm::Constraint* CPU1 = Sys->constraint_new(nullptr, 200.0);
+  simgrid::kernel::lmm::Constraint* CPU2 = Sys->constraint_new(nullptr, 100.0);
 
-  lmm_variable_t T1 = Sys->variable_new(nullptr, 1.0, -1.0, 1);
-  lmm_variable_t T2 = Sys->variable_new(nullptr, 1.0, -1.0, 1);
+  simgrid::kernel::lmm::Variable* T1 = Sys->variable_new(nullptr, 1.0, -1.0, 1);
+  simgrid::kernel::lmm::Variable* T2 = Sys->variable_new(nullptr, 1.0, -1.0, 1);
 
   Sys->update_variable_weight(T1, 1.0);
   Sys->update_variable_weight(T2, 1.0);
@@ -253,21 +253,21 @@ static void test3(method_t method)
   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)
-    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::s_lmm_system_t(true);
+  lmm_system_t Sys = new simgrid::kernel::lmm::System(true);
 
   /* Creates the constraints */
-  lmm_constraint_t* tmp_cnst = new lmm_constraint_t[15];
+  simgrid::kernel::lmm::Constraint** tmp_cnst = new simgrid::kernel::lmm::Constraint*[15];
   for (int i = 0; i < 15; i++)
     tmp_cnst[i] = Sys->constraint_new(nullptr, B[i]);
 
   /* Creates the variables */
-  lmm_variable_t* tmp_var = new lmm_variable_t[16];
+  simgrid::kernel::lmm::Variable** tmp_var = new simgrid::kernel::lmm::Variable*[16];
   for (int j = 0; j < 16; j++) {
     tmp_var[j] = Sys->variable_new(nullptr, 1.0, -1.0, 15);
     Sys->update_variable_weight(tmp_var[j], 1.0);