jiri/LA_library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
jiri
2019-11-13 22:22:25 +00:00
parent 40469916fa
commit d8563301d4
10 changed files with 299 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mat.h
View File

@@ -45,6 +45,8 @@ public:
#endif
friend class NRVec<T>;
friend class NRSMat<T>;
friend class NRMat_from1<T>;
friend class NRSMat_from1<T>;
//! standard destructor
~NRMat();
@@ -550,7 +552,7 @@ NRMat<T>::NRMat(const NRSMat<T> &rhs) {
int i(0), j(0), k(0);
nn = mm = rhs.nrows();
count = new int;
count = new int;
*count = 1;
#ifdef MATPTR
v = new T*[nn];
@@ -1222,6 +1224,7 @@ class NRMat_from1 : public NRMat<T> {
public:
NRMat_from1(): NRMat<T>() {};
explicit NRMat_from1(const int n): NRMat<T>(n) {};
explicit NRMat_from1(const NRSMat_from1<T> &rhs) : NRMat<T>(rhs) {};
NRMat_from1(const NRMat<T> &rhs): NRMat<T>(rhs) {};//!< be able to convert the parent class transparently to this
NRMat_from1(const int n, const int m): NRMat<T>(n, m) {};
NRMat_from1(const T &a, const int n, const int m): NRMat<T>(a, n, m) {};
@@ -1342,6 +1345,10 @@ void NRMat<T>::moveto(const GPUID dest) {
}
#endif
/***************************************************************************//**
* generate operators: Mat + a, a + Mat, Mat * a
* corresponding macro is defined in vec.h