X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc01999f5003e51cc1d12f93647999a1a143f23..014e302e2156e34a1157c49f6347999ff20b10aa:/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 4a2c628d63..49e4073d97 100644 --- a/teshsuite/surf/lmm_usage/lmm_usage.cpp +++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp @@ -1,32 +1,45 @@ /* A few tests for the maxmin library */ -/* Copyright (c) 2007-2015. 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. */ -#include "xbt/sysdep.h" -#include "surf/maxmin.h" +#include "simgrid/msg.h" +#include "src/kernel/lmm/maxmin.hpp" +#include "src/surf/surf_interface.hpp" #include "xbt/log.h" #include "xbt/module.h" -#include -#include "src/surf/surf_interface.hpp" +#include "xbt/sysdep.h" +#include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); -#define PRINT_VAR(var) XBT_DEBUG(#var " = %g",lmm_variable_getvalue(var)) +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) /* ______ */ /* ==l1== L2 ==L3== */ /* ------ */ -typedef enum { - MAXMIN, - LAGRANGE_RENO, - LAGRANGE_VEGAS -} method_t; +enum method_t { MAXMIN, LAGRANGE_RENO, LAGRANGE_VEGAS }; + +static lmm::System* new_system(method_t method) +{ + /* 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"); + } +} static double dichotomy(double func(double), double min, double max, double min_error) { @@ -35,20 +48,20 @@ static double dichotomy(double func(double), double min, double max, double min_ double min_func = func(min); double max_func = func(max); - if ((min_func > 0 && max_func > 0)) + if (min_func > 0 && max_func > 0) return min - 1.0; - if ((min_func < 0 && max_func < 0)) + if (min_func < 0 && max_func < 0) return max + 1.0; - if ((min_func > 0 && max_func < 0)) + if (min_func > 0 && max_func < 0) abort(); SHOW_EXPR(min_error); 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); @@ -88,52 +101,41 @@ 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; double b = 10.0; - double x ; - double max_deviation = 0.0; if (method == LAGRANGE_VEGAS) - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); + lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); else if (method == LAGRANGE_RENO) - lmm_set_default_protocol_function(func_reno_f, func_reno_fpi, func_reno_fpi); + lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); - Sys = lmm_system_new(1); - L1 = lmm_constraint_new(Sys, static_cast(const_cast("L1")), a); - L2 = lmm_constraint_new(Sys, static_cast(const_cast("L2")), b); - L3 = lmm_constraint_new(Sys, static_cast(const_cast("L3")), a); + 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); - R_1_2_3 = lmm_variable_new(Sys, static_cast(const_cast( "R 1->2->3")), 1.0, -1.0, 3); - R_1 = lmm_variable_new(Sys, static_cast(const_cast( "R 1")), 1.0, -1.0, 1); - R_2 = lmm_variable_new(Sys, static_cast(const_cast( "R 2")), 1.0, -1.0, 1); - R_3 = lmm_variable_new(Sys, static_cast(const_cast( "R 3")), 1.0, -1.0, 1); + 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); - lmm_update_variable_weight(Sys, R_1_2_3, 1.0); - lmm_update_variable_weight(Sys, R_1, 1.0); - lmm_update_variable_weight(Sys, R_2, 1.0); - lmm_update_variable_weight(Sys, R_3, 1.0); + 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); - lmm_expand(Sys, L1, R_1_2_3, 1.0); - lmm_expand(Sys, L2, R_1_2_3, 1.0); - lmm_expand(Sys, L3, R_1_2_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); - lmm_expand(Sys, L1, R_1, 1.0); - lmm_expand(Sys, L2, R_2, 1.0); - lmm_expand(Sys, L3, R_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) { - lmm_solve(Sys); + 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 */ @@ -156,22 +158,21 @@ static void test1(method_t method) xbt_die( "Invalid method"); } - lagrange_solve(Sys); + Sys->solve(); - 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))); + 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, 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)); + 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)); } } @@ -180,54 +181,42 @@ static void test1(method_t method) PRINT_VAR(R_2); PRINT_VAR(R_3); - lmm_variable_free(Sys, R_1_2_3); - lmm_variable_free(Sys, R_1); - lmm_variable_free(Sys, R_2); - lmm_variable_free(Sys, R_3); - lmm_system_free(Sys); + Sys->variable_free(R_1_2_3); + Sys->variable_free(R_1); + Sys->variable_free(R_2); + Sys->variable_free(R_3); + delete Sys; } 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); + lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); if (method == LAGRANGE_RENO) - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); + lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); - Sys = lmm_system_new(1); - CPU1 = lmm_constraint_new(Sys, static_cast(const_cast( "CPU1")), 200.0); - CPU2 = lmm_constraint_new(Sys, static_cast(const_cast( "CPU2")), 100.0); + lmm::System* Sys = new_system(method); - T1 = lmm_variable_new(Sys, static_cast(const_cast( "T1")), 1.0, -1.0, 1); - T2 = lmm_variable_new(Sys, static_cast(const_cast( "T2")), 1.0, -1.0, 1); + lmm::Constraint* CPU1 = Sys->constraint_new(nullptr, 200.0); + lmm::Constraint* CPU2 = Sys->constraint_new(nullptr, 100.0); - lmm_update_variable_weight(Sys, T1, 1.0); - lmm_update_variable_weight(Sys, T2, 1.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_expand(Sys, CPU1, T1, 1.0); - lmm_expand(Sys, CPU2, T2, 1.0); + Sys->update_variable_weight(T1, 1.0); + Sys->update_variable_weight(T2, 1.0); - if (method == MAXMIN) { - lmm_solve(Sys); - } else if (method == LAGRANGE_VEGAS || method == LAGRANGE_RENO) { - lagrange_solve(Sys); - } else { - xbt_die("Invalid method"); - } + Sys->expand(CPU1, T1, 1.0); + Sys->expand(CPU2, T2, 1.0); + + Sys->solve(); PRINT_VAR(T1); PRINT_VAR(T2); - lmm_variable_free(Sys, T1); - lmm_variable_free(Sys, T2); - lmm_system_free(Sys); + Sys->variable_free(T1); + Sys->variable_free(T2); + delete Sys; } static void test3(method_t method) @@ -235,24 +224,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 = new 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++) { - A[i] = xbt_new0(double, flows + 5); - for (j = 0; j < flows + 5; j++) { + 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) { @@ -262,105 +240,65 @@ static void test3(method_t method) } /*matrix that store the constraints/topology */ - A[0][1] = 1.0; - A[0][7] = 1.0; - A[1][1] = 1.0; - A[1][7] = 1.0; - A[1][8] = 1.0; - A[2][1] = 1.0; - A[2][8] = 1.0; - A[3][8] = 1.0; - A[4][0] = 1.0; - A[4][3] = 1.0; - A[4][9] = 1.0; - A[5][0] = 1.0; - A[5][3] = 1.0; - A[5][4] = 1.0; - A[5][9] = 1.0; - A[6][0] = 1.0; - A[6][4] = 1.0; - A[6][9] = 1.0; - A[6][10] = 1.0; - A[7][2] = 1.0; - A[7][4] = 1.0; - A[7][6] = 1.0; - A[7][9] = 1.0; - A[7][10] = 1.0; - A[8][2] = 1.0; - A[8][10] = 1.0; - A[9][5] = 1.0; - A[9][6] = 1.0; - A[9][9] = 1.0; - A[10][11] = 1.0; - A[11][12] = 1.0; - A[12][13] = 1.0; - A[13][14] = 1.0; - A[14][15] = 1.0; + A[0][1] = A[0][7] = 1.0; + A[1][1] = A[1][7] = A[1][8] = 1.0; + A[2][1] = A[2][8] = 1.0; + A[3][8] = 1.0; + A[4][0] = A[4][3] = A[4][9] = 1.0; + A[5][0] = A[5][3] = A[5][4] = A[5][9] = 1.0; + A[6][0] = A[6][4] = A[6][9] = A[6][10] = 1.0; + A[7][2] = A[7][4] = A[7][6] = A[7][9] = A[7][10] = 1.0; + A[8][2] = A[8][10] = 1.0; + A[9][5] = A[9][6] = A[9][9] = 1.0; + A[10][11] = 1.0; + A[11][12] = 1.0; + A[12][13] = 1.0; + A[13][14] = 1.0; + A[14][15] = 1.0; if (method == LAGRANGE_VEGAS) - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); + lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); if (method == LAGRANGE_RENO) - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); - - Sys = lmm_system_new(1); + lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); - tmp_name = xbt_new0(char *, 31); + lmm::System* Sys = new_system(method); /* 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, static_cast(tmp_name[i]), B[i]); - } + lmm::Constraint** tmp_cnst = new lmm::Constraint*[15]; + for (int i = 0; i < 15; i++) + tmp_cnst[i] = Sys->constraint_new(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, static_cast(tmp_name[i + j]), 1.0, -1.0, 15); - lmm_update_variable_weight(Sys, tmp_var[j], 1.0); + lmm::Variable** tmp_var = new 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); } /* Link constraints and variables */ - for (i = 0; i < 15; i++) { - for (j = 0; j < 16; j++) { - if (A[i][j]) { - lmm_expand(Sys, tmp_cnst[i], tmp_var[j], 1.0); - } - } - } + 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 (method == MAXMIN) { - lmm_solve(Sys); - } else if (method == LAGRANGE_VEGAS) { - lagrange_solve(Sys); - } else if (method == LAGRANGE_RENO) { - lagrange_solve(Sys); - } else { - xbt_die("Invalid method"); - } + Sys->solve(); - for (j = 0; j < 16; j++) { + for (int j = 0; j < 16; j++) PRINT_VAR(tmp_var[j]); - } - for (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++) - xbt_free(A[i]); - xbt_free(A); + 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; } -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)"); @@ -382,6 +320,5 @@ int main(int argc, char **argv) XBT_INFO("***** Test 3 (Lagrange - Reno)"); test3(LAGRANGE_RENO); - surf_exit(); return 0; }