X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eacb93fb7e62d1886b928ea45526227cdc424428..d20f024dba9ff1e9c8822237caaf963b9e913889:/teshsuite/surf/lmm_usage/lmm_usage.cpp?ds=sidebyside diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp index dd0fc456ff..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 -#include "src/surf/surf_interface.hpp" +#include "xbt/sysdep.h" +#include XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); @@ -97,14 +98,14 @@ static void test1(method_t method) lmm_set_default_protocol_function(func_reno_f, func_reno_fpi, func_reno_fpi); lmm_system_t Sys = lmm_system_new(1); - lmm_constraint_t L1 = lmm_constraint_new(Sys, static_cast(const_cast("L1")), a); - lmm_constraint_t L2 = lmm_constraint_new(Sys, static_cast(const_cast("L2")), b); - lmm_constraint_t L3 = lmm_constraint_new(Sys, static_cast(const_cast("L3")), a); + 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); - lmm_variable_t R_1_2_3 = lmm_variable_new(Sys, static_cast(const_cast( "R 1->2->3")), 1.0, -1.0, 3); - lmm_variable_t R_1 = lmm_variable_new(Sys, static_cast(const_cast( "R 1")), 1.0, -1.0, 1); - lmm_variable_t R_2 = lmm_variable_new(Sys, static_cast(const_cast( "R 2")), 1.0, -1.0, 1); - lmm_variable_t R_3 = lmm_variable_new(Sys, static_cast(const_cast( "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); @@ -185,11 +186,11 @@ static void test2(method_t method) lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); lmm_system_t Sys = lmm_system_new(1); - lmm_constraint_t CPU1 = lmm_constraint_new(Sys, static_cast(const_cast( "CPU1")), 200.0); - lmm_constraint_t CPU2 = lmm_constraint_new(Sys, static_cast(const_cast( "CPU2")), 100.0); + lmm_constraint_t CPU1 = lmm_constraint_new(Sys, nullptr, 200.0); + lmm_constraint_t CPU2 = lmm_constraint_new(Sys, nullptr, 100.0); - lmm_variable_t T1 = lmm_variable_new(Sys, static_cast(const_cast( "T1")), 1.0, -1.0, 1); - lmm_variable_t T2 = lmm_variable_new(Sys, static_cast(const_cast( "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); @@ -218,13 +219,10 @@ static void test3(method_t method) int flows = 11; int links = 10; - double **A; - - /*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 (int i = 0; i < links + 5; i++) { A[i] = xbt_new0(double, flows + 5); for (int j = 0; j < flows + 5; j++) { @@ -237,40 +235,21 @@ 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); @@ -279,31 +258,23 @@ static void test3(method_t method) lmm_system_t Sys = lmm_system_new(1); - char **tmp_name = xbt_new0(char *, 31); - /* Creates the constraints */ lmm_constraint_t *tmp_cnst = xbt_new0(lmm_constraint_t, 15); - for (int 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]); - } + for (int i = 0; i < 15; i++) + tmp_cnst[i] = lmm_constraint_new(Sys, nullptr, B[i]); /* Creates the variables */ lmm_variable_t *tmp_var = xbt_new0(lmm_variable_t, 16); for (int j = 0; j < 16; j++) { - tmp_name[15 + j] = bprintf("X_%03d", j); - tmp_var[j] = lmm_variable_new(Sys, static_cast(tmp_name[15 + j]), 1.0, -1.0, 15); + 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 (int i = 0; i < 15; i++) { - for (int 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); @@ -315,27 +286,22 @@ static void test3(method_t method) xbt_die("Invalid method"); } - for (int j = 0; j < 16; j++) { + for (int j = 0; j < 16; j++) PRINT_VAR(tmp_var[j]); - } for (int j = 0; j < 16; j++) lmm_variable_free(Sys, tmp_var[j]); xbt_free(tmp_var); xbt_free(tmp_cnst); - for (int i = 0; i < 31; i++) - xbt_free(tmp_name[i]); - xbt_free(tmp_name); lmm_system_free(Sys); 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)"); @@ -357,6 +323,5 @@ int main(int argc, char **argv) XBT_INFO("***** Test 3 (Lagrange - Reno)"); test3(LAGRANGE_RENO); - surf_exit(); return 0; }