diff options
author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2009-04-04 16:28:46 +0000 |
---|---|---|
committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2009-04-04 16:28:46 +0000 |
commit | 9e56181b0f31d3b51397af30493805444057e456 (patch) | |
tree | aa2eaba25ba0bdf5a01ad02ec3ab92a8b5276b1c | |
parent | 6b34be6adb81ad90b0bf0da0f9c822966e66a314 (diff) | |
download | opt-utilities-9e56181b0f31d3b51397af30493805444057e456.tar.bz2 |
git-svn-id: file:///home/svn/opt_utilities@16 ed2142bd-67ad-457f-ba7c-d818d4011675
-rw-r--r-- | models/pow_model.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/models/pow_model.hpp b/models/pow_model.hpp index 0aae2e1..79d7be8 100644 --- a/models/pow_model.hpp +++ b/models/pow_model.hpp @@ -1,6 +1,7 @@ #ifndef POW_MODEL_H_ #define POW_MODEL_H_ #include <core/fitter.hpp> +#include <core/opt_traits.hpp> #include <cmath> namespace opt_utilities @@ -21,11 +22,11 @@ namespace opt_utilities private: model<Ty,Tx,Tp,Tstr>* pm1; - typename value_type_trait<Tp>::value_type idx; + typename element_type_trait<Tp>::value_type idx; public: pow_model(const model<Ty,Tx,Tp,Tstr>& m1, - const typename value_type_trait<Tp>::value_type& index) + const typename element_type_trait<Tp>::value_type& index) :pm1(m1.clone()),idx(index) { int np1=m1.get_num_params(); @@ -108,7 +109,8 @@ namespace opt_utilities template <typename Ty,typename Tx,typename Tp,typename Tstr> pow_model<Ty,Tx,Tp,Tstr> pow(const model<Ty,Tx,Tp,Tstr>& m1, - const typename value_type_trait<Tp>::value_type& idx) + const typename element_type_trait<Tp>:: + value_type& idx) { return pow_model<Ty,Tx,Tp,Tstr>(m1,idx); } |