X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..ebcb91551aa801d2353d854ffe9c1d1bf72d7db9:/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 c671bda967..c35f43779c 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 "simgrid/msg.h" +#include "src/surf/surf_interface.hpp" #include "surf/maxmin.h" #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"); @@ -259,7 +260,7 @@ static void test3(method_t method) /* Creates the constraints */ lmm_constraint_t *tmp_cnst = xbt_new0(lmm_constraint_t, 15); - for (int i = 0; i < 15; i++) + for (int i = 0; i < 15; i++) tmp_cnst[i] = lmm_constraint_new(Sys, nullptr, B[i]); /* Creates the variables */ @@ -298,10 +299,9 @@ static void test3(method_t method) 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)"); @@ -323,6 +323,5 @@ int main(int argc, char **argv) XBT_INFO("***** Test 3 (Lagrange - Reno)"); test3(LAGRANGE_RENO); - surf_exit(); return 0; }