diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/auxiliaryFunctions/conj/Makefile.am | 11 | ||||
-rw-r--r-- | src/auxiliaryFunctions/conj/Makefile.in | 10 | ||||
-rwxr-xr-x | src/configure | 3 | ||||
-rw-r--r-- | src/configure.ac | 1 | ||||
-rw-r--r-- | src/includes/lapack.h | 2 | ||||
-rw-r--r-- | src/matrixOperations/Makefile.am | 3 | ||||
-rw-r--r-- | src/matrixOperations/Makefile.in | 3 | ||||
-rw-r--r-- | src/matrixOperations/inversion/zinverma.c | 2 | ||||
-rw-r--r-- | src/type/floatComplex.c | 12 | ||||
-rw-r--r-- | src/type/floatComplex.h | 2 |
10 files changed, 27 insertions, 22 deletions
diff --git a/src/auxiliaryFunctions/conj/Makefile.am b/src/auxiliaryFunctions/conj/Makefile.am index 900e2aec..766a7082 100644 --- a/src/auxiliaryFunctions/conj/Makefile.am +++ b/src/auxiliaryFunctions/conj/Makefile.am @@ -30,15 +30,8 @@ check_PROGRAMS = testConj check_LDADD = libConj.la \ $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/elementaryFunctions/atan/libAtan.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/elementaryFunctions/atan2/libAtan2.la \ - $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/operations/addition/libAddition.la + check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/auxiliaryFunctions/conj/Makefile.in b/src/auxiliaryFunctions/conj/Makefile.in index 0097d238..b49f280b 100644 --- a/src/auxiliaryFunctions/conj/Makefile.in +++ b/src/auxiliaryFunctions/conj/Makefile.in @@ -208,15 +208,7 @@ libConj_la_SOURCES = $(HEAD) \ check_LDADD = libConj.la \ $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/elementaryFunctions/atan/libAtan.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/elementaryFunctions/atan2/libAtan2.la \ - $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/operations/addition/libAddition.la check_INCLUDES = -I $(top_builddir)/type \ -I ../includes diff --git a/src/configure b/src/configure index c2ebbc50..86380921 100755 --- a/src/configure +++ b/src/configure @@ -22149,7 +22149,7 @@ fi #operations/multiplication/Makefile #operations/division/Makefile -ac_config_files="$ac_config_files Makefile lib/blas/Makefile lib/lapack/Makefile type/Makefile operations/Makefile operations/addition/Makefile operations/subtraction/Makefile operations/division/Makefile operations/multiplication/Makefile matrixOperations/Makefile matrixOperations/addition/Makefile matrixOperations/subtraction/Makefile matrixOperations/multiplication/Makefile matrixOperations/division/Makefile matrixOperations/cat/Makefile matrixOperations/transpose/Makefile matrixOperations/trace/Makefile matrixOperations/hilbert/Makefile matrixOperations/expm/Makefile matrixOperations/eye/Makefile matrixOperations/ones/Makefile matrixOperations/infiniteNorm/Makefile matrixOperations/inversion/Makefile matrixOperations/jmat/Makefile matrixOperations/chol/Makefile implicitList/Makefile elementaryFunctions/Makefile elementaryFunctions/cos/Makefile elementaryFunctions/cosh/Makefile elementaryFunctions/acos/Makefile elementaryFunctions/acosh/Makefile elementaryFunctions/sin/Makefile elementaryFunctions/sinh/Makefile elementaryFunctions/asin/Makefile elementaryFunctions/asinh/Makefile elementaryFunctions/tan/Makefile elementaryFunctions/tanh/Makefile elementaryFunctions/atan/Makefile elementaryFunctions/atan2/Makefile elementaryFunctions/atanh/Makefile elementaryFunctions/log/Makefile elementaryFunctions/log1p/Makefile elementaryFunctions/log10/Makefile elementaryFunctions/exp/Makefile elementaryFunctions/exp10/Makefile elementaryFunctions/sqrt/Makefile elementaryFunctions/lnp1m1/Makefile elementaryFunctions/pow/Makefile auxiliaryFunctions/Makefile auxiliaryFunctions/abs/Makefile auxiliaryFunctions/find/Makefile auxiliaryFunctions/frexp/Makefile auxiliaryFunctions/isempty/Makefile auxiliaryFunctions/isnan/Makefile auxiliaryFunctions/rand/Makefile auxiliaryFunctions/sign/Makefile auxiliaryFunctions/size/Makefile auxiliaryFunctions/length/Makefile auxiliaryFunctions/type/Makefile auxiliaryFunctions/pythag/Makefile auxiliaryFunctions/conj/Makefile statisticsFunctions/Makefile statisticsFunctions/mean/Makefile statisticsFunctions/sum/Makefile statisticsFunctions/variance/Makefile string/Makefile string/disp/Makefile string/string/Makefile signalProcessing/Makefile signalProcessing/fft/Makefile signalProcessing/ifft/Makefile signalProcessing/levin/Makefile signalProcessing/conv/Makefile signalProcessing/conv2d/Makefile" +ac_config_files="$ac_config_files Makefile lib/blas/Makefile lib/lapack/Makefile type/Makefile operations/Makefile operations/addition/Makefile operations/subtraction/Makefile operations/division/Makefile operations/multiplication/Makefile matrixOperations/Makefile matrixOperations/addition/Makefile matrixOperations/subtraction/Makefile matrixOperations/multiplication/Makefile matrixOperations/division/Makefile matrixOperations/cat/Makefile matrixOperations/transpose/Makefile matrixOperations/trace/Makefile matrixOperations/hilbert/Makefile matrixOperations/expm/Makefile matrixOperations/eye/Makefile matrixOperations/ones/Makefile matrixOperations/infiniteNorm/Makefile matrixOperations/inversion/Makefile matrixOperations/jmat/Makefile matrixOperations/chol/Makefile matrixOperations/determ/Makefile implicitList/Makefile elementaryFunctions/Makefile elementaryFunctions/cos/Makefile elementaryFunctions/cosh/Makefile elementaryFunctions/acos/Makefile elementaryFunctions/acosh/Makefile elementaryFunctions/sin/Makefile elementaryFunctions/sinh/Makefile elementaryFunctions/asin/Makefile elementaryFunctions/asinh/Makefile elementaryFunctions/tan/Makefile elementaryFunctions/tanh/Makefile elementaryFunctions/atan/Makefile elementaryFunctions/atan2/Makefile elementaryFunctions/atanh/Makefile elementaryFunctions/log/Makefile elementaryFunctions/log1p/Makefile elementaryFunctions/log10/Makefile elementaryFunctions/exp/Makefile elementaryFunctions/exp10/Makefile elementaryFunctions/sqrt/Makefile elementaryFunctions/lnp1m1/Makefile elementaryFunctions/pow/Makefile auxiliaryFunctions/Makefile auxiliaryFunctions/abs/Makefile auxiliaryFunctions/find/Makefile auxiliaryFunctions/frexp/Makefile auxiliaryFunctions/isempty/Makefile auxiliaryFunctions/isnan/Makefile auxiliaryFunctions/rand/Makefile auxiliaryFunctions/sign/Makefile auxiliaryFunctions/size/Makefile auxiliaryFunctions/length/Makefile auxiliaryFunctions/type/Makefile auxiliaryFunctions/pythag/Makefile auxiliaryFunctions/conj/Makefile statisticsFunctions/Makefile statisticsFunctions/mean/Makefile statisticsFunctions/sum/Makefile statisticsFunctions/variance/Makefile string/Makefile string/disp/Makefile string/string/Makefile signalProcessing/Makefile signalProcessing/fft/Makefile signalProcessing/ifft/Makefile signalProcessing/levin/Makefile signalProcessing/conv/Makefile signalProcessing/conv2d/Makefile" @@ -22785,6 +22785,7 @@ do "matrixOperations/inversion/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/inversion/Makefile" ;; "matrixOperations/jmat/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/jmat/Makefile" ;; "matrixOperations/chol/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/chol/Makefile" ;; + "matrixOperations/determ/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/determ/Makefile" ;; "implicitList/Makefile") CONFIG_FILES="$CONFIG_FILES implicitList/Makefile" ;; "elementaryFunctions/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/Makefile" ;; "elementaryFunctions/cos/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/cos/Makefile" ;; diff --git a/src/configure.ac b/src/configure.ac index 8c4bbb04..2dd84ec1 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -181,6 +181,7 @@ matrixOperations/infiniteNorm/Makefile matrixOperations/inversion/Makefile matrixOperations/jmat/Makefile matrixOperations/chol/Makefile +matrixOperations/determ/Makefile implicitList/Makefile elementaryFunctions/Makefile elementaryFunctions/cos/Makefile diff --git a/src/includes/lapack.h b/src/includes/lapack.h index c32e0dac..7e117313 100644 --- a/src/includes/lapack.h +++ b/src/includes/lapack.h @@ -145,4 +145,6 @@ extern int C2F(dasum) () ;/* could be transcribe easaly in c */ extern int C2F(zgees)(); extern int C2F(dpotrf)(); +extern int C2F(zpotrf)(); + #endif /* !__LAPACK_H__ */ diff --git a/src/matrixOperations/Makefile.am b/src/matrixOperations/Makefile.am index 1e5eace5..e59299c9 100644 --- a/src/matrixOperations/Makefile.am +++ b/src/matrixOperations/Makefile.am @@ -24,7 +24,8 @@ SUBDIRS= addition \ ones \ jmat \ inversion\ - chol + chol \ + determ diff --git a/src/matrixOperations/Makefile.in b/src/matrixOperations/Makefile.in index 6a66a3bd..e3dc1550 100644 --- a/src/matrixOperations/Makefile.in +++ b/src/matrixOperations/Makefile.in @@ -179,7 +179,8 @@ SUBDIRS = addition \ ones \ jmat \ inversion\ - chol + chol \ + determ all: all-recursive diff --git a/src/matrixOperations/inversion/zinverma.c b/src/matrixOperations/inversion/zinverma.c index c8d5052e..8bb69661 100644 --- a/src/matrixOperations/inversion/zinverma.c +++ b/src/matrixOperations/inversion/zinverma.c @@ -27,7 +27,7 @@ void zinverma ( doubleComplex* in, doubleComplex* out, int leadDimIn ) out[i] = in[i] ; } - zgetrf_ ( &leadDimIn, &leadDimIn, out, &leadDimIn, vectPivot, &info ); + zgetrf_ ( &leadDimIn, &leadDimIn, out, &leadDimIn, vectPivot, &info ); zgetri_ ( &leadDimIn, out, &leadDimIn , vectPivot, work , &leadDimIn , &info ); diff --git a/src/type/floatComplex.c b/src/type/floatComplex.c index d160e2d3..9b733693 100644 --- a/src/type/floatComplex.c +++ b/src/type/floatComplex.c @@ -136,3 +136,15 @@ bool cisimags(floatComplex z) { } +/* +** \function ccopya +** \brief copy a complex matrix in another one . +*/ + +void ccopya(floatComplex* in, int size, floatComplex* copy){ + int i; + for (i=0;i<size;i++){ + copy[i]=in[i]; + } +} + diff --git a/src/type/floatComplex.h b/src/type/floatComplex.h index a4e4f658..5545e91c 100644 --- a/src/type/floatComplex.h +++ b/src/type/floatComplex.h @@ -63,5 +63,7 @@ floatComplex FloatComplex(float, float); floatComplex* FloatComplexMatrix(float*, float*, int); bool cisreals(floatComplex); bool cisimags(floatComplex); +void ccopya(floatComplex*,int,floatComplex*); + #endif /* !__FLOATCOMPLEX_H__ */ |