/* A few tests for the maxmin library */
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
-using namespace simgrid::kernel;
+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)
enum method_t { MAXMIN, LAGRANGE_RENO, LAGRANGE_VEGAS };
-static lmm::System* new_system(method_t method, bool update)
+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(update);
+ return lmm::make_new_maxmin_system(false);
case LAGRANGE_VEGAS:
case LAGRANGE_RENO:
- return lmm::make_new_lagrange_system(update);
+ 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)
+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 = func(min);
- double max_func = func(max);
+ double min_func = diff_lagrange_test_1(min);
+ double max_func = diff_lagrange_test_1(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);
if (fabs(min - middle) < 1e-12 || fabs(max - middle) < 1e-12) {
break;
}
- double middle_func = func(middle);
+ double middle_func = diff_lagrange_test_1(middle);
SHOW_EXPR(middle);
SHOW_EXPR(middle_func);
return ((min + max) / 2.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)));
-}
-
static void test1(method_t method)
{
double a = 1.0;
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, true);
+ 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);
} else if (method == LAGRANGE_RENO) {
a_test_1 = a;
b_test_1 = b;
- x = dichotomy(diff_lagrange_test_1, 0, a, 1e-13);
+ x = dichotomy(0, a, 1e-13);
if (x < 0)
x = 0;
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, true);
+ lmm::System* Sys = new_system(method);
lmm::Constraint* CPU1 = Sys->constraint_new(nullptr, 200.0);
lmm::Constraint* CPU2 = Sys->constraint_new(nullptr, 100.0);
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, true);
+ lmm::System* Sys = new_system(method);
/* Creates the constraints */
lmm::Constraint** tmp_cnst = new lmm::Constraint*[15];