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-07-29 20:07:02 +00:00
parent 4c2e042e3e
commit ea67e3065d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fourindex.h
View File

@ -640,13 +640,14 @@ unsigned long I = SMat_index_1(i,j);
unsigned long J = SMat_index_1(k,l); unsigned long J = SMat_index_1(k,l);
//I,J act as indices of a NRSmat //I,J act as indices of a NRSmat
#ifdef DEBUG #ifdef DEBUG
if (*count != 1) laerror("lval (i,j,k,l) with count > 1 in fourindex_dense"); if (*NRSMat<T>::count != 1) laerror("lval (i,j,k,l) with count > 1 in fourindex_dense");
if (I<0 || I>=(unsigned long)nn || J<0 || J>=(unsigned long)nn) laerror("fourindex_dense index out of range"); if (I<0 || I>=(unsigned long)NRSMat<T>::nn || J<0 || J>=(unsigned long)NRSMat<T>::nn) laerror("fourindex_dense index out of range");
if (!NRSMat<T>::v) laerror("access to unallocated fourindex_dense"); if (!NRSMat<T>::v) laerror("access to unallocated fourindex_dense");
#endif #endif
return NRSMat<T>::v[SMat_index(I,J)]; return NRSMat<T>::v[SMat_index(I,J)];
} }
template<class T, class DUMMY> template<class T, class DUMMY>
const T& fourindex_dense<twoelectronrealmullikan,T,DUMMY>::operator() (unsigned int i, unsigned int j, unsigned int k, unsigned int l) const const T& fourindex_dense<twoelectronrealmullikan,T,DUMMY>::operator() (unsigned int i, unsigned int j, unsigned int k, unsigned int l) const
{ {
@ -654,7 +655,7 @@ unsigned long I = SMat_index_1(i,j);
unsigned long J = SMat_index_1(k,l); unsigned long J = SMat_index_1(k,l);
//I,J act as indices of a NRSmat //I,J act as indices of a NRSmat
#ifdef DEBUG #ifdef DEBUG
if (I<0 || I>=(unsigned long)nn || J<0 || J>=(unsigned long)nn) laerror("fourindex_dense index out of range"); if (I<0 || I>=(unsigned long)NRSMat<T>::nn || J<0 || J>=(unsigned long)NRSMat<T>::nn) laerror("fourindex_dense index out of range");
if (!NRSMat<T>::v) laerror("access to unallocated fourindex_dense"); if (!NRSMat<T>::v) laerror("access to unallocated fourindex_dense");
#endif #endif
return NRSMat<T>::v[SMat_index(I,J)]; return NRSMat<T>::v[SMat_index(I,J)];

4
smat.h
View File

@ -542,14 +542,14 @@ public:
inline const T& operator() (const int i, const int j) const inline const T& operator() (const int i, const int j) const
{ {
#ifdef DEBUG #ifdef DEBUG
if(i<=0||j<=0||i>nn||j>nn) laerror("index out of range in NRSMat_from1"); if(i<=0||j<=0||i>NRSMat<T>::nn||j>NRSMat<T>::nn) laerror("index out of range in NRSMat_from1");
#endif #endif
return NRSMat<T>::v[SMat_index_1(i,j)]; return NRSMat<T>::v[SMat_index_1(i,j)];
} }
inline T& operator() (const int i, const int j) inline T& operator() (const int i, const int j)
{ {
#ifdef DEBUG #ifdef DEBUG
if(i<=0||j<=0||i>nn||j>nn) laerror("index out of range in NRSMat_from1"); if(i<=0||j<=0||i>NRSMat<T>::nn||j>NRSMat<T>::nn) laerror("index out of range in NRSMat_from1");
#endif #endif
return NRSMat<T>::v[SMat_index_1(i,j)]; return NRSMat<T>::v[SMat_index_1(i,j)];
} }