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 19:46:41 +00:00
parent 95129aee4b
commit 4c2e042e3e
6 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fourindex.h
View File

@@ -310,7 +310,7 @@ public:
fourindex_ext *base;
matel4stored<I,T> my;
int permindex;
fourindex_ext::iterator it;
typename fourindex_ext::iterator it;
//private methods
void setup(void) //make a copy of *it to my with scaled element and anti/permuted indices
@@ -642,9 +642,9 @@ unsigned long J = SMat_index_1(k,l);
#ifdef DEBUG
if (*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 (!v) laerror("access to unallocated fourindex_dense");
if (!NRSMat<T>::v) laerror("access to unallocated fourindex_dense");
#endif
return v[SMat_index(I,J)];
return NRSMat<T>::v[SMat_index(I,J)];
}
template<class T, class DUMMY>
@@ -655,9 +655,9 @@ unsigned long J = SMat_index_1(k,l);
//I,J act as indices of a NRSmat
#ifdef DEBUG
if (I<0 || I>=(unsigned long)nn || J<0 || J>=(unsigned long)nn) laerror("fourindex_dense index out of range");
if (!v) laerror("access to unallocated fourindex_dense");
if (!NRSMat<T>::v) laerror("access to unallocated fourindex_dense");
#endif
return v[SMat_index(I,J)];
return NRSMat<T>::v[SMat_index(I,J)];
}

2
nonclass.cc
View File

@@ -1,6 +1,6 @@
#ifndef NONCBLAS
extern "C" {
#include "atlas_enum.h"
#include "cblas.h"
#include "clapack.h"
}
#else

6
smat.h
View File

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

8
t.cc
View File

@@ -2,7 +2,6 @@
#include <time.h>
#include "la.h"
#include "traceback.h"
#include "sparsemat.h"
#include "matexp.h"
#include "fourindex.h"
@@ -11,6 +10,9 @@
#include "conjgrad.h"
#include "diis.h"
#include "bitvector.h"
#ifdef USE_TRACEBACK
#include "traceback.h"
#endif
extern void test(const NRVec<double> &x);
@@ -38,10 +40,14 @@ complex<double> mycident (const complex<double>&x) {return x;}
int main()
{
#ifdef USE_TRACEBACK
sigtraceback(SIGSEGV,1);
sigtraceback(SIGABRT,1);
sigtraceback(SIGBUS,1);
sigtraceback(SIGFPE,1);
#endif
NRVec<double> x(1.,10);
NRVec<double> y(2.,10);
NRVec<double> z(-2.,10);

4
t2.cc
View File

@@ -1,12 +1,14 @@
#include <time.h>
#include "la.h"
#include "traceback.h"
#include "sparsemat.h"
#include "matexp.h"
#include "fourindex.h"
#include "bitvector.h"
#ifdef USE_TRACEBACK
#include "traceback.h"
#endif
void test(const NRVec<double> &x)
{

4
test.cc
View File

@@ -3,7 +3,9 @@
#include "la.h"
#include "fourindex.h"
#include "laerror.h"
#ifdef USE_TRSACEBACK
#include "traceback.h"
#endif
void test2(char *msg)
{
@@ -12,10 +14,12 @@ laerror(msg);
int main(void)
{
#ifdef USE_TRSACEBACK
sigtraceback(SIGSEGV,1);
sigtraceback(SIGABRT,1);
sigtraceback(SIGBUS,1);
sigtraceback(SIGFPE,1);
#endif
bitvector v(100);
v.fill();