summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
bdaf3e0)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3444
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
typedef enum {
MAXMIN,
SDP,
typedef enum {
MAXMIN,
SDP,
- LAGRANGE,
- LAGRANGEDICO
} method_t;
void test1(method_t method);
} method_t;
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");
/* 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 - dicotomi) ***** \n");
- test1(LAGRANGEDICO);
+/* #ifdef HAVE_SDP */
+/* DEBUG0("***** Test 1 (SDP) ***** \n"); */
+/* test1(SDP); */
+/* #endif */
+/* DEBUG0("***** Test 1 (Lagrange - dicotomi) ***** \n"); */
+/* test1(LAGRANGE); */
/* DEBUG0("***** Test 2 (Max-Min) ***** \n"); */
/* DEBUG0("***** Test 2 (Max-Min) ***** \n"); */
/* 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);