/* A few tests for the maxmin library */
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2020. 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"
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== */
/* ------ */
-static lmm::System* new_system()
-{
- return lmm::make_new_maxmin_system(false);
-}
-
-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)));
-}
-
-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);
-}
-
static void test1()
{
double a = 1.0;
double b = 10.0;
- lmm::System* Sys = new_system();
+ lmm::System* Sys = lmm::make_new_maxmin_system(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);
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->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);
Sys->expand(L1, R_1_2_3, 1.0);
Sys->expand(L2, R_1_2_3, 1.0);
static void test2()
{
- lmm::System* Sys = new_system();
+ lmm::System* Sys = lmm::make_new_maxmin_system(false);
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);
- 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);
A[13][14] = 1.0;
A[14][15] = 1.0;
- lmm::System* Sys = new_system();
+ lmm::System* Sys = lmm::make_new_maxmin_system(false);
/* Creates the constraints */
lmm::Constraint** tmp_cnst = new lmm::Constraint*[15];
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);
+ 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])
+ if (A[i][j] != 0.0)
Sys->expand(tmp_cnst[i], tmp_var[j], 1.0);
Sys->solve();
int main(int argc, char** argv)
{
- MSG_init(&argc, argv);
+ simgrid::s4u::Engine e(&argc, argv);
XBT_INFO("***** Test 1");
test1();