X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0a1ae4fcdf5ebdc127407223c3462a6d3e9a0b8d..d20f024dba9ff1e9c8822237caaf963b9e913889:/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 ceb7cdbed4..3a57290ef4 100644
--- a/teshsuite/surf/lmm_usage/lmm_usage.cpp
+++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp
@@ -1,17 +1,18 @@
 /* A few tests for the maxmin library                                       */
 
-/* Copyright (c) 2007-2015. The SimGrid Team.
+/* Copyright (c) 2007-2017. 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. */
 
-#include "xbt/sysdep.h"
-#include "surf/maxmin.h"
+#include "simgrid/msg.h"
+#include "src/surf/surf_interface.hpp"
+#include "surf/maxmin.hpp"
 #include "xbt/log.h"
 #include "xbt/module.h"
-#include <math.h>
-#include "src/surf/surf_interface.hpp"
+#include "xbt/sysdep.h"
+#include <cmath>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
 
@@ -46,9 +47,9 @@ static double dichotomy(double func(double), double min, double max, double min_
 
   while (overall_error > min_error) {
     SHOW_EXPR(overall_error);
-    if ((min_func > 0 && max_func > 0) || (min_func < 0 && max_func < 0) || (min_func > 0 && max_func < 0)) {
-      abort();
-    } //TODO replace by xbt_assert
+    xbt_assert(min_func <= 0 || max_func <= 0);
+    xbt_assert(min_func >= 0 || max_func >= 0);
+    xbt_assert(min_func <= 0 || max_func >= 0);
 
     SHOW_EXPR(min);
     SHOW_EXPR(min_func);
@@ -56,7 +57,7 @@ static double dichotomy(double func(double), double min, double max, double min_
     SHOW_EXPR(max_func);
 
     double middle = (max + min) / 2.0;
-    if ((min == middle) || (max == middle)) {
+    if (fabs(min - middle) < 1e-12 || fabs(max - middle) < 1e-12) {
       break;
     }
     double middle_func = func(middle);
@@ -88,32 +89,23 @@ static double diff_lagrange_test_1(double x)
 
 static void test1(method_t method)
 {
-  lmm_system_t Sys = nullptr;
-  lmm_constraint_t L1 = nullptr;
-  lmm_constraint_t L2 = nullptr;
-  lmm_constraint_t L3 = nullptr;
-
-  lmm_variable_t R_1_2_3 = nullptr;
-  lmm_variable_t R_1 = nullptr;
-  lmm_variable_t R_2 = nullptr;
-  lmm_variable_t R_3 = nullptr;
-
-  double a = 1.0, b = 10.0;
+  double a = 1.0;
+  double b = 10.0;
 
   if (method == LAGRANGE_VEGAS)
     lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
   else if (method == LAGRANGE_RENO)
     lmm_set_default_protocol_function(func_reno_f, func_reno_fpi, func_reno_fpi);
 
-  Sys = lmm_system_new(1);
-  L1 = lmm_constraint_new(Sys, (void *) "L1", a);
-  L2 = lmm_constraint_new(Sys, (void *) "L2", b);
-  L3 = lmm_constraint_new(Sys, (void *) "L3", a);
+  lmm_system_t Sys = lmm_system_new(1);
+  lmm_constraint_t L1 = lmm_constraint_new(Sys, nullptr, a);
+  lmm_constraint_t L2 = lmm_constraint_new(Sys, nullptr, b);
+  lmm_constraint_t L3 = lmm_constraint_new(Sys, nullptr, a);
 
-  R_1_2_3 = lmm_variable_new(Sys, (void *) "R 1->2->3", 1.0, -1.0, 3);
-  R_1 = lmm_variable_new(Sys, (void *) "R 1", 1.0, -1.0, 1);
-  R_2 = lmm_variable_new(Sys, (void *) "R 2", 1.0, -1.0, 1);
-  R_3 = lmm_variable_new(Sys, (void *) "R 3", 1.0, -1.0, 1);
+  lmm_variable_t R_1_2_3 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 3);
+  lmm_variable_t R_1 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);
+  lmm_variable_t R_2 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);
+  lmm_variable_t R_3 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);
 
   lmm_update_variable_weight(Sys, R_1_2_3, 1.0);
   lmm_update_variable_weight(Sys, R_1, 1.0);
@@ -130,48 +122,33 @@ static void test1(method_t method)
 
   if (method == MAXMIN) {
     lmm_solve(Sys);
-  } else if (method == LAGRANGE_VEGAS) {
-    double x = 3 * a / 4 - 3 * b / 8 + sqrt(9 * b * b + 4 * a * a - 4 * a * b) / 8;
-    /* Computed with mupad and D_f=1.0 */
-    double max_deviation = 0.0;
-    if (x > a) {
-      x = a;
-    }
-    if (x < 0) {
-      x = 0;
+  } else {
+    double x;
+    if (method == LAGRANGE_VEGAS) {
+      x = 3 * a / 4 - 3 * b / 8 + sqrt(9 * b * b + 4 * a * a - 4 * a * b) / 8;
+      /* Computed with mupad and D_f=1.0 */
+      if (x > a) {
+        x = a;
+      }
+      if (x < 0) {
+        x = 0;
+      }
+    } else if (method == LAGRANGE_RENO) {
+      a_test_1 = a;
+      b_test_1 = b;
+      x = dichotomy(diff_lagrange_test_1, 0, a, 1e-13);
+
+      if (x < 0)
+        x = 0;
+      if (x > a)
+        x = a;
+    } else {
+      xbt_die( "Invalid method");
     }
 
     lagrange_solve(Sys);
 
-    max_deviation = MAX(max_deviation, fabs(lmm_variable_getvalue(R_1) - x));
-    max_deviation = MAX(max_deviation, fabs(lmm_variable_getvalue(R_3) - x));
-    max_deviation = MAX(max_deviation, fabs(lmm_variable_getvalue(R_2) - (b - a + x)));
-    max_deviation = MAX(max_deviation, fabs(lmm_variable_getvalue(R_1_2_3) - (a - x)));
-
-    if (max_deviation > 0.00001) { // Legacy value used in lagrange.c
-      XBT_WARN("Max Deviation from optimal solution : %g", max_deviation);
-      XBT_WARN("Found x = %1.20f", x);
-      XBT_WARN("Deviation from optimal solution (R_1 = %g): %1.20f", x, lmm_variable_getvalue(R_1) - x);
-      XBT_WARN("Deviation from optimal solution (R_2 = %g): %1.20f", b - a + x,
-               lmm_variable_getvalue(R_2) - (b - a + x));
-      XBT_WARN("Deviation from optimal solution (R_3 = %g): %1.20f", x, lmm_variable_getvalue(R_3) - x);
-      XBT_WARN("Deviation from optimal solution (R_1_2_3 = %g): %1.20f", a - x,
-               lmm_variable_getvalue(R_1_2_3) - (a - x));
-    }
-  } else if (method == LAGRANGE_RENO) {
-    double x;
     double max_deviation = 0.0;
-
-    a_test_1 = a;
-    b_test_1 = b;
-    x = dichotomy(diff_lagrange_test_1, 0, a, 1e-13);
-
-    if (x < 0)
-      x = 0;
-    if (x > a)
-      x = a;
-    lagrange_solve(Sys);
-
     max_deviation = MAX(max_deviation, fabs(lmm_variable_getvalue(R_1) - x));
     max_deviation = MAX(max_deviation, fabs(lmm_variable_getvalue(R_3) - x));
     max_deviation = MAX(max_deviation, fabs(lmm_variable_getvalue(R_2) - (b - a + x)));
@@ -187,8 +164,6 @@ static void test1(method_t method)
       XBT_WARN("Deviation from optimal solution (R_1_2_3 = %g): %1.20f", a - x,
                lmm_variable_getvalue(R_1_2_3) - (a - x));
     }
-  } else {
-    xbt_die( "Invalid method");
   }
 
   PRINT_VAR(R_1_2_3);
@@ -205,24 +180,17 @@ static void test1(method_t method)
 
 static void test2(method_t method)
 {
-  lmm_system_t Sys = nullptr;
-  lmm_constraint_t CPU1 = nullptr;
-  lmm_constraint_t CPU2 = nullptr;
-
-  lmm_variable_t T1 = nullptr;
-  lmm_variable_t T2 = nullptr;
-
   if (method == LAGRANGE_VEGAS)
     lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
-  else if (method == LAGRANGE_RENO)
+  if (method == LAGRANGE_RENO)
     lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
 
-  Sys = lmm_system_new(1);
-  CPU1 = lmm_constraint_new(Sys, (void *) "CPU1", 200.0);
-  CPU2 = lmm_constraint_new(Sys, (void *) "CPU2", 100.0);
+  lmm_system_t Sys = lmm_system_new(1);
+  lmm_constraint_t CPU1 = lmm_constraint_new(Sys, nullptr, 200.0);
+  lmm_constraint_t CPU2 = lmm_constraint_new(Sys, nullptr, 100.0);
 
-  T1 = lmm_variable_new(Sys, (void *) "T1", 1.0, -1.0, 1);
-  T2 = lmm_variable_new(Sys, (void *) "T2", 1.0, -1.0, 1);
+  lmm_variable_t T1 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);
+  lmm_variable_t T2 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);
 
   lmm_update_variable_weight(Sys, T1, 1.0);
   lmm_update_variable_weight(Sys, T2, 1.0);
@@ -232,9 +200,7 @@ static void test2(method_t method)
 
   if (method == MAXMIN) {
     lmm_solve(Sys);
-  } else if (method == LAGRANGE_VEGAS) {
-    lagrange_solve(Sys);
-  } else if (method == LAGRANGE_RENO) {
+  } else if (method == LAGRANGE_VEGAS || method == LAGRANGE_RENO) {
     lagrange_solve(Sys);
   } else {
     xbt_die("Invalid method");
@@ -253,24 +219,13 @@ static void test3(method_t method)
   int flows = 11;
   int links = 10;
 
-  int i = 0;
-  int j = 0;
-
-  double **A;
-
-  lmm_system_t Sys = nullptr;
-  lmm_constraint_t *tmp_cnst = nullptr;
-  lmm_variable_t *tmp_var = nullptr;
-  char **tmp_name;
-
-  /*array to add the the constraints of fictitious variables */
+  double **A = xbt_new0(double *, links + 5);
+  /* array to add the constraints of fictitious variables */
   double B[15] = { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1 };
 
-  A = xbt_new0(double *, links + 5);
-
-  for (i = 0; i < links + 5; i++) {
+  for (int i = 0; i < links + 5; i++) {
     A[i] = xbt_new0(double, flows + 5);
-    for (j = 0; j < flows + 5; j++) {
+    for (int j = 0; j < flows + 5; j++) {
       A[i][j] = 0.0;
 
       if (i >= links || j >= flows) {
@@ -298,36 +253,28 @@ static void test3(method_t method)
 
   if (method == LAGRANGE_VEGAS)
     lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
-  else if (method == LAGRANGE_RENO)
+  if (method == LAGRANGE_RENO)
     lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
 
-  Sys = lmm_system_new(1);
-
-  tmp_name = xbt_new0(char *, 31);
+  lmm_system_t Sys = lmm_system_new(1);
 
   /* Creates the constraints */
-  tmp_cnst = xbt_new0(lmm_constraint_t, 15);
-  for (i = 0; i < 15; i++) {
-    tmp_name[i] = bprintf("C_%03d", i);
-    tmp_cnst[i] = lmm_constraint_new(Sys, (void *) tmp_name[i], B[i]);
-  }
+  lmm_constraint_t *tmp_cnst = xbt_new0(lmm_constraint_t, 15);
+  for (int i = 0; i < 15; i++)
+    tmp_cnst[i] = lmm_constraint_new(Sys, nullptr, B[i]);
 
   /* Creates the variables */
-  tmp_var = xbt_new0(lmm_variable_t, 16);
-  for (j = 0; j < 16; j++) {
-    tmp_name[i + j] = bprintf("X_%03d", j);
-    tmp_var[j] = lmm_variable_new(Sys, (void *) tmp_name[i + j], 1.0, -1.0, 15);
+  lmm_variable_t *tmp_var = xbt_new0(lmm_variable_t, 16);
+  for (int j = 0; j < 16; j++) {
+    tmp_var[j] = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 15);
     lmm_update_variable_weight(Sys, tmp_var[j], 1.0);
   }
 
   /* Link constraints and variables */
-  for (i = 0; i < 15; i++) {
-    for (j = 0; j < 16; j++) {
-      if (A[i][j]) {
+  for (int i = 0; i < 15; i++)
+    for (int j = 0; j < 16; j++)
+      if (A[i][j])
         lmm_expand(Sys, tmp_cnst[i], tmp_var[j], 1.0);
-      }
-    }
-  }
 
   if (method == MAXMIN) {
     lmm_solve(Sys);
@@ -339,27 +286,22 @@ static void test3(method_t method)
     xbt_die("Invalid method");
   }
 
-  for (j = 0; j < 16; j++) {
+  for (int j = 0; j < 16; j++)
     PRINT_VAR(tmp_var[j]);
-  }
 
-  for (j = 0; j < 16; j++)
+  for (int j = 0; j < 16; j++)
     lmm_variable_free(Sys, tmp_var[j]);
   xbt_free(tmp_var);
   xbt_free(tmp_cnst);
-  for (i = 0; i < 31; i++)
-    xbt_free(tmp_name[i]);
-  xbt_free(tmp_name);
   lmm_system_free(Sys);
-  for (i = 0; i < links + 5; i++)
+  for (int i = 0; i < links + 5; i++)
     xbt_free(A[i]);
   xbt_free(A);
 }
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-  surf_init(&argc, argv);
-
+  MSG_init(&argc, argv);
   XBT_INFO("***** Test 1 (Max-Min)");
   test1(MAXMIN);
   XBT_INFO("***** Test 1 (Lagrange - Vegas)");
@@ -381,6 +323,5 @@ int main(int argc, char **argv)
   XBT_INFO("***** Test 3 (Lagrange - Reno)");
   test3(LAGRANGE_RENO);
 
-  surf_exit();
   return 0;
 }