X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af5a9f0adb28866ee3dea430d51df4863dd47e64..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/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 7c7c8c6fd9..48f94b7fea 100644 --- a/teshsuite/surf/lmm_usage/lmm_usage.cpp +++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp @@ -1,238 +1,109 @@ /* A few tests for the maxmin library */ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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 "simgrid/msg.h" +#include "simgrid/s4u/Engine.hpp" #include "src/kernel/lmm/maxmin.hpp" #include "src/surf/surf_interface.hpp" #include "xbt/log.h" #include "xbt/module.h" #include "xbt/sysdep.h" #include +#include #include XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); namespace lmm = simgrid::kernel::lmm; -#define PRINT_VAR(var) XBT_DEBUG(#var " = %g", (var)->get_value()) -#define SHOW_EXPR(expr) XBT_DEBUG(#expr " = %g",expr) +#define PRINT_VAR(var) XBT_DEBUG(_XBT_STRINGIFY(var) " = %g", (var)->get_value()) +#define SHOW_EXPR(expr) XBT_DEBUG(_XBT_STRINGIFY(expr) " = %g", (expr)) /* ______ */ /* ==l1== L2 ==L3== */ /* ------ */ -enum method_t { MAXMIN, LAGRANGE_RENO, LAGRANGE_VEGAS }; - -static lmm::System* new_system(method_t method) +static void test1() { - /* selective update would need real actions instead of NULL as a first parameter to the variable constructor */ - switch (method) { - case MAXMIN: - return lmm::make_new_maxmin_system(false); - case LAGRANGE_VEGAS: - case LAGRANGE_RENO: - return lmm::make_new_lagrange_system(false); - default: - xbt_die("Invalid method"); - } -} + double a = 1.0; + double b = 10.0; -double a_test_1 = 0; -double b_test_1 = 0; -static double diff_lagrange_test_1(double x) -{ - return -(3 / (1 + 3 * x * x / 2) - 3 / (2 * (3 * (a_test_1 - x) * (a_test_1 - x) / 2 + 1)) + - 3 / (2 * (3 * (b_test_1 - a_test_1 + x) * (b_test_1 - a_test_1 + x) / 2 + 1))); -} + lmm::System Sys(false); + lmm::Constraint* L1 = Sys.constraint_new(nullptr, a); + lmm::Constraint* L2 = Sys.constraint_new(nullptr, b); + lmm::Constraint* L3 = Sys.constraint_new(nullptr, a); -static double dichotomy(double min, double max, double min_error) -{ - double overall_error = 2 * min_error; - - double min_func = diff_lagrange_test_1(min); - double max_func = diff_lagrange_test_1(max); - - if (min_func > 0 && max_func > 0) - return min - 1.0; - if (min_func < 0 && max_func < 0) - return max + 1.0; - if (min_func > 0 && max_func < 0) - abort(); - - SHOW_EXPR(min_error); - - while (overall_error > min_error) { - SHOW_EXPR(overall_error); - 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); - SHOW_EXPR(max); - SHOW_EXPR(max_func); - - double middle = (max + min) / 2.0; - if (fabs(min - middle) < 1e-12 || fabs(max - middle) < 1e-12) { - break; - } - double middle_func = diff_lagrange_test_1(middle); - SHOW_EXPR(middle); - SHOW_EXPR(middle_func); - - if (middle_func < 0) { - min = middle; - min_func = middle_func; - overall_error = max_func - middle_func; - } else if (middle_func > 0) { - max = middle; - max_func = middle_func; - overall_error = middle_func - min_func; - } else { - overall_error = 0; - } - } - return ((min + max) / 2.0); -} + lmm::Variable* R_1_2_3 = Sys.variable_new(nullptr, 1.0, -1.0, 3); + lmm::Variable* R_1 = Sys.variable_new(nullptr, 1.0, -1.0, 1); + lmm::Variable* R_2 = Sys.variable_new(nullptr, 1.0, -1.0, 1); + lmm::Variable* R_3 = Sys.variable_new(nullptr, 1.0, -1.0, 1); -static void test1(method_t method) -{ - double a = 1.0; - double b = 10.0; + Sys.update_variable_penalty(R_1_2_3, 1.0); + Sys.update_variable_penalty(R_1, 1.0); + Sys.update_variable_penalty(R_2, 1.0); + Sys.update_variable_penalty(R_3, 1.0); - if (method == LAGRANGE_VEGAS) - lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); - else if (method == LAGRANGE_RENO) - lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); - - lmm::System* Sys = new_system(method); - lmm::Constraint* L1 = Sys->constraint_new(nullptr, a); - lmm::Constraint* L2 = Sys->constraint_new(nullptr, b); - lmm::Constraint* L3 = Sys->constraint_new(nullptr, a); - - lmm::Variable* R_1_2_3 = Sys->variable_new(nullptr, 1.0, -1.0, 3); - lmm::Variable* R_1 = Sys->variable_new(nullptr, 1.0, -1.0, 1); - lmm::Variable* R_2 = Sys->variable_new(nullptr, 1.0, -1.0, 1); - 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); - Sys->update_variable_weight(R_2, 1.0); - Sys->update_variable_weight(R_3, 1.0); - - Sys->expand(L1, R_1_2_3, 1.0); - Sys->expand(L2, R_1_2_3, 1.0); - Sys->expand(L3, R_1_2_3, 1.0); - - Sys->expand(L1, R_1, 1.0); - Sys->expand(L2, R_2, 1.0); - Sys->expand(L3, R_3, 1.0); - - if (method == MAXMIN) { - Sys->solve(); - } 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(0, a, 1e-13); - - if (x < 0) - x = 0; - if (x > a) - x = a; - } else { - xbt_die( "Invalid method"); - } + Sys.expand(L1, R_1_2_3, 1.0); + Sys.expand(L2, R_1_2_3, 1.0); + Sys.expand(L3, R_1_2_3, 1.0); - Sys->solve(); - - double max_deviation = 0.0; - max_deviation = std::max(max_deviation, fabs(R_1->get_value() - x)); - max_deviation = std::max(max_deviation, fabs(R_3->get_value() - x)); - max_deviation = std::max(max_deviation, fabs(R_2->get_value() - (b - a + x))); - max_deviation = std::max(max_deviation, fabs(R_1_2_3->get_value() - (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, R_1->get_value() - x); - XBT_WARN("Deviation from optimal solution (R_2 = %g): %1.20f", b - a + x, R_2->get_value() - (b - a + x)); - XBT_WARN("Deviation from optimal solution (R_3 = %g): %1.20f", x, R_3->get_value() - x); - XBT_WARN("Deviation from optimal solution (R_1_2_3 = %g): %1.20f", a - x, R_1_2_3->get_value() - (a - x)); - } - } + Sys.expand(L1, R_1, 1.0); + Sys.expand(L2, R_2, 1.0); + Sys.expand(L3, R_3, 1.0); + + Sys.solve(); PRINT_VAR(R_1_2_3); PRINT_VAR(R_1); PRINT_VAR(R_2); PRINT_VAR(R_3); - Sys->variable_free(R_1_2_3); - Sys->variable_free(R_1); - Sys->variable_free(R_2); - Sys->variable_free(R_3); - delete Sys; + Sys.variable_free(R_1_2_3); + Sys.variable_free(R_1); + Sys.variable_free(R_2); + Sys.variable_free(R_3); } -static void test2(method_t method) +static void test2() { - if (method == LAGRANGE_VEGAS) - lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); - if (method == LAGRANGE_RENO) - lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); - - lmm::System* Sys = new_system(method); + lmm::System Sys(false); - lmm::Constraint* CPU1 = Sys->constraint_new(nullptr, 200.0); - lmm::Constraint* CPU2 = Sys->constraint_new(nullptr, 100.0); + lmm::Constraint* CPU1 = Sys.constraint_new(nullptr, 200.0); + lmm::Constraint* CPU2 = Sys.constraint_new(nullptr, 100.0); - lmm::Variable* T1 = Sys->variable_new(nullptr, 1.0, -1.0, 1); - lmm::Variable* T2 = Sys->variable_new(nullptr, 1.0, -1.0, 1); + lmm::Variable* T1 = Sys.variable_new(nullptr, 1.0, -1.0, 1); + 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); + Sys.update_variable_penalty(T1, 1.0); + Sys.update_variable_penalty(T2, 1.0); - Sys->expand(CPU1, T1, 1.0); - Sys->expand(CPU2, T2, 1.0); + Sys.expand(CPU1, T1, 1.0); + Sys.expand(CPU2, T2, 1.0); - Sys->solve(); + Sys.solve(); PRINT_VAR(T1); PRINT_VAR(T2); - Sys->variable_free(T1); - Sys->variable_free(T2); - delete Sys; + Sys.variable_free(T1); + Sys.variable_free(T2); } -static void test3(method_t method) +static void test3() { - int flows = 11; - int links = 10; + constexpr int flows = 11; + constexpr int links = 10; - double** A = new double*[links + 5]; + std::array, links + 5> A; /* 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 }; + std::array B{{10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1}}; for (int i = 0; i < links + 5; i++) { - A[i] = new double[flows + 5]; for (int j = 0; j < flows + 5; j++) { A[i][j] = 0.0; - if (i >= links || j >= flows) { A[i][j] = 0.0; } @@ -256,69 +127,46 @@ static void test3(method_t method) A[13][14] = 1.0; A[14][15] = 1.0; - if (method == LAGRANGE_VEGAS) - lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); - if (method == LAGRANGE_RENO) - lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); - - lmm::System* Sys = new_system(method); + lmm::System Sys(false); /* Creates the constraints */ - lmm::Constraint** tmp_cnst = new lmm::Constraint*[15]; + std::array tmp_cnst; for (int i = 0; i < 15; i++) - tmp_cnst[i] = Sys->constraint_new(nullptr, B[i]); + tmp_cnst[i] = Sys.constraint_new(nullptr, B[i]); /* Creates the variables */ - lmm::Variable** tmp_var = new lmm::Variable*[16]; + std::array tmp_var; 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); + tmp_var[j] = Sys.variable_new(nullptr, 1.0, -1.0, 15); + Sys.update_variable_penalty(tmp_var[j], 1.0); } /* Link constraints and variables */ for (int i = 0; i < 15; i++) for (int j = 0; j < 16; j++) - if (A[i][j]) - Sys->expand(tmp_cnst[i], tmp_var[j], 1.0); + if (A[i][j] != 0.0) + Sys.expand(tmp_cnst[i], tmp_var[j], 1.0); - Sys->solve(); + Sys.solve(); for (int j = 0; j < 16; j++) PRINT_VAR(tmp_var[j]); for (int j = 0; j < 16; j++) - Sys->variable_free(tmp_var[j]); - delete[] tmp_var; - delete[] tmp_cnst; - delete Sys; - for (int i = 0; i < links + 5; i++) - delete[] A[i]; - delete[] A; + Sys.variable_free(tmp_var[j]); } int main(int argc, char** argv) { - MSG_init(&argc, argv); - XBT_INFO("***** Test 1 (Max-Min)"); - test1(MAXMIN); - XBT_INFO("***** Test 1 (Lagrange - Vegas)"); - test1(LAGRANGE_VEGAS); - XBT_INFO("***** Test 1 (Lagrange - Reno)"); - test1(LAGRANGE_RENO); - - XBT_INFO("***** Test 2 (Max-Min)"); - test2(MAXMIN); - XBT_INFO("***** Test 2 (Lagrange - Vegas)"); - test2(LAGRANGE_VEGAS); - XBT_INFO("***** Test 2 (Lagrange - Reno)"); - test2(LAGRANGE_RENO); - - XBT_INFO("***** Test 3 (Max-Min)"); - test3(MAXMIN); - XBT_INFO("***** Test 3 (Lagrange - Vegas)"); - test3(LAGRANGE_VEGAS); - XBT_INFO("***** Test 3 (Lagrange - Reno)"); - test3(LAGRANGE_RENO); + simgrid::s4u::Engine e(&argc, argv); + XBT_INFO("***** Test 1"); + test1(); + + XBT_INFO("***** Test 2"); + test2(); + + XBT_INFO("***** Test 3"); + test3(); return 0; }