A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare the out of source build.
[simgrid.git]
/
testsuite
/
surf
/
lmm_usage.c
diff --git
a/testsuite/surf/lmm_usage.c
b/testsuite/surf/lmm_usage.c
index
5ae7e20
..
5e8f6ab
100644
(file)
--- a/
testsuite/surf/lmm_usage.c
+++ b/
testsuite/surf/lmm_usage.c
@@
-1,8
+1,7
@@
-/* $Id$ */
-
/* A few tests for the maxmin library */
/* A few tests for the maxmin library */
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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. */
/* 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. */
@@
-17,7
+16,8
@@
#include "xbt/module.h"
#include <math.h>
#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);
#define PRINT_VAR(var) DEBUG1(#var " = %g",lmm_variable_getvalue(var));
#define SHOW_EXPR(expr) DEBUG1(#expr " = %g",expr);
@@
-152,7
+152,7
@@
void test1(method_t method)
lmm_solve(Sys);
} else if (method == LAGRANGE_VEGAS) {
double x = 3 * a / 4 - 3 * b / 8 +
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;
+
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) {
/* Computed with mupad and D_f=1.0 */
double max_deviation = 0.0;
if (x > a) {
@@
-164,12
+164,14
@@
void test1(method_t method)
lagrange_solve(Sys);
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_deviation =
- MAX(max_deviation, fabs(lmm_variable_getvalue(R_2) - (b - a + x)));
+ 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_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);
if (max_deviation > MAXMIN_PRECISION) {
WARN1("Max Deviation from optimal solution : %g", max_deviation);
@@
-197,12
+199,14
@@
void test1(method_t method)
x = a;
lagrange_solve(Sys);
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_deviation =
- MAX(max_deviation, fabs(lmm_variable_getvalue(R_2) - (b - a + x)));
+ 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_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);
if (max_deviation > MAXMIN_PRECISION) {
WARN1("Max Deviation from optimal solution : %g", max_deviation);
@@
-417,7
+421,7
@@
void test3(method_t method)
for (j = 0; j < 16; j++) {
tmp_name[i + j] = bprintf("X_%03d", j);
tmp_var[j] =
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_new(Sys, (void *) tmp_name[i + j], 1.0, -1.0, 15);
lmm_update_variable_weight(Sys, tmp_var[j], 1.0);
}
lmm_update_variable_weight(Sys, tmp_var[j], 1.0);
}
@@
-486,6
+490,5
@@
int main(int argc, char **argv)
INFO0("***** Test 3 (Lagrange - Reno)");
test3(LAGRANGE_RENO);
INFO0("***** Test 3 (Lagrange - Reno)");
test3(LAGRANGE_RENO);
- xbt_exit();
return 0;
}
return 0;
}