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 2006-09-09 16:40:30 +00:00
parent 74ac2998b0
commit a39c181bf1
1 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mat.h
View File

@ -267,7 +267,7 @@ inline T & NRMat<T>::operator()(const int i, const int j)
{ {
#ifdef DEBUG #ifdef DEBUG
if (*count != 1) laerror("Mat lval use of (,) with count > 1"); if (*count != 1) laerror("Mat lval use of (,) with count > 1");
if (i<0 || i>=nn || j<0 || j>mm) laerror("Mat (,) out of range"); if (i<0 || i>=nn || j<0 || j>=mm) laerror("Mat (,) out of range");
if (!v) laerror("(,) for unallocated Mat"); if (!v) laerror("(,) for unallocated Mat");
#endif #endif
#ifdef MATPTR #ifdef MATPTR
@ -280,7 +280,7 @@ template <typename T>
inline const T & NRMat<T>::operator()(const int i, const int j) const inline const T & NRMat<T>::operator()(const int i, const int j) const
{ {
#ifdef DEBUG #ifdef DEBUG
if (i<0 || i>=nn || j<0 || j>mm) laerror("Mat (,) out of range"); if (i<0 || i>=nn || j<0 || j>=mm) laerror("Mat (,) out of range");
if (!v) laerror("(,) for unallocated Mat"); if (!v) laerror("(,) for unallocated Mat");
#endif #endif
#ifdef MATPTR #ifdef MATPTR
@ -547,13 +547,51 @@ return r;
// I/O // I/O
template <typename T> extern ostream& operator<<(ostream &s, const NRMat<T> &x); template <typename T> extern ostream& operator<<(ostream &s, const NRMat<T> &x);
template <typename T> extern istream& operator>>(istream &s, NRMat<T> &x); template <typename T> extern istream& operator>>(istream &s, NRMat<T> &x);
//optional indexing from 1
//all possible constructors have to be given explicitly, other stuff is inherited
//with exception of the operator() which differs
template<typename T>
class NRMat_from1 : public NRMat<T> {
public:
NRMat_from1(): NRMat<T>() {};
explicit NRMat_from1(const int n): NRMat<T>(n) {};
NRMat_from1(const NRMat<T> &rhs): NRMat<T>(rhs) {}; //be able to convert the parent class transparently to this
NRMat_from1(const T &a, const int n, const int m): NRMat<T>(a,n,m) {};
NRMat_from1(const T *a, const int n, const int m): NRMat<T>(a,n,m) {};
inline const T& operator() (const int i, const int j) const
{
#ifdef DEBUG
if (i<1 || i>NRMat<T>::nn || j<1 || j>NRMat<T>::mm) laerror("Mat (,) out of range");
if (!NRMat<T>::v) laerror("(,) for unallocated Mat");
#endif
#ifdef MATPTR
return NRMat<T>::v[i-1][j-1];
#else
return NRMat<T>::v[(i-1)*NRMat<T>::mm+j-1];
#endif
}
inline T& operator() (const int i, const int j)
{
#ifdef DEBUG
if (*NRMat<T>::count != 1) laerror("Mat lval use of (,) with count > 1");
if (i<1 || i>NRMat<T>::nn || j<1 || j>NRMat<T>::mm) laerror("Mat (,) out of range");
if (!NRMat<T>::v) laerror("(,) for unallocated Mat");
#endif
#ifdef MATPTR
return NRMat<T>::v[i-1][j-1];
#else
return NRMat<T>::v[(i-1)*NRMat<T>::mm+j-1];
#endif
}
};