aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--error_estimator/error_estimator.hpp6
-rw-r--r--methods/linmin/linmin.hpp2
-rw-r--r--models/strmodel1d.hpp2
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>