diff --git a/SpMat.h b/SpMat.h index 8a4ad59b4668c145b15a7467583ac685af9c7638..282f82c207e9cee2c0600509fb7f0e2a8a1f9850 100644 --- a/SpMat.h +++ b/SpMat.h @@ -93,10 +93,10 @@ class SpMat { public: 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, const unsigned int *irp, const unsigned int *jcp, const double *sp, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)); - SpMat(const NEWMAT::GeneralMatrix& M, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)); - SpMat(const std::string& fname, Utilities::NoOfThreads nt=Utilities::NoOfThreads(1)); + 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()); + SpMat(const NEWMAT::GeneralMatrix& M, Utilities::NoOfThreads nt=Utilities::NoOfThreads()); + SpMat(const std::string& fname, Utilities::NoOfThreads nt=Utilities::NoOfThreads()); ~SpMat() {} unsigned int Nrows() const {return(_m);} diff --git a/bfmatrix.h b/bfmatrix.h index 28af88c857d4f5fba0772733c4b54a7864b0b09c..37818568c834a3b37505bfc01e7f345713d3bddf 100644 --- a/bfmatrix.h +++ b/bfmatrix.h @@ -141,13 +141,13 @@ public: // Constructors, destructor and assignment SparseBFMatrix() : 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))) {} - 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))) {} SparseBFMatrix(const 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))) {} SparseBFMatrix(const SparseBFMatrix<T>& M) : mp(std::shared_ptr<MISCMATHS::SpMat<T> >(new MISCMATHS::SpMat<T>(*(M.mp)))) {} diff --git a/splinterpolator.h b/splinterpolator.h index 6d94b116376cd57f987a17cd73e5f28207f299b1..c9e24f90b35d7870186281a9492471c130185aac 100644 --- a/splinterpolator.h +++ b/splinterpolator.h @@ -59,7 +59,7 @@ public: const std::vector<ExtrapolationType>& et, unsigned int order=3, bool copy_low_order=true, - Utilities::NoOfThreads nthr=Utilities::NoOfThreads(1), + Utilities::NoOfThreads nthr=Utilities::NoOfThreads(), double prec=1e-8, bool data_are_coefs=false) : _valid(false), _own_coef(false), _coef(0), _cptr(0), _ndim(0), _nthr(nthr._n) @@ -71,7 +71,7 @@ public: ExtrapolationType et=Zeros, unsigned int order=3, bool copy_low_order=true, - Utilities::NoOfThreads nthr=Utilities::NoOfThreads(1), + Utilities::NoOfThreads nthr=Utilities::NoOfThreads(), double prec=1e-8, bool data_are_coefs=false) : _valid(false), _own_coef(false), _coef(0), _cptr(0), _ndim(0), _nthr(nthr._n)