From d313a18f0b28380782e0f3c2ef30fd09379560f3 Mon Sep 17 00:00:00 2001 From: alegrand Date: Fri, 20 Jul 2007 16:34:47 +0000 Subject: [PATCH] Keep cleaning up func_f, func_fp, func_fpip... git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3882 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/maxmin.h | 2 +- src/surf/maxmin.c | 16 ---------------- src/surf/workstation_KCCFLN05.c | 4 ++-- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h index b1524f553e..81a91cd074 100644 --- a/src/include/surf/maxmin.h +++ b/src/include/surf/maxmin.h @@ -104,7 +104,7 @@ void lagrange_dicotomi_solve(lmm_system_t sys); double (* func_fpi_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_function(double (* func_fpi) (lmm_variable_t var, double x)); double func_reno_fpi(lmm_variable_t var, double x); diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c index ee52f232ac..4be448e3c3 100644 --- a/src/surf/maxmin.c +++ b/src/surf/maxmin.c @@ -622,19 +622,3 @@ lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint } - -/** \brief Attribute the value bound to var->bound. - * - * \param func_f default function f associated with the chosen protocol flavor - * \param func_fp partial differential of f (f prime, f') - * \param func_fpi inverse of the partial differential of f (f prime inverse, (f')^{-1}) - * \param func_fpip partial differential of the inverse of the partial differential of f (f prime inverse prime, ((f')^{-1})') - * - * 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_fpi) (lmm_variable_t var, double x)) -{ - func_fpi_def = func_fpi; -} - diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 4f30af016b..63469da313 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -1099,7 +1099,7 @@ void surf_workstation_resource_init_KCCFLN05_Vegas(const char *filename) resource_init_internal(); parse_file(filename); - lmm_set_default_protocol_functions(func_vegas_fpi); + lmm_set_default_protocol_function(func_vegas_fpi); surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Vegas)"; use_lagrange_solver=1; @@ -1113,7 +1113,7 @@ void surf_workstation_resource_init_KCCFLN05_Reno(const char *filename) resource_init_internal(); parse_file(filename); - lmm_set_default_protocol_functions(func_reno_fpi); + lmm_set_default_protocol_function(func_reno_fpi); surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Reno)"; use_lagrange_solver=1; -- 2.20.1