diff options
| author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2009-10-10 16:33:18 +0000 |
|---|---|---|
| committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2009-10-10 16:33:18 +0000 |
| commit | 3fcb4f104a8b81937f93ef4b298dd51e3c1eec94 (patch) | |
| tree | d3189de86b86e8db595da9b60fa5d1bdfb58934a | |
| parent | b5f6f5a869e2ce9db6ca29c843369b6518e7c4d7 (diff) | |
| download | opt-utilities-3fcb4f104a8b81937f93ef4b298dd51e3c1eec94.tar.bz2 | |
git-svn-id: file:///home/svn/opt_utilities@78 ed2142bd-67ad-457f-ba7c-d818d4011675
| -rw-r--r-- | core/fitter.hpp | 4 | ||||
| -rw-r--r-- | methods/powell/linmin.hpp | 2 | ||||
| -rw-r--r-- | methods/powell/powell_method.hpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/fitter.hpp b/core/fitter.hpp index cf47517..e07469e 100644 --- a/core/fitter.hpp +++ b/core/fitter.hpp @@ -547,11 +547,11 @@ namespace opt_utilities model(const model& rhs)
:p_param_modifier(0)
{
+ param_info_list=rhs.param_info_list;
if(rhs.p_param_modifier!=0)
{
set_param_modifier(*(rhs.p_param_modifier));
}
- param_info_list=rhs.param_info_list;
null_param=rhs.null_param;
}
@@ -901,7 +901,6 @@ namespace opt_utilities return i;
}
}
- // std::cerr<<"param name invalid!"<<std::endl;
// assert(false);
throw param_not_found();
return -1;
@@ -1061,6 +1060,7 @@ namespace opt_utilities {
load_data(*(rhs.p_data_set));
}
+
optengine=rhs.optengine;
return *this;
}
diff --git a/methods/powell/linmin.hpp b/methods/powell/linmin.hpp index bde12c6..962b052 100644 --- a/methods/powell/linmin.hpp +++ b/methods/powell/linmin.hpp @@ -16,7 +16,7 @@ namespace opt_utilities const func_obj<rT,pT>* pfoo; func_adaptor(){} func_adaptor(const func_adaptor&) - :p1(),xi1(),pfoo(0) + :func_obj<rT,rT>(),p1(),xi1(),pfoo(0) {} public: diff --git a/methods/powell/powell_method.hpp b/methods/powell/powell_method.hpp index 1562fdf..0ec095c 100644 --- a/methods/powell/powell_method.hpp +++ b/methods/powell/powell_method.hpp @@ -175,7 +175,7 @@ namespace opt_utilities }; powell_method(const powell_method<rT,pT>& rhs) - :p_fo(rhs.p_fo),p_optimizer(rhs.p_optimizer), + :opt_method<rT,pT>(rhs),p_fo(rhs.p_fo),p_optimizer(rhs.p_optimizer), start_point(rhs.start_point), end_point(rhs.end_point), ncom(rhs.ncom), |