summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/matrixOperations/Makefile.am3
-rw-r--r--src/matrixOperations/Makefile.in3
-rw-r--r--src/matrixOperations/division/Makefile.am8
-rw-r--r--src/matrixOperations/division/Makefile.in8
-rw-r--r--src/matrixOperations/division/zrdiva.c3
-rw-r--r--src/matrixOperations/includes/matrixDivision.h1
-rw-r--r--src/matrixOperations/transpose/ctransposea.c4
-rw-r--r--src/matrixOperations/transpose/testMatrixTranspose.c4
-rw-r--r--src/matrixOperations/transpose/ztransposea.c4
9 files changed, 23 insertions, 15 deletions
diff --git a/src/matrixOperations/Makefile.am b/src/matrixOperations/Makefile.am
index 8de48bab..b35bfb10 100644
--- a/src/matrixOperations/Makefile.am
+++ b/src/matrixOperations/Makefile.am
@@ -17,5 +17,6 @@ SUBDIRS= addition \
cat \
transpose \
division \
- trace
+ trace \
+ hilbert
diff --git a/src/matrixOperations/Makefile.in b/src/matrixOperations/Makefile.in
index 619708b8..e0b4956d 100644
--- a/src/matrixOperations/Makefile.in
+++ b/src/matrixOperations/Makefile.in
@@ -172,7 +172,8 @@ SUBDIRS = addition \
cat \
transpose \
division \
- trace
+ trace \
+ hilbert
all: all-recursive
diff --git a/src/matrixOperations/division/Makefile.am b/src/matrixOperations/division/Makefile.am
index 49562596..00f7e603 100644
--- a/src/matrixOperations/division/Makefile.am
+++ b/src/matrixOperations/division/Makefile.am
@@ -11,8 +11,8 @@
##
libMatrixDivision_la_CFLAGS = -I $(top_builddir)/type \
- -I $(top_builddir)/matrixOperations/includes \
- -I $(top_builddir)/elementaryFunctions/includes
+ -I $(top_builddir)/matrixOperations/includes \
+ -I $(top_builddir)/elementaryFunctions/includes
instdir = $(top_builddir)/lib
@@ -36,10 +36,12 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
$(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \
+ $(top_builddir)/elementaryFunctions/conj/libConj.la \
libMatrixDivision.la
check_INCLUDES = -I $(top_builddir)/type \
- -I $(top_builddir)/matrixOperations/includes
+ -I $(top_builddir)/matrixOperations/includes \
+ -I $(top_builddir)/elementaryFunctions/includes
testMatrixLDivision_SOURCES = testMatrixLDivision.c
testMatrixLDivision_LDADD = $(check_LDADD)
diff --git a/src/matrixOperations/division/Makefile.in b/src/matrixOperations/division/Makefile.in
index 0184c910..def07905 100644
--- a/src/matrixOperations/division/Makefile.in
+++ b/src/matrixOperations/division/Makefile.in
@@ -210,8 +210,8 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
libMatrixDivision_la_CFLAGS = -I $(top_builddir)/type \
- -I $(top_builddir)/matrixOperations/includes \
- -I $(top_builddir)/elementaryFunctions/includes
+ -I $(top_builddir)/matrixOperations/includes \
+ -I $(top_builddir)/elementaryFunctions/includes
instdir = $(top_builddir)/lib
pkglib_LTLIBRARIES = libMatrixDivision.la
@@ -229,10 +229,12 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
$(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \
+ $(top_builddir)/elementaryFunctions/conj/libConj.la \
libMatrixDivision.la
check_INCLUDES = -I $(top_builddir)/type \
- -I $(top_builddir)/matrixOperations/includes
+ -I $(top_builddir)/matrixOperations/includes \
+ -I $(top_builddir)/elementaryFunctions/includes
testMatrixLDivision_SOURCES = testMatrixLDivision.c
testMatrixLDivision_LDADD = $(check_LDADD)
diff --git a/src/matrixOperations/division/zrdiva.c b/src/matrixOperations/division/zrdiva.c
index 43ed4d0f..b3b82988 100644
--- a/src/matrixOperations/division/zrdiva.c
+++ b/src/matrixOperations/division/zrdiva.c
@@ -68,9 +68,10 @@ int zrdiva( doubleComplex* in1, int lines1, int columns1 ,
dblEps = getRelativeMachinePrecision() ;
dblAnorm = C2F(zlange)(&cNorm, &lines2, &columns2, in2, &lines2, poDwork);
- /*tranpose A and B*/
+ /* hermitian tranpose A (transpose + conjugate )*/
ztransposea(in2, lines2, columns2, poAt);
+ zconja ( poAt , lines2*columns2 , poAt );
{
int i,j,ij,ji;
for(j = 0 ; j < lines1 ; j++)
diff --git a/src/matrixOperations/includes/matrixDivision.h b/src/matrixOperations/includes/matrixDivision.h
index 88520609..0579500b 100644
--- a/src/matrixOperations/includes/matrixDivision.h
+++ b/src/matrixOperations/includes/matrixDivision.h
@@ -18,6 +18,7 @@
#include "lapack.h"
#include "cat.h"
#include "matrixTranspose.h"
+#include "conj.h"
#define C2F(name) name##_
void srdiva ( float* in1, int lines1, int columns1 ,
diff --git a/src/matrixOperations/transpose/ctransposea.c b/src/matrixOperations/transpose/ctransposea.c
index 74291cf9..ed4c34bc 100644
--- a/src/matrixOperations/transpose/ctransposea.c
+++ b/src/matrixOperations/transpose/ctransposea.c
@@ -21,8 +21,8 @@ void ctransposea ( floatComplex* in , int lines1 , int column1, floatComplex* ou
for(index = 0 ; index < lines1 * column1 ; index++)
{
newCoord = index % column1 * lines1 + ( index / column1);
- /* Hermitian transpose*/
- out[newCoord] = FloatComplex ( creals( in[index]) , -cimags ( in[index]));
+
+ out[newCoord] = FloatComplex ( creals( in[index]) , cimags ( in[index]));
}
}
diff --git a/src/matrixOperations/transpose/testMatrixTranspose.c b/src/matrixOperations/transpose/testMatrixTranspose.c
index 0413455f..790b3a4f 100644
--- a/src/matrixOperations/transpose/testMatrixTranspose.c
+++ b/src/matrixOperations/transpose/testMatrixTranspose.c
@@ -345,7 +345,7 @@ static void ctranspaTest (void ) {
for ( i = 0 ; i < LINE*COLUMN ; i++ )
{
in[i] = FloatComplex ( Pin[i] , Pin[i] ) ;
- Result[i] = FloatComplex ( PResult[i] , - PResult[i] ) ;
+ Result[i] = FloatComplex ( PResult[i] , PResult[i] ) ;
}
@@ -474,7 +474,7 @@ static void ztranspaTest (void ) {
for ( i = 0 ; i < LINE*COLUMN ; i++ )
{
in[i] = DoubleComplex ( Pin[i] , Pin[i] ) ;
- Result[i] = DoubleComplex ( PResult[i] , - PResult[i] ) ;
+ Result[i] = DoubleComplex ( PResult[i] , PResult[i] ) ;
}
diff --git a/src/matrixOperations/transpose/ztransposea.c b/src/matrixOperations/transpose/ztransposea.c
index 54aeaf1c..5d78c5f6 100644
--- a/src/matrixOperations/transpose/ztransposea.c
+++ b/src/matrixOperations/transpose/ztransposea.c
@@ -19,8 +19,8 @@ void ztransposea ( doubleComplex* in , int lines1 , int column1, doubleComplex*
for(index = 0 ; index < lines1 * column1 ; index++)
{
newCoord = index % column1 * lines1 + ( index / column1);
- /* Hermitian transpose*/
- out[newCoord] = DoubleComplex ( zreals( in[index]) , -zimags ( in[index]));
+
+ out[newCoord] = DoubleComplex ( zreals( in[index]) , zimags ( in[index]));
}
generated by cgit (git 2.34.1) at 2025-03-19 21:57:36 +0000