diff options
Diffstat (limited to 'src/matrixOperations')
-rw-r--r-- | src/matrixOperations/division/Makefile.am | 1 | ||||
-rw-r--r-- | src/matrixOperations/division/Makefile.in | 1 | ||||
-rw-r--r-- | src/matrixOperations/division/ddiva.c | 16 | ||||
-rw-r--r-- | src/matrixOperations/includes/matrixDivision.h | 11 |
4 files changed, 15 insertions, 14 deletions
diff --git a/src/matrixOperations/division/Makefile.am b/src/matrixOperations/division/Makefile.am index 1f03ba06..b5b50637 100644 --- a/src/matrixOperations/division/Makefile.am +++ b/src/matrixOperations/division/Makefile.am @@ -27,7 +27,6 @@ check_PROGRAMS = testMatrixDivision check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/blas/libsciblas.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \ $(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \ diff --git a/src/matrixOperations/division/Makefile.in b/src/matrixOperations/division/Makefile.in index 9e79af05..6d4a4d23 100644 --- a/src/matrixOperations/division/Makefile.in +++ b/src/matrixOperations/division/Makefile.in @@ -210,7 +210,6 @@ libMatrixDivision_la_SOURCES = $(HEAD) \ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/blas/libsciblas.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \ $(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \ diff --git a/src/matrixOperations/division/ddiva.c b/src/matrixOperations/division/ddiva.c index f7c8e9e5..e25b3524 100644 --- a/src/matrixOperations/division/ddiva.c +++ b/src/matrixOperations/division/ddiva.c @@ -46,10 +46,14 @@ void drdiva ( double* in1, int lines1, int columns1 , - double* transpOfIn1 = (double*) malloc(sizeof(double) * (unsigned int) lines1 * (unsigned int) columns1); - double* transpOfIn2 = (double*) malloc(sizeof(double) * (unsigned int) lines2 * (unsigned int) columns2); + double* transpOfIn1 = (double*) malloc(sizeof(double) * (unsigned int) lines1 + * (unsigned int) columns1); - double* copyOfTransIn1 = (double*) malloc( sizeof(double) * (unsigned int) lines1 * (unsigned int) columns1); + double* transpOfIn2 = (double*) malloc(sizeof(double) * (unsigned int) lines2 + * (unsigned int) columns2); + + double* copyOfTransIn1 = (double*) malloc( sizeof(double) * (unsigned int) lines1 + * (unsigned int) columns1); @@ -94,7 +98,8 @@ void drdiva ( double* in1, int lines1, int columns1 , drowcata ( in1, lines1, columns1, NULL, 0 , 0 , copyOfTransIn1 ) ; - /*/ put here algo of LU fact of in1 dgetrf ( &columns1 , &columns1 , in1 , &columns1 , pIpiv , &info ) + /*/ put here algo of LU fact of in1 + dgetrf ( &columns1 , &columns1 , in1 , &columns1 , pIpiv , &info ) //return value in pIpiv*/ dgetrf_ ( &columns1 , &columns1 , in1 , &columns1 , pIpiv , &info ); @@ -105,7 +110,8 @@ void drdiva ( double* in1, int lines1, int columns1 , &rcond, work, pIwork, &info); if ( rcond > sqrt(epsilon )) - {/* put here algo to resolv linear equation in1 * X = in2 , the return value go in in2 + {/* put here algo to resolv linear equation in1 * X = in2 , + the return value go in in2 // put here algo to copy in2 in out */ resolveSystemLinear (&columns1, &lines2, copyOfTransIn1, pIpiv, transpOfIn2, &info) ; diff --git a/src/matrixOperations/includes/matrixDivision.h b/src/matrixOperations/includes/matrixDivision.h index 3c46d6c1..6fcddb90 100644 --- a/src/matrixOperations/includes/matrixDivision.h +++ b/src/matrixOperations/includes/matrixDivision.h @@ -22,21 +22,18 @@ void srdiva ( float* in1, int lines1, int columns1 , float* in2, int lines2, int columns2 , float* out ); - +/* void sldiva ( float * in1, int it1, float * in2, int it2, float * out, int itOut, int size) ; - +*/ void drdiva ( double* in1, int lines1, int columns1 , double* in2, int lines2, int columns2 , double* out ); -void drdiva ( double * in1, int it1, - double * in2, int it2, - double * out, int itOut, int size) ; - +/* void dldiva ( double * in1, int it1, double * in2, int it2, double * out, int itOut, int size) ; @@ -61,6 +58,6 @@ void zrdiva ( doubleComplex * in1, int it1, void zldiva ( doubleComplex * in1, int it1, doubleComplex * in2, int it2, - doubleComplex * out, int itOut, int size) ; + doubleComplex * out, int itOut, int size) ;*/ #endif /* !__MATRIXDIVISION_H__ */ |