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
Added the test of lagrange with optimal step, also called lagrange
[simgrid.git]
/
testsuite
/
surf
/
simeng_usage.c
diff --git
a/testsuite/surf/simeng_usage.c
b/testsuite/surf/simeng_usage.c
index
f7a36fb
..
4d14b74
100644
(file)
--- a/
testsuite/surf/simeng_usage.c
+++ b/
testsuite/surf/simeng_usage.c
@@
-31,7
+31,8
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,"Messages specific for surf example");
typedef enum {
MAXMIN,
SDP,
typedef enum {
MAXMIN,
SDP,
- LAGRANGE
+ LAGRANGE,
+ LAGRANGEDICO
} method_t;
void test1(method_t method);
} method_t;
void test1(method_t method);
@@
-81,6
+82,8
@@
void test1(method_t method)
#endif
else if(method==LAGRANGE)
lagrange_solve(Sys);
#endif
else if(method==LAGRANGE)
lagrange_solve(Sys);
+ else if(method==LAGRANGEDICO)
+ lagrange_dicotomi_solve(Sys);
else
xbt_assert0(0,"Invalid method");
else
xbt_assert0(0,"Invalid method");
@@
-317,12
+320,12
@@
int main(int argc, char **argv)
/* DEBUG0("***** Test 1 (Max-Min) ***** \n"); */
/* test1(MAXMIN); */
/* DEBUG0("***** Test 1 (Max-Min) ***** \n"); */
/* test1(MAXMIN); */
-/* #ifdef HAVE_SDP */
-/* DEBUG0("***** Test 1 (SDP) ***** \n"); */
-/* test1(SDP); */
-/* #endif */
-/* DEBUG0("***** Test 1 (Lagrange) ***** \n"); */
-/* test1(LAGRANGE); */
+#ifdef HAVE_SDP
+ DEBUG0("***** Test 1 (SDP) ***** \n");
+ test1(SDP);
+#endif
+ DEBUG0("***** Test 1 (Lagrange - dicotomi) ***** \n");
+ test1(LAGRANGEDICO);
/* DEBUG0("***** Test 2 (Max-Min) ***** \n"); */
/* DEBUG0("***** Test 2 (Max-Min) ***** \n"); */
@@
-338,12
+341,12
@@
int main(int argc, char **argv)
/* DEBUG0("***** Test 3 (Max-Min) ***** \n"); */
/* test3(MAXMIN); */
/* DEBUG0("***** Test 3 (Max-Min) ***** \n"); */
/* test3(MAXMIN); */
-#ifdef HAVE_SDP
- DEBUG0("***** Test 3 (SDP) ***** \n");
- test3(SDP);
-#endif
- DEBUG0("***** Test 3 (Lagrange) ***** \n");
- test3(LAGRANGE);
+/* #ifdef HAVE_SDP */
+/* DEBUG0("***** Test 3 (SDP) ***** \n"); */
+/* test3(SDP); */
+/* #endif */
+/* DEBUG0("***** Test 3 (Lagrange) ***** \n"); */
+/* test3(LAGRANGE); */
return 0;
return 0;