XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
-#define PRINT_VAR(var) XBT_DEBUG(#var " = %g",lmm_variable_getvalue(var));
-#define SHOW_EXPR(expr) XBT_DEBUG(#expr " = %g",expr);
+#define PRINT_VAR(var) XBT_DEBUG(#var " = %g",lmm_variable_getvalue(var))
+#define SHOW_EXPR(expr) XBT_DEBUG(#expr " = %g",expr)
/* ______ */
/* ==l1== L2 ==L3== */
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);
SHOW_EXPR(max_func);
double middle = (max + min) / 2.0;
- if ((min == middle) || (max == middle)) {
+ if (fabs(min - middle) < 1e-12 || fabs(max - middle) < 1e-12) {
break;
}
double middle_func = func(middle);
static void test1(method_t method)
{
- lmm_system_t Sys = NULL;
- lmm_constraint_t L1 = NULL;
- lmm_constraint_t L2 = NULL;
- lmm_constraint_t L3 = NULL;
-
- lmm_variable_t R_1_2_3 = NULL;
- lmm_variable_t R_1 = NULL;
- lmm_variable_t R_2 = NULL;
- lmm_variable_t R_3 = NULL;
-
- double a = 1.0, b = 10.0;
+ double a = 1.0;
+ double b = 10.0;
if (method == LAGRANGE_VEGAS)
lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
else if (method == LAGRANGE_RENO)
lmm_set_default_protocol_function(func_reno_f, func_reno_fpi, func_reno_fpi);
- Sys = lmm_system_new(1);
- L1 = lmm_constraint_new(Sys, (void *) "L1", a);
- L2 = lmm_constraint_new(Sys, (void *) "L2", b);
- L3 = lmm_constraint_new(Sys, (void *) "L3", a);
+ lmm_system_t Sys = lmm_system_new(1);
+ 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);
- R_1_2_3 = lmm_variable_new(Sys, (void *) "R 1->2->3", 1.0, -1.0, 3);
- R_1 = lmm_variable_new(Sys, (void *) "R 1", 1.0, -1.0, 1);
- R_2 = lmm_variable_new(Sys, (void *) "R 2", 1.0, -1.0, 1);
- R_3 = lmm_variable_new(Sys, (void *) "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);
if (method == MAXMIN) {
lmm_solve(Sys);
- } else if (method == LAGRANGE_VEGAS) {
- double 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 */
- double max_deviation = 0.0;
- if (x > a) {
- x = a;
- }
- if (x < 0) {
- x = 0;
+ } 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 */
+ if (x > a) {
+ x = a;
+ }
+ if (x < 0) {
+ x = 0;
+ }
+ } else if (method == LAGRANGE_RENO) {
+ a_test_1 = a;
+ b_test_1 = b;
+ x = dichotomy(diff_lagrange_test_1, 0, a, 1e-13);
+
+ if (x < 0)
+ x = 0;
+ if (x > a)
+ x = a;
+ } else {
+ xbt_die( "Invalid method");
}
lagrange_solve(Sys);
- 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)));
-
- 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));
- }
- } else if (method == LAGRANGE_RENO) {
- double x;
double max_deviation = 0.0;
-
- a_test_1 = a;
- b_test_1 = b;
- x = dichotomy(diff_lagrange_test_1, 0, a, 1e-13);
-
- if (x < 0)
- x = 0;
- if (x > a)
- x = a;
- lagrange_solve(Sys);
-
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)));
XBT_WARN("Deviation from optimal solution (R_1_2_3 = %g): %1.20f", a - x,
lmm_variable_getvalue(R_1_2_3) - (a - x));
}
- } else {
- xbt_die( "Invalid method");
}
PRINT_VAR(R_1_2_3);
static void test2(method_t method)
{
- lmm_system_t Sys = NULL;
- lmm_constraint_t CPU1 = NULL;
- lmm_constraint_t CPU2 = NULL;
-
- lmm_variable_t T1 = NULL;
- lmm_variable_t T2 = NULL;
-
if (method == LAGRANGE_VEGAS)
lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
- else if (method == LAGRANGE_RENO)
+ if (method == LAGRANGE_RENO)
lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
- Sys = lmm_system_new(1);
- CPU1 = lmm_constraint_new(Sys, (void *) "CPU1", 200.0);
- CPU2 = lmm_constraint_new(Sys, (void *) "CPU2", 100.0);
+ lmm_system_t Sys = lmm_system_new(1);
+ lmm_constraint_t CPU1 = lmm_constraint_new(Sys, nullptr, 200.0);
+ lmm_constraint_t CPU2 = lmm_constraint_new(Sys, nullptr, 100.0);
- T1 = lmm_variable_new(Sys, (void *) "T1", 1.0, -1.0, 1);
- T2 = lmm_variable_new(Sys, (void *) "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);
if (method == MAXMIN) {
lmm_solve(Sys);
- } else if (method == LAGRANGE_VEGAS) {
- lagrange_solve(Sys);
- } else if (method == LAGRANGE_RENO) {
+ } else if (method == LAGRANGE_VEGAS || method == LAGRANGE_RENO) {
lagrange_solve(Sys);
} else {
xbt_die("Invalid method");
int flows = 11;
int links = 10;
- int i = 0;
- int j = 0;
-
- double **A;
-
- lmm_system_t Sys = NULL;
- lmm_constraint_t *tmp_cnst = NULL;
- lmm_variable_t *tmp_var = NULL;
- char **tmp_name;
-
- /*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 (i = 0; i < links + 5; i++) {
+ for (int i = 0; i < links + 5; i++) {
A[i] = xbt_new0(double, flows + 5);
- for (j = 0; j < flows + 5; j++) {
+ for (int j = 0; j < flows + 5; j++) {
A[i][j] = 0.0;
if (i >= links || j >= flows) {
if (method == LAGRANGE_VEGAS)
lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
- else if (method == LAGRANGE_RENO)
+ if (method == LAGRANGE_RENO)
lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
- Sys = lmm_system_new(1);
-
- tmp_name = xbt_new0(char *, 31);
+ lmm_system_t Sys = lmm_system_new(1);
/* 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, (void *) tmp_name[i], B[i]);
- }
+ lmm_constraint_t *tmp_cnst = xbt_new0(lmm_constraint_t, 15);
+ for (int i = 0; i < 15; i++)
+ tmp_cnst[i] = lmm_constraint_new(Sys, 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, (void *) tmp_name[i + j], 1.0, -1.0, 15);
+ lmm_variable_t *tmp_var = xbt_new0(lmm_variable_t, 16);
+ for (int j = 0; j < 16; j++) {
+ 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 (i = 0; i < 15; i++) {
- for (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);
xbt_die("Invalid method");
}
- for (j = 0; j < 16; j++) {
+ for (int j = 0; j < 16; j++)
PRINT_VAR(tmp_var[j]);
- }
- for (j = 0; j < 16; j++)
+ for (int 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++)
+ for (int i = 0; i < links + 5; i++)
xbt_free(A[i]);
xbt_free(A);
}
