From: velho <velho@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 20 Jul 2007 14:59:40 +0000 (+0000)
Subject: Cleanups and cosmetics
X-Git-Tag: v3.3~1482
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0714dbb971a42b14418ea392844026a816f757e3

Cleanups and cosmetics


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3878 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 7ba136b542..b1524f553e 100644
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -101,27 +101,14 @@ void lagrange_dicotomi_solve(lmm_system_t sys);
  * Default functions associated to the chosen protocol. When
  * using the lagrangian approach.
  */
-double (* func_f_def   ) (lmm_variable_t , double);
-double (* func_fp_def  ) (lmm_variable_t , double);
 double (* func_fpi_def ) (lmm_variable_t , double);
-double (* func_fpip_def) (lmm_variable_t , double);
 
 
+void lmm_set_default_protocol_functions(double (* func_fpi)  (lmm_variable_t var, double x));
 
-void lmm_set_default_protocol_functions(double (* func_f)    (lmm_variable_t var, double x),
-					double (* func_fp)   (lmm_variable_t var, double x),
-					double (* func_fpi)  (lmm_variable_t var, double x),
-					double (* func_fpip) (lmm_variable_t var, double x));
-
-double func_reno_f(lmm_variable_t var, double x);
-double func_reno_fp(lmm_variable_t var, double x);
 double func_reno_fpi(lmm_variable_t var, double x);
-double func_reno_fpip(lmm_variable_t var, double x);
 
-double func_vegas_f(lmm_variable_t var, double x);
-double func_vegas_fp(lmm_variable_t var, double x);
 double func_vegas_fpi(lmm_variable_t var, double x);
-double func_vegas_fpip(lmm_variable_t var, double x);
 
 
 #endif				/* _SURF_MAXMIN_H */
diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index b81b0357d3..7ff6a48c09 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -636,15 +636,8 @@ lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint
  *  Set default functions to the ones passed as parameters. This is a polimorfism in C pure, enjoy the roots of programming.
  *
  */
-void lmm_set_default_protocol_functions(double (* func_f)    (lmm_variable_t var, double x),
-					double (* func_fp)   (lmm_variable_t var, double x),
-					double (* func_fpi)  (lmm_variable_t var, double x),
-					double (* func_fpip) (lmm_variable_t var, double x))
-					
-{
-  func_f_def    = func_f;
-  func_fp_def   = func_fp;
+void lmm_set_default_protocol_functions(double (* func_fpi)  (lmm_variable_t var, double x))
+{
   func_fpi_def  = func_fpi;
-  func_fpip_def = func_fpip;
 }
 
diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 0a5e2b70a7..947e1c8d9d 100644
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -58,10 +58,7 @@ typedef struct lmm_variable {
   double mu;
   double new_mu;
   double df; /* Total delay of flow */
-  double (* func_f)    (struct lmm_variable *var, double x);  /* f            */
-  double (* func_fp)   (struct lmm_variable *var, double x);  /* f'           */
   double (* func_fpi)  (struct lmm_variable *var, double x);  /* (f')^{-1}    */
-  double (* func_fpip) (struct lmm_variable *var, double x);  /* ((f')^{-1})' */
   /* \end{For Lagrange only} */
 } s_lmm_variable_t;
 
diff --git a/testsuite/surf/simeng_usage.c b/testsuite/surf/simeng_usage.c
index 7851a3e5d9..9ac16734e7 100644
--- a/testsuite/surf/simeng_usage.c
+++ b/testsuite/surf/simeng_usage.c
@@ -51,10 +51,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);
   }
 
 
@@ -122,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();
@@ -277,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();