diff options
| author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2012-01-23 19:54:25 +0000 |
|---|---|---|
| committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2012-01-23 19:54:25 +0000 |
| commit | eff60a225541f400f7e52fe2d42ce5a9ec399ccc (patch) | |
| tree | e6e9f09acd16b8113e0429bb1052ecf91bab28f8 | |
| parent | 5855acc5ef57ec0fcc2b43447df939ece970c40c (diff) | |
| download | opt-utilities-eff60a225541f400f7e52fe2d42ce5a9ec399ccc.tar.bz2 | |
git-svn-id: file:///home/svn/opt_utilities@219 ed2142bd-67ad-457f-ba7c-d818d4011675
| -rw-r--r-- | error_estimator/error_estimator.hpp | 6 | ||||
| -rw-r--r-- | methods/linmin/linmin.hpp | 2 | ||||
| -rw-r--r-- | models/strmodel1d.hpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/error_estimator/error_estimator.hpp b/error_estimator/error_estimator.hpp index 8fc8439..5d46e49 100644 --- a/error_estimator/error_estimator.hpp +++ b/error_estimator/error_estimator.hpp @@ -59,7 +59,7 @@ namespace opt_utilities //Make sure we start from an optimal parameter set fit.fit(); //stores origin parameter values - for(int i=0;i<fit.get_num_params();++i) + for(size_t i=0;(size_t)i<fit.get_num_params();++i) { pnames.push_back(fit.get_param_info(i).get_name()); pvalues.push_back(fit.get_param_info(i).get_value()); @@ -138,7 +138,7 @@ namespace opt_utilities } } - for(int i=0;i<fit.get_num_params();++i) + for(size_t i=0;i<fit.get_num_params();++i) { fit.set_param_value(pnames[i],pvalues[i]); } @@ -195,7 +195,7 @@ namespace opt_utilities //restore the param_modifier dynamic_cast<freeze_param<Ty,Tx,Tp,Tstr>& >(fit.get_param_modifier())-=freeze_param<Ty,Tx,Tp,Tstr>(pname); //restore the origin param values - for(int i=0;i<fit.get_num_params();++i) + for(size_t i=0;i<fit.get_num_params();++i) { fit.set_param_value(pnames[i],pvalues[i]); } diff --git a/methods/linmin/linmin.hpp b/methods/linmin/linmin.hpp index 6b86bd6..ecfd0d6 100644 --- a/methods/linmin/linmin.hpp +++ b/methods/linmin/linmin.hpp @@ -61,7 +61,7 @@ namespace opt_utilities pT xt; opt_eq(xt,p1); #pragma omp parallel for - for(int i=0;i<get_size(xt);++i) + for(size_t i=0;i<get_size(xt);++i) { //get_element(xt,i)+=x*get_element((pT)xi1,i); set_element(xt,i, diff --git a/models/strmodel1d.hpp b/models/strmodel1d.hpp index 5342210..831e1c4 100644 --- a/models/strmodel1d.hpp +++ b/models/strmodel1d.hpp @@ -12,7 +12,7 @@ #include <cmath> #include <sstream> #include <cassert> -#include <muParser/muParser.h> +#include <muParser.h> #include <vector> #include <string> |