diff options
author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2011-07-15 17:20:30 +0000 |
---|---|---|
committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2011-07-15 17:20:30 +0000 |
commit | 6ec6b9f69b44b03363381210ed635cb3798d7413 (patch) | |
tree | 3b145e16a07a0efe8e87d302ecea4a4439f172c5 /vmodels | |
parent | c9d59463a3d9059ebb09aa06610866438c36fba6 (diff) | |
download | opt-utilities-6ec6b9f69b44b03363381210ed635cb3798d7413.tar.bz2 |
git-svn-id: file:///home/svn/opt_utilities@214 ed2142bd-67ad-457f-ba7c-d818d4011675
Diffstat (limited to 'vmodels')
-rw-r--r-- | vmodels/quad_pl.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vmodels/quad_pl.hpp b/vmodels/quad_pl.hpp index 14ad752..592af22 100644 --- a/vmodels/quad_pl.hpp +++ b/vmodels/quad_pl.hpp @@ -31,17 +31,17 @@ namespace opt_utilities public: quad_pl() { - this->push_param_info(param_info<optvec<T> >("a",1)); - this->push_param_info(param_info<optvec<T> >("b",1)); - this->push_param_info(param_info<optvec<T> >("c",1)); + this->push_param_info(param_info<optvec<T> >("norm",1)); + this->push_param_info(param_info<optvec<T> >("gamma",1)); + this->push_param_info(param_info<optvec<T> >("corr",1)); } optvec<T> do_eval(const optvec<T>& x,const optvec<T>& param) { - T a=get_element(param,0); - T b=get_element(param,1); - T c=get_element(param,2); - return c*exp(a*log(x)*log(x)+b*log(x)); + T norm=get_element(param,0); + T gamma=get_element(param,1); + T corr=get_element(param,2); + return norm*pow(x,gamma)*exp(corr*log(x)*log(x)); } private: |