From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 26 Jul 2007 22:47:10 +0000 (+0000)
Subject:  * Provide func_f and func_fp as now required.
X-Git-Tag: v3.3~1460
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bca2e76eea9877ee06b057f31a87b1f243ba7b23

 * Provide func_f and func_fp as now required.
 * Compute the result for test1  using and alternate method and check that the result is correct.


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

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 81a91cd074..84250e8e04 100644
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -101,13 +101,17 @@ void lagrange_dicotomi_solve(lmm_system_t sys);
  * Default functions associated to the chosen protocol. When
  * using the lagrangian approach.
  */
-double (* func_fpi_def ) (lmm_variable_t , double);
 
+void lmm_set_default_protocol_function(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));
 
-void lmm_set_default_protocol_function(double (* func_fpi)  (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_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);