OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vector::add: also expose stridey and ofsy

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-10-16 08:27:33 +02:00
parent 32d7f01872
commit 367e3fbe6d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/LinAlg/matrix.h
View File

@ -129,7 +129,8 @@ namespace utl //! General utility classes and functions.
vector<T>& operator-=(const vector<T>& X) { return this->add(X,T(-1)); } vector<T>& operator-=(const vector<T>& X) { return this->add(X,T(-1)); }
//! \brief Add the given vector \b X scaled by \a alfa to \a *this. //! \brief Add the given vector \b X scaled by \a alfa to \a *this.
vector<T>& add(const std::vector<T>& X, const T& alfa = T(1), vector<T>& add(const std::vector<T>& X, const T& alfa = T(1),
int ofsx = 0, int stridex = 1); unsigned int ofsx = 0, int stridex = 1,
unsigned int ofsy = 0, int stridey = 1);
//! \brief Perform \f${\bf Y} = \alpha{\bf Y} + (1-\alpha){\bf X} \f$ //! \brief Perform \f${\bf Y} = \alpha{\bf Y} + (1-\alpha){\bf X} \f$
//! where \b Y = \a *this. //! where \b Y = \a *this.
@ -983,20 +984,22 @@ namespace utl //! General utility classes and functions.
template<> inline template<> inline
vector<float>& vector<float>::add(const std::vector<float>& X, vector<float>& vector<float>::add(const std::vector<float>& X,
const float& alfa, const float& alfa,
int ofsx, int stridex) unsigned int ofsx, int stridex,
unsigned int ofsy, int stridey)
{ {
size_t n = this->size() < X.size() ? this->size() : X.size(); size_t n = this->size() < X.size() ? this->size() : X.size();
cblas_saxpy(n,alfa,X.data()+ofsx,stridex,this->data(),1); cblas_saxpy(n,alfa,X.data()+ofsx,stridex,this->data()+ofsy,stridey);
return *this; return *this;
} }
template<> inline template<> inline
vector<double>& vector<double>::add(const std::vector<double>& X, vector<double>& vector<double>::add(const std::vector<double>& X,
const double& alfa, const double& alfa,
int ofsx, int stridex) unsigned int ofsx, int stridex,
unsigned int ofsy, int stridey)
{ {
size_t n = this->size() < X.size() ? this->size() : X.size(); size_t n = this->size() < X.size() ? this->size() : X.size();
cblas_daxpy(n,alfa,X.data()+ofsx,stridex,this->data(),1); cblas_daxpy(n,alfa,X.data()+ofsx,stridex,this->data()+ofsy,stridey);
return *this; return *this;
} }
@ -1367,11 +1370,13 @@ namespace utl //! General utility classes and functions.
template<class T> inline template<class T> inline
vector<T>& vector<T>::add(const std::vector<T>& X, const T& alfa, vector<T>& vector<T>::add(const std::vector<T>& X, const T& alfa,
int ofsx, int stridex) unsigned int ofsx, int stridex,
unsigned int ofsy, int stridey)
{ {
T* p = this->ptr(); T* p = this->data() + ofsy;
const T* q = X.data() + ofsx; const T* q = X.data() + ofsx;
for (size_t i = 0; i < this->size() && i < X.size(); i++, p++, q += stridex) size_t size = std::min(this->size() / stridey, X.size() / stridex);
for (size_t i = 0; i < size; ++i, p += stridey, q += stridex)
*p += alfa*(*q); *p += alfa*(*q);
return *this; return *this;
} }