WSL/SLF GitLab Repository

Commit d0607675 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

more size_t...

parent 79629021
......@@ -177,7 +177,7 @@ ProcessingBlock* BlockFactory::getBlock(const std::string& blockname, const std:
ProcessingBlock::ProcessingBlock(const std::string& name) : properties(), block_name(name)
{}
void ProcessingBlock::convert_args(const unsigned int& min_nargs, const unsigned int& max_nargs,
void ProcessingBlock::convert_args(const size_t& min_nargs, const size_t& max_nargs,
const std::vector<std::string>& vec_args, std::vector<double>& dbl_args)
{
if ((vec_args.size() < min_nargs) || (vec_args.size() > max_nargs))
......@@ -213,8 +213,8 @@ const std::string ProcessingProperties::toString() const
std::stringstream os;
const double h_before = time_before.getJulian()*24.;
const double h_after = time_after.getJulian()*24.;
const unsigned int p_before = points_before;
const unsigned int p_after = points_after;
const size_t p_before = points_before;
const size_t p_after = points_after;
os << "{";
if(h_before>0. || h_after>0.) os << "-" << h_before << " +" << h_after << " h; ";
......
......@@ -43,8 +43,8 @@ class ProcessingProperties {
Duration time_before;
Duration time_after;
unsigned int points_before;
unsigned int points_after;
size_t points_before;
size_t points_after;
proc_stage stage;
};
......@@ -62,7 +62,7 @@ class ProcessingBlock {
virtual void process(const unsigned int& param, const std::vector<MeteoData>& ivec,
std::vector<MeteoData>& ovec) = 0;
void convert_args(const unsigned int& min_nargs, const unsigned int& max_nargs,
void convert_args(const size_t& min_nargs, const size_t& max_nargs,
const std::vector<std::string>& vec_args, std::vector<double>& dbl_args);
std::string getName() const;
......
......@@ -491,7 +491,7 @@ void Interpol2D::ODKriging(const std::vector<double>& vecData, const std::vector
const double llcorner_y = grid.llcorner.getNorthing();
const double cellsize = grid.cellsize;
Matrix Ginv((unsigned int)(nrOfMeasurments+1), (unsigned int)(nrOfMeasurments+1));
Matrix Ginv(nrOfMeasurments+1, nrOfMeasurments+1);
//fill the Ginv matrix
for(size_t j=1; j<=nrOfMeasurments; j++) {
......@@ -522,7 +522,7 @@ void Interpol2D::ODKriging(const std::vector<double>& vecData, const std::vector
//invert the matrix
Ginv.inv();
Matrix G0((unsigned int)(nrOfMeasurments+1), (unsigned int)1);
Matrix G0(nrOfMeasurments+1, (size_t)1);
//now, calculate each point
for(size_t j=0; j<grid.nrows; j++) {
for(size_t i=0; i<grid.ncols; i++) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment