aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorastrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>2009-10-28 16:32:42 +0000
committerastrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>2009-10-28 16:32:42 +0000
commit4f7f2c239904be0af4ee96d1565dd336d2e287a9 (patch)
tree20c99974bf972813442a1dcb72684805a30abbdf /core
parent3de58cdbfed2bedef00f791994398b5ba13321f4 (diff)
downloadopt-utilities-4f7f2c239904be0af4ee96d1565dd336d2e287a9.tar.bz2
git-svn-id: file:///home/svn/opt_utilities@88 ed2142bd-67ad-457f-ba7c-d818d4011675
Diffstat (limited to 'core')
-rw-r--r--core/fitter.hpp18
1 files changed, 16 insertions, 2 deletions
diff --git a/core/fitter.hpp b/core/fitter.hpp
index cb2c799..bea0d5c 100644
--- a/core/fitter.hpp
+++ b/core/fitter.hpp
@@ -1033,7 +1033,7 @@ namespace opt_utilities
}
if(rhs.p_data_set!=0)
{
- load_data(*(rhs.p_data_set));
+ set_data_set(*(rhs.p_data_set));
}
optengine=rhs.optengine;
}
@@ -1058,7 +1058,7 @@ namespace opt_utilities
}
if(rhs.p_data_set!=0)
{
- load_data(*(rhs.p_data_set));
+ set_data_set(*(rhs.p_data_set));
}
optengine=rhs.optengine;
@@ -1230,6 +1230,20 @@ namespace opt_utilities
}
}
+ void set_data_set(const data_set<Ty,Tx>& da)
+ {
+ if(p_data_set!=0)
+ {
+ //delete p_data_set;
+ p_data_set->destroy();
+ }
+ p_data_set=da.clone();
+ if(p_statistic!=0)
+ {
+ p_statistic->set_fitter(*this);
+ }
+ }
+
/**
get the data set that have been loaded
\return the const reference of inner data_set