Keeping interfaces clean (avoid loading maxmin_private)

[simgrid.git] / testsuite / surf / simeng_usage.c

diff --git a/testsuite/surf/simeng_usage.c b/testsuite/surf/simeng_usage.c
index 75941f1..17cc29e 100644 (file)
--- a/testsuite/surf/simeng_usage.c
+++ b/testsuite/surf/simeng_usage.c
@@ -13,12 +13,13 @@
 
 #include "xbt/sysdep.h"
 #include "surf/maxmin.h"
-#include "surf/maxmin_private.h"
-
 #include "xbt/log.h"
 #include "xbt/module.h"
 
 
+
+
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,"Messages specific for surf example");
 
 #define PRINT_VAR(var) DEBUG1(#var " = %g",lmm_variable_getvalue(var));
@@ -51,10 +52,10 @@ void test1(method_t method)
 
   if(method==LAGRANGE_VEGAS){
     //set default functions for TCP Vegas
-    lmm_set_default_protocol_functions(func_vegas_f, func_vegas_fp, func_vegas_fpi, func_vegas_fpip);
+    lmm_set_default_protocol_function(func_vegas_fpi);
   }else if(method==LAGRANGE_RENO){
     //set default functions for TCP Reno
-    lmm_set_default_protocol_functions(func_reno_f, func_reno_fp, func_reno_fpi, func_reno_fpip);
+    lmm_set_default_protocol_function(func_reno_fpi);
   }
 
 
@@ -68,6 +69,11 @@ 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);
 
+  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);
@@ -116,10 +122,10 @@ void test2(method_t method)
 
   if(method==LAGRANGE_VEGAS){
     //set default functions for TCP Vegas
-    lmm_set_default_protocol_functions(func_vegas_f, func_vegas_fp, func_vegas_fpi, func_vegas_fpip);
+    lmm_set_default_protocol_function(func_vegas_fpi);
   }else if(method==LAGRANGE_RENO){
     //set default functions for TCP Reno
-    lmm_set_default_protocol_functions(func_reno_f, func_reno_fp, func_reno_fpi, func_reno_fpip);
+    lmm_set_default_protocol_function(func_reno_fpi);
   }
 
   Sys = lmm_system_new();
@@ -129,6 +135,10 @@ 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);
 
+  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);
 
@@ -153,11 +163,11 @@ void test2(method_t method)
   PRINT_VAR(T1);
   PRINT_VAR(T2);
 
-  DEBUG0("\n");
-
   lmm_system_free(Sys);
 }
 
+
+
 void test3(method_t method);
 void test3(method_t method)
 {
@@ -267,10 +277,10 @@ void test3(method_t method)
 
   if(method==LAGRANGE_VEGAS){
     //set default functions for TCP Vegas
-    lmm_set_default_protocol_functions(func_vegas_f, func_vegas_fp, func_vegas_fpi, func_vegas_fpip);
+    lmm_set_default_protocol_function(func_vegas_fpi);
   }else if(method==LAGRANGE_RENO){
     //set default functions for TCP Reno
-    lmm_set_default_protocol_functions(func_reno_f, func_reno_fp, func_reno_fpi, func_reno_fpip);
+    lmm_set_default_protocol_function(func_reno_fpi);
   }
 
   Sys = lmm_system_new();
@@ -299,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);
+    lmm_update_variable_latency(Sys, tmp_var[j], 1.0);
   }
 
   /*
@@ -349,61 +360,61 @@ int main(int argc, char **argv)
   xbt_init(&argc,argv);
 
 
-  DEBUG0("**************************** \n");
-  DEBUG0("*****                  ***** \n");
-  DEBUG0("*****      TEST 1      ***** \n");
-  DEBUG0("*****                  ***** \n");
-  DEBUG0("**************************** \n");
+  DEBUG0("**************************** ");
+  DEBUG0("*****                  ***** ");
+  DEBUG0("*****      TEST 1      ***** ");
+  DEBUG0("*****                  ***** ");
+  DEBUG0("**************************** ");
 
 
-  DEBUG0("***** Test 1 (Max-Min) ***** \n");
+  DEBUG0("***** Test 1 (Max-Min) ***** ");
   test1(MAXMIN);
 #ifdef HAVE_SDP
-  DEBUG0("***** Test 1 (SDP) ***** \n");
+  DEBUG0("***** Test 1 (SDP) ***** ");
   test1(SDP);
 #endif
-  DEBUG0("***** Test 1 (Lagrange - Vegas) ***** \n");
+  DEBUG0("***** Test 1 (Lagrange - Vegas) ***** ");
   test1(LAGRANGE_VEGAS);
-  DEBUG0("***** Test 1 (Lagrange - Reno) ***** \n");
+  DEBUG0("***** Test 1 (Lagrange - Reno) ***** ");
   test1(LAGRANGE_RENO);
 
 
-  DEBUG0("**************************** \n");
-  DEBUG0("*****                  ***** \n");
-  DEBUG0("*****      TEST 2      ***** \n");
-  DEBUG0("*****                  ***** \n");
-  DEBUG0("**************************** \n");
+  DEBUG0("**************************** ");
+  DEBUG0("*****                  ***** ");
+  DEBUG0("*****      TEST 2      ***** ");
+  DEBUG0("*****                  ***** ");
+  DEBUG0("**************************** ");
 
 
-  DEBUG0("***** Test 2 (Max-Min) ***** \n");
+  DEBUG0("***** Test 2 (Max-Min) ***** ");
   test2(MAXMIN);
 #ifdef HAVE_SDP
-  DEBUG0("***** Test 2 (SDP) ***** \n");
+  DEBUG0("***** Test 2 (SDP) ***** ");
   test2(SDP);
 #endif
-  DEBUG0("***** Test 2 (Lagrange - Vegas) ***** \n");
+  DEBUG0("***** Test 2 (Lagrange - Vegas) ***** ");
   test2(LAGRANGE_VEGAS);
-  DEBUG0("***** Test 2 (Lagrange - Reno) ***** \n");
+  DEBUG0("***** Test 2 (Lagrange - Reno) ***** ");
   test2(LAGRANGE_RENO);
 
 
 
-  DEBUG0("**************************** \n");
-  DEBUG0("*****                  ***** \n");
-  DEBUG0("*****      TEST 3      ***** \n");
-  DEBUG0("*****                  ***** \n");
-  DEBUG0("**************************** \n");
+  DEBUG0("**************************** ");
+  DEBUG0("*****                  ***** ");
+  DEBUG0("*****      TEST 3      ***** ");
+  DEBUG0("*****                  ***** ");
+  DEBUG0("**************************** ");
 
 
-  DEBUG0("***** Test 3 (Max-Min) ***** \n");
+  DEBUG0("***** Test 3 (Max-Min) ***** ");
   test3(MAXMIN);
 #ifdef HAVE_SDP
-  DEBUG0("***** Test 3 (SDP) ***** \n");
+  DEBUG0("***** Test 3 (SDP) ***** ");
   test3(SDP);
 #endif
-  DEBUG0("***** Test 3 (Lagrange - Vegas) ***** \n");
+  DEBUG0("***** Test 3 (Lagrange - Vegas) ***** ");
   test3(LAGRANGE_VEGAS);
-  DEBUG0("***** Test 3 (Lagrange - Reno) ***** \n");
+  DEBUG0("***** Test 3 (Lagrange - Reno) ***** ");
   test3(LAGRANGE_RENO);
 
   return 0;