Skip to content
Snippets Groups Projects
Commit 6ce68c52 authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

MNT: Don't pass a value to NoOfThreads, so that it will use a default value

parent ca6e196c
No related branches found
No related tags found
1 merge request!17ENH: Allow `Splinterpolator` instances to be created from an existing set of spline coefficients, and extend extrapolation options
Pipeline #26271 passed
Stage: fsl-ci-build
Hide whitespace changes
Inline Side-by-side
SpMat.h
+ 4
− 4
View file @ 6ce68c52
...@@ -93,10 +93,10 @@ class SpMat ...@@ -93,10 +93,10 @@ class SpMat
{ {
public: public:
SpMat() : _m(0), _n(0), _nz(0), _ri(0), _val(0), _pw(false), _nt(1) {} SpMat() : _m(0), _n(0), _nz(0), _ri(0), _val(0), _pw(false), _nt(1) {}
SpMat(unsigned int m, unsigned int n, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)) : _m(m), _n(n), _nz(0), _ri(n), _val(n), _pw(false), _nt(nt._n) {} SpMat(unsigned int m, unsigned int n, Utilities::NoOfThreads nt=Utilities::NoOfThreads()) : _m(m), _n(n), _nz(0), _ri(n), _val(n), _pw(false), _nt(nt._n) {}
SpMat(unsigned int m, unsigned int n, const unsigned int *irp, const unsigned int *jcp, const double *sp, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)); SpMat(unsigned int m, unsigned int n, const unsigned int *irp, const unsigned int *jcp, const double *sp, Utilities::NoOfThreads nt=Utilities::NoOfThreads());
SpMat(const NEWMAT::GeneralMatrix& M, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)); SpMat(const NEWMAT::GeneralMatrix& M, Utilities::NoOfThreads nt=Utilities::NoOfThreads());
SpMat(const std::string& fname, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)); SpMat(const std::string& fname, Utilities::NoOfThreads nt=Utilities::NoOfThreads());
~SpMat() {} ~SpMat() {}
unsigned int Nrows() const {return(_m);} unsigned int Nrows() const {return(_m);}
......
bfmatrix.h
+ 3
− 3
View file @ 6ce68c52
...@@ -141,13 +141,13 @@ public: ...@@ -141,13 +141,13 @@ public:
// Constructors, destructor and assignment // Constructors, destructor and assignment
SparseBFMatrix() SparseBFMatrix()
: mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>())) {} : mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>())) {}
SparseBFMatrix(unsigned int m, unsigned int n, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)) SparseBFMatrix(unsigned int m, unsigned int n, Utilities::NoOfThreads nt=Utilities::NoOfThreads())
: mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(m,n,nt))) {} : mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(m,n,nt))) {}
SparseBFMatrix(unsigned int m, unsigned int n, const unsigned int *irp, const unsigned int *jcp, const double *sp, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)) SparseBFMatrix(unsigned int m, unsigned int n, const unsigned int *irp, const unsigned int *jcp, const double *sp, Utilities::NoOfThreads nt=Utilities::NoOfThreads())
: mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(m,n,irp,jcp,sp,nt))) {} : mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(m,n,irp,jcp,sp,nt))) {}
SparseBFMatrix(const MISCMATHS::SpMat<T>& M) SparseBFMatrix(const MISCMATHS::SpMat<T>& M)
: mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(M))) {} : mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(M))) {}
SparseBFMatrix(const NEWMAT::Matrix& M, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)) SparseBFMatrix(const NEWMAT::Matrix& M, Utilities::NoOfThreads nt=Utilities::NoOfThreads())
: mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(M,nt))) {} : mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(M,nt))) {}
SparseBFMatrix(const SparseBFMatrix<T>& M) SparseBFMatrix(const SparseBFMatrix<T>& M)
: mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(*(M.mp)))) {} : mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(*(M.mp)))) {}
......
splinterpolator.h
+ 2
− 2
View file @ 6ce68c52
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
const std::vector<ExtrapolationType>& et, const std::vector<ExtrapolationType>& et,
unsigned int order=3, unsigned int order=3,
bool copy_low_order=true, bool copy_low_order=true,
Utilities::NoOfThreads nthr=Utilities::NoOfThreads(1), Utilities::NoOfThreads nthr=Utilities::NoOfThreads(),
double prec=1e-8, double prec=1e-8,
bool data_are_coefs=false) bool data_are_coefs=false)
: _valid(false), _own_coef(false), _coef(0), _cptr(0), _ndim(0), _nthr(nthr._n) : _valid(false), _own_coef(false), _coef(0), _cptr(0), _ndim(0), _nthr(nthr._n)
...@@ -71,7 +71,7 @@ public: ...@@ -71,7 +71,7 @@ public:
ExtrapolationType et=Zeros, ExtrapolationType et=Zeros,
unsigned int order=3, unsigned int order=3,
bool copy_low_order=true, bool copy_low_order=true,
Utilities::NoOfThreads nthr=Utilities::NoOfThreads(1), Utilities::NoOfThreads nthr=Utilities::NoOfThreads(),
double prec=1e-8, double prec=1e-8,
bool data_are_coefs=false) bool data_are_coefs=false)
: _valid(false), _own_coef(false), _coef(0), _cptr(0), _ndim(0), _nthr(nthr._n) : _valid(false), _own_coef(false), _coef(0), _cptr(0), _ndim(0), _nthr(nthr._n)
......
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