summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/includes/lapack.h1
-rw-r--r--src/matrixOperations/division/Makefile.am4
-rw-r--r--src/matrixOperations/division/Makefile.in23
-rw-r--r--src/matrixOperations/division/cldiva.c6
-rw-r--r--src/matrixOperations/division/crdiva.c7
-rw-r--r--src/matrixOperations/division/zldiva.c4
-rw-r--r--src/matrixOperations/division/zrdiva.c5
-rw-r--r--src/matrixOperations/includes/matrixDivision.h28
8 files changed, 47 insertions, 31 deletions
diff --git a/src/includes/lapack.h b/src/includes/lapack.h
index 2751988a..52faccf5 100644
--- a/src/includes/lapack.h
+++ b/src/includes/lapack.h
@@ -13,6 +13,7 @@
#ifndef __LAPACK_H__
#define __LAPACK_H__
+#define C2F(name) name##_
#define getRelativeMachinePrecision() dlamch_("e", 1L)
#define getOverflowThreshold() dlamch_("o", 1L)
diff --git a/src/matrixOperations/division/Makefile.am b/src/matrixOperations/division/Makefile.am
index 00f7e603..a021eecb 100644
--- a/src/matrixOperations/division/Makefile.am
+++ b/src/matrixOperations/division/Makefile.am
@@ -26,7 +26,9 @@ libMatrixDivision_la_SOURCES = $(HEAD) \
drdiva.c \
dldiva.c \
zrdiva.c \
- zldiva.c
+ zldiva.c \
+ crdiva.c \
+ cldiva.c
check_PROGRAMS = testMatrixRDivision \
testMatrixLDivision
diff --git a/src/matrixOperations/division/Makefile.in b/src/matrixOperations/division/Makefile.in
index def07905..7ae2546a 100644
--- a/src/matrixOperations/division/Makefile.in
+++ b/src/matrixOperations/division/Makefile.in
@@ -58,7 +58,8 @@ am__objects_1 =
am_libMatrixDivision_la_OBJECTS = $(am__objects_1) \
libMatrixDivision_la-srdiva.lo libMatrixDivision_la-sldiva.lo \
libMatrixDivision_la-drdiva.lo libMatrixDivision_la-dldiva.lo \
- libMatrixDivision_la-zrdiva.lo libMatrixDivision_la-zldiva.lo
+ libMatrixDivision_la-zrdiva.lo libMatrixDivision_la-zldiva.lo \
+ libMatrixDivision_la-crdiva.lo libMatrixDivision_la-cldiva.lo
libMatrixDivision_la_OBJECTS = $(am_libMatrixDivision_la_OBJECTS)
libMatrixDivision_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -222,7 +223,9 @@ libMatrixDivision_la_SOURCES = $(HEAD) \
drdiva.c \
dldiva.c \
zrdiva.c \
- zldiva.c
+ zldiva.c \
+ crdiva.c \
+ cldiva.c
check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
@@ -324,6 +327,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-cldiva.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-crdiva.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-dldiva.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-drdiva.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-sldiva.Plo@am__quote@
@@ -396,6 +401,20 @@ libMatrixDivision_la-zldiva.lo: zldiva.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-zldiva.lo `test -f 'zldiva.c' || echo '$(srcdir)/'`zldiva.c
+libMatrixDivision_la-crdiva.lo: crdiva.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-crdiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-crdiva.Tpo -c -o libMatrixDivision_la-crdiva.lo `test -f 'crdiva.c' || echo '$(srcdir)/'`crdiva.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-crdiva.Tpo $(DEPDIR)/libMatrixDivision_la-crdiva.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='crdiva.c' object='libMatrixDivision_la-crdiva.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-crdiva.lo `test -f 'crdiva.c' || echo '$(srcdir)/'`crdiva.c
+
+libMatrixDivision_la-cldiva.lo: cldiva.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-cldiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-cldiva.Tpo -c -o libMatrixDivision_la-cldiva.lo `test -f 'cldiva.c' || echo '$(srcdir)/'`cldiva.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-cldiva.Tpo $(DEPDIR)/libMatrixDivision_la-cldiva.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cldiva.c' object='libMatrixDivision_la-cldiva.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-cldiva.lo `test -f 'cldiva.c' || echo '$(srcdir)/'`cldiva.c
+
testMatrixLDivision-testMatrixLDivision.o: testMatrixLDivision.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixLDivision_CFLAGS) $(CFLAGS) -MT testMatrixLDivision-testMatrixLDivision.o -MD -MP -MF $(DEPDIR)/testMatrixLDivision-testMatrixLDivision.Tpo -c -o testMatrixLDivision-testMatrixLDivision.o `test -f 'testMatrixLDivision.c' || echo '$(srcdir)/'`testMatrixLDivision.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testMatrixLDivision-testMatrixLDivision.Tpo $(DEPDIR)/testMatrixLDivision-testMatrixLDivision.Po
diff --git a/src/matrixOperations/division/cldiva.c b/src/matrixOperations/division/cldiva.c
index 021ebf4a..170380ca 100644
--- a/src/matrixOperations/division/cldiva.c
+++ b/src/matrixOperations/division/cldiva.c
@@ -17,6 +17,8 @@
#include "lapack.h"
#include <string.h>
#include <stdio.h>
+
+
void cldiva ( floatComplex* in1, int lines1, int columns1 ,
floatComplex* in2, int lines2, int columns2 ,
floatComplex* out ){
@@ -41,12 +43,12 @@ void cldiva ( floatComplex* in1, int lines1, int columns1 ,
/*copy and cast all the floatComplex value into doubleComplex value */
for ( i = 0 ; i < lines1 * columns1 ; i ++ )
{
- dblin1[i] = DoubleComplex ( (double) creals( in1[i]) , double cimags ( in1[i])) ;
+ dblin1[i] = DoubleComplex ( (double) creals( in1[i]) , (double) cimags ( in1[i])) ;
}
for ( i = 0 ; i < lines2 * columns2 ; i ++ )
{
- dblin2[i] = DoubleComplex ( (double) creals( in2[i]) , double cimags ( in2[i])) ;
+ dblin2[i] = DoubleComplex ( (double) creals( in2[i]) , (double) cimags ( in2[i])) ;
}
zldiva( dblin1 , lines1 , columns1 , dblin2 , lines2 , columns2 , dblout );
diff --git a/src/matrixOperations/division/crdiva.c b/src/matrixOperations/division/crdiva.c
index 974a87c7..70699ebf 100644
--- a/src/matrixOperations/division/crdiva.c
+++ b/src/matrixOperations/division/crdiva.c
@@ -17,7 +17,8 @@
#include "lapack.h"
#include <string.h>
#include <stdio.h>
-void cldiva ( floatComplex* in1, int lines1, int columns1 ,
+
+void crdiva ( floatComplex* in1, int lines1, int columns1 ,
floatComplex* in2, int lines2, int columns2 ,
floatComplex* out ){
@@ -41,12 +42,12 @@ void cldiva ( floatComplex* in1, int lines1, int columns1 ,
/*copy and cast all the floatComplex value into doubleComplex value */
for ( i = 0 ; i < lines1 * columns1 ; i ++ )
{
- dblin1[i] = DoubleComplex ( (double) creals( in1[i]) , double cimags ( in1[i])) ;
+ dblin1[i] = DoubleComplex ( (double) creals( in1[i]) , (double) cimags ( in1[i])) ;
}
for ( i = 0 ; i < lines2 * columns2 ; i ++ )
{
- dblin2[i] = DoubleComplex ( (double) creals( in2[i]) , double cimags ( in2[i])) ;
+ dblin2[i] = DoubleComplex ( (double) creals( in2[i]) , (double) cimags ( in2[i])) ;
}
zrdiva( dblin1 , lines1 , columns1 , dblin2 , lines2 , columns2 , dblout );
diff --git a/src/matrixOperations/division/zldiva.c b/src/matrixOperations/division/zldiva.c
index 625375f1..cc4cd479 100644
--- a/src/matrixOperations/division/zldiva.c
+++ b/src/matrixOperations/division/zldiva.c
@@ -14,7 +14,7 @@
#include "matrixDivision.h"
#include "string.h"
-int zldiva( doubleComplex* in1, int lines1, int columns1 ,
+void zldiva( doubleComplex* in1, int lines1, int columns1 ,
doubleComplex* in2, int lines2, int columns2 ,
doubleComplex* out )
{
@@ -117,5 +117,5 @@ int zldiva( doubleComplex* in1, int lines1, int columns1 ,
free(pJpvt);
free(pRwork);
free(pDwork);
- return 0;
+
}
diff --git a/src/matrixOperations/division/zrdiva.c b/src/matrixOperations/division/zrdiva.c
index b3b82988..a456ce32 100644
--- a/src/matrixOperations/division/zrdiva.c
+++ b/src/matrixOperations/division/zrdiva.c
@@ -17,7 +17,8 @@
#include <stdio.h>
#include <string.h>
-int zrdiva( doubleComplex* in1, int lines1, int columns1 ,
+
+void zrdiva( doubleComplex* in1, int lines1, int columns1 ,
doubleComplex* in2, int lines2, int columns2 ,
doubleComplex* out )
{
@@ -151,7 +152,7 @@ int zrdiva( doubleComplex* in1, int lines1, int columns1 ,
free(pJpvt);
free(pRwork);
free(poDwork);
- return 0;
+
}
diff --git a/src/matrixOperations/includes/matrixDivision.h b/src/matrixOperations/includes/matrixDivision.h
index 0579500b..2100092e 100644
--- a/src/matrixOperations/includes/matrixDivision.h
+++ b/src/matrixOperations/includes/matrixDivision.h
@@ -20,7 +20,7 @@
#include "matrixTranspose.h"
#include "conj.h"
-#define C2F(name) name##_
+
void srdiva ( float* in1, int lines1, int columns1 ,
float* in2, int lines2, int columns2 ,
float* out );
@@ -39,36 +39,26 @@ void dldiva ( double* in1, int lines1, int columns1 ,
double* in2, int lines2, int columns2 ,
double* out );
-int zrdiva( doubleComplex* in1, int lines1, int columns1 ,
+void zrdiva( doubleComplex* in1, int lines1, int columns1 ,
doubleComplex* in2, int lines2, int columns2 ,
doubleComplex* out );
-
-int zldiva( doubleComplex* in1, int lines1, int columns1 ,
+void zldiva( doubleComplex* in1, int lines1, int columns1 ,
doubleComplex* in2, int lines2, int columns2 ,
doubleComplex* out );
int Min(int _dblVar1, int _dblVar2);
int Max(int _dblVar1, int _dblVar2);
-/*
-void crdiva ( floatComplex * in1, int it1,
- floatComplex * in2, int it2,
- floatComplex * out) ;
-
-
-void cldiva ( floatComplex * in1, int it1,
- floatComplex * in2, int it2,
- floatComplex * out, int itOut, int size) ;
+void crdiva( floatComplex* in1, int lines1, int columns1 ,
+ floatComplex* in2, int lines2, int columns2 ,
+ floatComplex* out );
+void cldiva( floatComplex* in1, int lines1, int columns1 ,
+ floatComplex* in2, int lines2, int columns2 ,
+ floatComplex* out );
-void zrdiva ( doubleComplex * in1, int it1,
- doubleComplex * in2, int it2,
- doubleComplex * out, int itOut, int size) ;
-void zldiva ( doubleComplex * in1, int it1,
- doubleComplex * in2, int it2,
- doubleComplex * out, int itOut, int size) ;*/
#endif /* !__MATRIXDIVISION_H__ */
generated by cgit (git 2.34.1) at 2025-03-23 15:09:16 +0000