#include "xbt/module.h"
#include <math.h>
-
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
- "Messages specific for surf example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
#define PRINT_VAR(var) DEBUG1(#var " = %g",lmm_variable_getvalue(var));
#define SHOW_EXPR(expr) DEBUG1(#expr " = %g",expr);
typedef enum {
MAXMIN,
- SDP,
LAGRANGE_RENO,
LAGRANGE_VEGAS,
} method_t;
static double dichotomy(double func(double), double min, double max,
- double min_error)
+ double min_error)
{
double middle;
double min_func, max_func, middle_func;
if ((min_func > 0 && max_func < 0))
abort();
+ SHOW_EXPR(min_error);
+
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)) {
+ (min_func < 0 && max_func < 0) || (min_func > 0 && max_func < 0)) {
abort();
}
+ SHOW_EXPR(min);
+ SHOW_EXPR(min_func);
+ SHOW_EXPR(max);
+ SHOW_EXPR(max_func);
+
middle = (max + min) / 2.0;
if ((min == middle) || (max == middle)) {
break;
}
middle_func = func(middle);
+ SHOW_EXPR(middle);
+ SHOW_EXPR(middle_func);
if (middle_func < 0) {
min = middle;
min_func = middle_func;
- overall_error = max - middle_func;
+ overall_error = max_func - middle_func;
} else if (middle_func > 0) {
max = middle;
max_func = middle_func;
- overall_error = max - middle_func;
+ overall_error = middle_func - min_func;
} else {
overall_error = 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)));
+ 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)));
}
void test1(method_t method);
if (method == LAGRANGE_VEGAS)
lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,
- func_vegas_fpi);
+ func_vegas_fpi);
else if (method == LAGRANGE_RENO)
lmm_set_default_protocol_function(func_reno_f, func_reno_fpi,
- func_reno_fpi);
+ func_reno_fpi);
Sys = lmm_system_new();
L1 = lmm_constraint_new(Sys, (void *) "L1", a);
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_update_variable_latency(Sys, R_1_2_3, 1.0);
- lmm_update_variable_latency(Sys, R_1, 1.0);
- lmm_update_variable_latency(Sys, R_2, 1.0);
- lmm_update_variable_latency(Sys, R_3, 1.0);
+ lmm_update_variable_weight(Sys, R_1_2_3, 1.0);
+ lmm_update_variable_weight(Sys, R_1, 1.0);
+ lmm_update_variable_weight(Sys, R_2, 1.0);
+ lmm_update_variable_weight(Sys, R_3, 1.0);
lmm_expand(Sys, L1, R_1_2_3, 1.0);
lmm_expand(Sys, L2, R_1_2_3, 1.0);
if (method == MAXMIN) {
lmm_solve(Sys);
-#ifdef HAVE_SDP
- } else if (method == SDP) {
- sdp_solve(Sys);
-#endif
} else if (method == LAGRANGE_VEGAS) {
double x = 3 * a / 4 - 3 * b / 8 +
- sqrt(9 * b * b + 4 * a * a - 4 * a * 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) {
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_1) - x));
+ MAX(max_deviation, fabs(lmm_variable_getvalue(R_2) - (b - a + 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)));
+ MAX(max_deviation, fabs(lmm_variable_getvalue(R_1_2_3) - (a - x)));
if (max_deviation > MAXMIN_PRECISION) {
WARN1("Max Deviation from optimal solution : %g", max_deviation);
WARN1("Found x = %1.20f", x);
WARN2("Deviation from optimal solution (R_1 = %g): %1.20f", x,
- lmm_variable_getvalue(R_1) - x);
+ lmm_variable_getvalue(R_1) - x);
WARN2("Deviation from optimal solution (R_2 = %g): %1.20f",
- b - a + x, lmm_variable_getvalue(R_2) - (b - a + x));
+ b - a + x, lmm_variable_getvalue(R_2) - (b - a + x));
WARN2("Deviation from optimal solution (R_3 = %g): %1.20f", x,
- lmm_variable_getvalue(R_3) - x);
+ lmm_variable_getvalue(R_3) - x);
WARN2("Deviation from optimal solution (R_1_2_3 = %g): %1.20f",
- a - x, lmm_variable_getvalue(R_1_2_3) - (a - x));
+ a - x, lmm_variable_getvalue(R_1_2_3) - (a - x));
}
} else if (method == LAGRANGE_RENO) {
double x;
a_test_1 = a;
b_test_1 = b;
- x = dichotomy(diff_lagrange_test_1, 0, a, 1e-8);
+ x = dichotomy(diff_lagrange_test_1, 0, a, 1e-13);
if (x < 0)
x = 0;
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_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(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)));
+ MAX(max_deviation, fabs(lmm_variable_getvalue(R_1_2_3) - (a - x)));
if (max_deviation > MAXMIN_PRECISION) {
WARN1("Max Deviation from optimal solution : %g", max_deviation);
WARN1("Found x = %1.20f", x);
WARN2("Deviation from optimal solution (R_1 = %g): %1.20f", x,
- lmm_variable_getvalue(R_1) - x);
+ lmm_variable_getvalue(R_1) - x);
WARN2("Deviation from optimal solution (R_2 = %g): %1.20f",
- b - a + x, lmm_variable_getvalue(R_2) - (b - a + x));
+ b - a + x, lmm_variable_getvalue(R_2) - (b - a + x));
WARN2("Deviation from optimal solution (R_3 = %g): %1.20f", x,
- lmm_variable_getvalue(R_3) - x);
+ lmm_variable_getvalue(R_3) - x);
WARN2("Deviation from optimal solution (R_1_2_3 = %g): %1.20f",
- a - x, lmm_variable_getvalue(R_1_2_3) - (a - x));
+ a - x, lmm_variable_getvalue(R_1_2_3) - (a - x));
}
} else {
xbt_assert0(0, "Invalid method");
if (method == LAGRANGE_VEGAS)
lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,
- func_vegas_fpi);
+ func_vegas_fpi);
else if (method == LAGRANGE_RENO)
lmm_set_default_protocol_function(func_reno_f, func_reno_fp,
- func_reno_fpi);
+ func_reno_fpi);
Sys = lmm_system_new();
CPU1 = lmm_constraint_new(Sys, (void *) "CPU1", 200.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_update_variable_latency(Sys, T1, 1.0);
- lmm_update_variable_latency(Sys, T2, 1.0);
+ lmm_update_variable_weight(Sys, T1, 1.0);
+ lmm_update_variable_weight(Sys, T2, 1.0);
lmm_expand(Sys, CPU1, T1, 1.0);
if (method == MAXMIN) {
lmm_solve(Sys);
-#ifdef HAVE_SDP
- } else if (method == SDP) {
- sdp_solve(Sys);
-#endif
} else if (method == LAGRANGE_VEGAS) {
lagrange_solve(Sys);
} else if (method == LAGRANGE_RENO) {
1, 1, 1, 1, 1
};
- A = (double **) calloc(links + 5, sizeof(double));
+ /*A = xbt_new0(double*, links + 5); */
+ A = xbt_new0(double *, links + 5);
for (i = 0; i < links + 5; i++) {
- A[i] = (double *) calloc(flows + 5, sizeof(double));
-
+ A[i] = xbt_new0(double, flows + 5);
for (j = 0; j < flows + 5; j++) {
A[i][j] = 0.0;
if (i >= links || j >= flows) {
- A[i][j] = 0.0;
+ A[i][j] = 0.0;
}
}
}
if (method == LAGRANGE_VEGAS)
lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,
- func_vegas_fpi);
+ func_vegas_fpi);
else if (method == LAGRANGE_RENO)
lmm_set_default_protocol_function(func_reno_f, func_reno_fp,
- func_reno_fpi);
+ func_reno_fpi);
Sys = lmm_system_new();
- tmp_name = (char **) calloc(31, sizeof(char *));
- for (i = 0; i < 31; i++) {
- tmp_name[i] = (char *) calloc(10, sizeof(char));
- }
+ tmp_name = xbt_new0(char *, 31);
/*
* Creates the constraints
*/
- tmp_cnst = calloc(15, sizeof(lmm_constraint_t));
+ tmp_cnst = xbt_new0(lmm_constraint_t, 15);
for (i = 0; i < 15; i++) {
- sprintf(tmp_name[i], "C_%03d", i);
+ tmp_name[i] = bprintf("C_%03d", i);
tmp_cnst[i] = lmm_constraint_new(Sys, (void *) tmp_name[i], B[i]);
}
/*
* Creates the variables
*/
- tmp_var = calloc(16, sizeof(lmm_variable_t));
+ tmp_var = xbt_new0(lmm_variable_t, 16);
for (j = 0; j < 16; j++) {
- sprintf(tmp_name[i + j], "X_%03d", 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_update_variable_latency(Sys, tmp_var[j], 1.0);
+ lmm_variable_new(Sys, (void *) tmp_name[i + j], 1.0, -1.0, 15);
+ lmm_update_variable_weight(Sys, tmp_var[j], 1.0);
}
/*
for (i = 0; i < 15; i++) {
for (j = 0; j < 16; j++) {
if (A[i][j]) {
- lmm_expand(Sys, tmp_cnst[i], tmp_var[j], 1.0);
+ lmm_expand(Sys, tmp_cnst[i], tmp_var[j], 1.0);
}
}
}
if (method == MAXMIN) {
lmm_solve(Sys);
-#ifdef HAVE_SDP
- } else if (method == SDP) {
- sdp_solve(Sys);
-#endif
} else if (method == LAGRANGE_VEGAS) {
lagrange_solve(Sys);
} else if (method == LAGRANGE_RENO) {
INFO0("***** Test 1 (Max-Min)");
test1(MAXMIN);
-#ifdef HAVE_SDP
- INFO0("***** Test 1 (SDP)");
- test1(SDP);
-#endif
INFO0("***** Test 1 (Lagrange - Vegas)");
test1(LAGRANGE_VEGAS);
INFO0("***** Test 1 (Lagrange - Reno)");
test1(LAGRANGE_RENO);
-
-
+
+
INFO0("***** Test 2 (Max-Min)");
test2(MAXMIN);
-#ifdef HAVE_SDP
- INFO0("***** Test 2 (SDP)");
- test2(SDP);
-#endif
INFO0("***** Test 2 (Lagrange - Vegas)");
test2(LAGRANGE_VEGAS);
INFO0("***** Test 2 (Lagrange - Reno)");
INFO0("***** Test 3 (Max-Min)");
test3(MAXMIN);
-#ifdef HAVE_SDP
- INFO0("***** Test 3 (SDP)");
- test3(SDP);
-#endif
INFO0("***** Test 3 (Lagrange - Vegas)");
test3(LAGRANGE_VEGAS);
INFO0("***** Test 3 (Lagrange - Reno)");
test3(LAGRANGE_RENO);
+ xbt_exit();
return 0;
}
