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
Cleanups and cosmeticsCleanups and cosmetics
[simgrid.git]
/
testsuite
/
surf
/
simeng_usage.c
diff --git
a/testsuite/surf/simeng_usage.c
b/testsuite/surf/simeng_usage.c
index
71b71bc
..
7851a3e
100644
(file)
--- a/
testsuite/surf/simeng_usage.c
+++ b/
testsuite/surf/simeng_usage.c
@@
-68,6
+68,12
@@
void test1(method_t method)
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);
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_expand(Sys, L1, R_1_2_3, 1.0);
lmm_expand(Sys, L2, R_1_2_3, 1.0);
lmm_expand(Sys, L3, R_1_2_3, 1.0);
lmm_expand(Sys, L1, R_1_2_3, 1.0);
lmm_expand(Sys, L2, R_1_2_3, 1.0);
lmm_expand(Sys, L3, R_1_2_3, 1.0);
@@
-78,13
+84,6
@@
void test1(method_t method)
lmm_expand(Sys, L3, R_3, 1.0);
lmm_expand(Sys, L3, R_3, 1.0);
- PRINT_VAR(R_1_2_3);
- PRINT_VAR(R_1);
- PRINT_VAR(R_2);
- PRINT_VAR(R_3);
-
- DEBUG0("\n");
-
if(method==MAXMIN){
lmm_solve(Sys);
if(method==MAXMIN){
lmm_solve(Sys);
@@
-136,13
+135,13
@@
void test2(method_t method)
T1 = lmm_variable_new(Sys, (void *) "T1", 1.0 , -1.0 , 1);
T2 = lmm_variable_new(Sys, (void *) "T2", 1.0 , -1.0 , 1);
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_expand(Sys, CPU1, T1, 1.0);
lmm_expand(Sys, CPU2, T2, 1.0);
lmm_expand(Sys, CPU1, T1, 1.0);
lmm_expand(Sys, CPU2, T2, 1.0);
- PRINT_VAR(T1);
- PRINT_VAR(T2);
-
- DEBUG0("\n");
if(method==MAXMIN){
if(method==MAXMIN){
@@
-310,6
+309,7
@@
void test3(method_t method)
for(j=0; j<16; j++){
sprintf(tmp_name[i+j], "X_%03d", j);
tmp_var[j] = lmm_variable_new(Sys, (void *) tmp_name[i+j], 1.0, -1.0 , 15);
for(j=0; j<16; j++){
sprintf(tmp_name[i+j], "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);
}
/*
}
/*
@@
-324,12
+324,6
@@
void test3(method_t method)
}
}
- lmm_print(Sys);
-
-
- for(j=0; j<16; j++){
- PRINT_VAR(tmp_var[j]);
- }
if(method==MAXMIN){
lmm_solve(Sys);
if(method==MAXMIN){
lmm_solve(Sys);
@@
-366,6
+360,12
@@
int main(int argc, char **argv)
xbt_init(&argc,argv);
xbt_init(&argc,argv);
+ DEBUG0("**************************** \n");
+ DEBUG0("***** ***** \n");
+ DEBUG0("***** TEST 1 ***** \n");
+ DEBUG0("***** ***** \n");
+ DEBUG0("**************************** \n");
+
DEBUG0("***** Test 1 (Max-Min) ***** \n");
test1(MAXMIN);
DEBUG0("***** Test 1 (Max-Min) ***** \n");
test1(MAXMIN);
@@
-378,6
+378,14
@@
int main(int argc, char **argv)
DEBUG0("***** Test 1 (Lagrange - Reno) ***** \n");
test1(LAGRANGE_RENO);
DEBUG0("***** Test 1 (Lagrange - Reno) ***** \n");
test1(LAGRANGE_RENO);
+
+ DEBUG0("**************************** \n");
+ DEBUG0("***** ***** \n");
+ DEBUG0("***** TEST 2 ***** \n");
+ DEBUG0("***** ***** \n");
+ DEBUG0("**************************** \n");
+
+
DEBUG0("***** Test 2 (Max-Min) ***** \n");
test2(MAXMIN);
#ifdef HAVE_SDP
DEBUG0("***** Test 2 (Max-Min) ***** \n");
test2(MAXMIN);
#ifdef HAVE_SDP
@@
-389,6
+397,15
@@
int main(int argc, char **argv)
DEBUG0("***** Test 2 (Lagrange - Reno) ***** \n");
test2(LAGRANGE_RENO);
DEBUG0("***** Test 2 (Lagrange - Reno) ***** \n");
test2(LAGRANGE_RENO);
+
+
+ DEBUG0("**************************** \n");
+ DEBUG0("***** ***** \n");
+ DEBUG0("***** TEST 3 ***** \n");
+ DEBUG0("***** ***** \n");
+ DEBUG0("**************************** \n");
+
+
DEBUG0("***** Test 3 (Max-Min) ***** \n");
test3(MAXMIN);
#ifdef HAVE_SDP
DEBUG0("***** Test 3 (Max-Min) ***** \n");
test3(MAXMIN);
#ifdef HAVE_SDP