diff options
Diffstat (limited to 'src')
96 files changed, 341 insertions, 254 deletions
diff --git a/src/auxiliaryFunctions/abs/Makefile.am b/src/auxiliaryFunctions/abs/Makefile.am index 09a84011..88240c22 100644 --- a/src/auxiliaryFunctions/abs/Makefile.am +++ b/src/auxiliaryFunctions/abs/Makefile.am @@ -46,6 +46,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAbs testDoubleAbs diff --git a/src/auxiliaryFunctions/abs/Makefile.in b/src/auxiliaryFunctions/abs/Makefile.in index 046714dd..a1a2bdda 100644 --- a/src/auxiliaryFunctions/abs/Makefile.in +++ b/src/auxiliaryFunctions/abs/Makefile.in @@ -70,7 +70,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleAbs_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAbs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAbs_CFLAGS) \ @@ -242,6 +243,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/auxiliaryFunctions/conj/Makefile.am b/src/auxiliaryFunctions/conj/Makefile.am index 22a85a74..900e2aec 100644 --- a/src/auxiliaryFunctions/conj/Makefile.am +++ b/src/auxiliaryFunctions/conj/Makefile.am @@ -37,6 +37,7 @@ check_LDADD = libConj.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 diff --git a/src/auxiliaryFunctions/conj/Makefile.in b/src/auxiliaryFunctions/conj/Makefile.in index 0c214b52..0097d238 100644 --- a/src/auxiliaryFunctions/conj/Makefile.in +++ b/src/auxiliaryFunctions/conj/Makefile.in @@ -215,6 +215,7 @@ check_LDADD = libConj.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 check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/auxiliaryFunctions/frexp/Makefile.am b/src/auxiliaryFunctions/frexp/Makefile.am index 2fdccca1..ffb4d9ee 100644 --- a/src/auxiliaryFunctions/frexp/Makefile.am +++ b/src/auxiliaryFunctions/frexp/Makefile.am @@ -12,6 +12,7 @@ libFrexp_la_CFLAGS = -I $(top_builddir)/type \ -I $(top_builddir)/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/auxiliaryFunctions/includes @@ -47,10 +48,12 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/pow/libPow.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libFrexp.la check_INCLUDES = -I $(top_builddir)/type \ -I $(top_builddir)/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/auxiliaryFunctions/includes diff --git a/src/auxiliaryFunctions/frexp/Makefile.in b/src/auxiliaryFunctions/frexp/Makefile.in index 992d5a66..2e59c3e6 100644 --- a/src/auxiliaryFunctions/frexp/Makefile.in +++ b/src/auxiliaryFunctions/frexp/Makefile.in @@ -195,6 +195,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ libFrexp_la_CFLAGS = -I $(top_builddir)/type \ -I $(top_builddir)/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/auxiliaryFunctions/includes @@ -225,10 +226,12 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/pow/libPow.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libFrexp.la check_INCLUDES = -I $(top_builddir)/type \ -I $(top_builddir)/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/auxiliaryFunctions/includes diff --git a/src/auxiliaryFunctions/includes/pythag.h b/src/auxiliaryFunctions/includes/pythag.h index ecf5b11f..a6e469eb 100644 --- a/src/auxiliaryFunctions/includes/pythag.h +++ b/src/auxiliaryFunctions/includes/pythag.h @@ -13,8 +13,7 @@ #ifndef __PYTHAG_H__ #define __PYTHAG_H__ -#include "floatComplex.h" -#include "doubleComplex.h" +#include "multiplication.h" #include "addition.h" #include "sqrt.h" diff --git a/src/auxiliaryFunctions/pythag/Makefile.am b/src/auxiliaryFunctions/pythag/Makefile.am index 524a4c6e..1d68e54a 100644 --- a/src/auxiliaryFunctions/pythag/Makefile.am +++ b/src/auxiliaryFunctions/pythag/Makefile.am @@ -54,4 +54,5 @@ testPythag_LDADD = $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/auxiliaryFunctions/pythag/Makefile.in b/src/auxiliaryFunctions/pythag/Makefile.in index 61043f39..52eb153f 100644 --- a/src/auxiliaryFunctions/pythag/Makefile.in +++ b/src/auxiliaryFunctions/pythag/Makefile.in @@ -70,7 +70,8 @@ testPythag_DEPENDENCIES = $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testPythag_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testPythag_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -238,6 +239,7 @@ testPythag_LDADD = $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ all: all-am diff --git a/src/auxiliaryFunctions/sign/Makefile.am b/src/auxiliaryFunctions/sign/Makefile.am index fe1df3e1..bbe1993f 100644 --- a/src/auxiliaryFunctions/sign/Makefile.am +++ b/src/auxiliaryFunctions/sign/Makefile.am @@ -56,4 +56,5 @@ testSign_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/auxiliaryFunctions/sign/Makefile.in b/src/auxiliaryFunctions/sign/Makefile.in index 0ba405f9..feb4ca08 100644 --- a/src/auxiliaryFunctions/sign/Makefile.in +++ b/src/auxiliaryFunctions/sign/Makefile.in @@ -71,7 +71,8 @@ testSign_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la + $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testSign_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(testSign_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -241,6 +242,7 @@ testSign_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ all: all-am diff --git a/src/configure b/src/configure index eee41a8d..44bd3563 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 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 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" +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 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" @@ -22767,6 +22767,8 @@ do "operations/Makefile") CONFIG_FILES="$CONFIG_FILES operations/Makefile" ;; "operations/addition/Makefile") CONFIG_FILES="$CONFIG_FILES operations/addition/Makefile" ;; "operations/subtraction/Makefile") CONFIG_FILES="$CONFIG_FILES operations/subtraction/Makefile" ;; + "operations/division/Makefile") CONFIG_FILES="$CONFIG_FILES operations/division/Makefile" ;; + "operations/multiplication/Makefile") CONFIG_FILES="$CONFIG_FILES operations/multiplication/Makefile" ;; "matrixOperations/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/Makefile" ;; "matrixOperations/addition/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/addition/Makefile" ;; "matrixOperations/subtraction/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/subtraction/Makefile" ;; diff --git a/src/configure.ac b/src/configure.ac index f1ad35bb..dd694cec 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -163,6 +163,8 @@ type/Makefile operations/Makefile operations/addition/Makefile operations/subtraction/Makefile +operations/division/Makefile +operations/multiplication/Makefile matrixOperations/Makefile matrixOperations/addition/Makefile matrixOperations/subtraction/Makefile diff --git a/src/elementaryFunctions/acos/Makefile.am b/src/elementaryFunctions/acos/Makefile.am index 69b5872c..a09873e5 100644 --- a/src/elementaryFunctions/acos/Makefile.am +++ b/src/elementaryFunctions/acos/Makefile.am @@ -52,6 +52,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAcos testDoubleAcos diff --git a/src/elementaryFunctions/acos/Makefile.in b/src/elementaryFunctions/acos/Makefile.in index 5d64270c..7ace41fb 100644 --- a/src/elementaryFunctions/acos/Makefile.in +++ b/src/elementaryFunctions/acos/Makefile.in @@ -75,7 +75,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleAcos_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAcos_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAcos_CFLAGS) \ @@ -254,6 +255,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/acosh/Makefile.am b/src/elementaryFunctions/acosh/Makefile.am index 324e1923..a602d700 100644 --- a/src/elementaryFunctions/acosh/Makefile.am +++ b/src/elementaryFunctions/acosh/Makefile.am @@ -50,6 +50,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAcosh testDoubleAcosh @@ -65,4 +66,4 @@ testFloatAcosh_LDADD = $(check_LDADD) testDoubleAcosh_SOURCES = testAcosh.h testDoubleAcosh.c testDoubleAcosh_CFLAGS = $(check_INCLUDES) -testDoubleAcosh_LDADD = $(check_LDADD)
\ No newline at end of file +testDoubleAcosh_LDADD = $(check_LDADD) diff --git a/src/elementaryFunctions/acosh/Makefile.in b/src/elementaryFunctions/acosh/Makefile.in index 709287aa..db4b45c2 100644 --- a/src/elementaryFunctions/acosh/Makefile.in +++ b/src/elementaryFunctions/acosh/Makefile.in @@ -78,7 +78,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleAcosh_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAcosh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAcosh_CFLAGS) \ @@ -254,6 +255,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/asin/Makefile.am b/src/elementaryFunctions/asin/Makefile.am index 5adec096..edc2c130 100644 --- a/src/elementaryFunctions/asin/Makefile.am +++ b/src/elementaryFunctions/asin/Makefile.am @@ -53,6 +53,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAsin testDoubleAsin @@ -68,4 +69,4 @@ testFloatAsin_LDADD = $(check_LDADD) testDoubleAsin_SOURCES = testAsin.h testDoubleAsin.c testDoubleAsin_CFLAGS = $(check_INCLUDES) -testDoubleAsin_LDADD = $(check_LDADD)
\ No newline at end of file +testDoubleAsin_LDADD = $(check_LDADD) diff --git a/src/elementaryFunctions/asin/Makefile.in b/src/elementaryFunctions/asin/Makefile.in index e541a8f4..5d9552f5 100644 --- a/src/elementaryFunctions/asin/Makefile.in +++ b/src/elementaryFunctions/asin/Makefile.in @@ -76,7 +76,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/atan/libAtan.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleAsin_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAsin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAsin_CFLAGS) \ @@ -254,6 +255,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/asinh/Makefile.am b/src/elementaryFunctions/asinh/Makefile.am index eee969fb..ed27672b 100644 --- a/src/elementaryFunctions/asinh/Makefile.am +++ b/src/elementaryFunctions/asinh/Makefile.am @@ -50,6 +50,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAsinh testDoubleAsinh @@ -65,4 +66,4 @@ testFloatAsinh_LDADD = $(check_LDADD) testDoubleAsinh_SOURCES = testAsinh.h testDoubleAsinh.c testDoubleAsinh_CFLAGS = $(check_INCLUDES) -testDoubleAsinh_LDADD = $(check_LDADD)
\ No newline at end of file +testDoubleAsinh_LDADD = $(check_LDADD) diff --git a/src/elementaryFunctions/asinh/Makefile.in b/src/elementaryFunctions/asinh/Makefile.in index 172d4565..c93b8aea 100644 --- a/src/elementaryFunctions/asinh/Makefile.in +++ b/src/elementaryFunctions/asinh/Makefile.in @@ -78,7 +78,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la + $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleAsinh_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAsinh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAsinh_CFLAGS) \ @@ -254,6 +255,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/atan/Makefile.am b/src/elementaryFunctions/atan/Makefile.am index 2f57b332..2e4abca1 100644 --- a/src/elementaryFunctions/atan/Makefile.am +++ b/src/elementaryFunctions/atan/Makefile.am @@ -48,6 +48,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAtan testDoubleAtan diff --git a/src/elementaryFunctions/atan/Makefile.in b/src/elementaryFunctions/atan/Makefile.in index 88163747..dbb0816d 100644 --- a/src/elementaryFunctions/atan/Makefile.in +++ b/src/elementaryFunctions/atan/Makefile.in @@ -72,7 +72,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/atan/libAtan.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleAtan_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAtan_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAtan_CFLAGS) \ @@ -245,6 +246,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/atan2/Makefile.am b/src/elementaryFunctions/atan2/Makefile.am index dad1dfca..bafbc9ee 100644 --- a/src/elementaryFunctions/atan2/Makefile.am +++ b/src/elementaryFunctions/atan2/Makefile.am @@ -42,7 +42,8 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/atan2/libAtan2.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la check_PROGRAMS = testAtan2 diff --git a/src/elementaryFunctions/atan2/Makefile.in b/src/elementaryFunctions/atan2/Makefile.in index 1f997e41..bedb4078 100644 --- a/src/elementaryFunctions/atan2/Makefile.in +++ b/src/elementaryFunctions/atan2/Makefile.in @@ -222,7 +222,8 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/atan2/libAtan2.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la # diff --git a/src/elementaryFunctions/atanh/Makefile.am b/src/elementaryFunctions/atanh/Makefile.am index 432687bb..5776601d 100644 --- a/src/elementaryFunctions/atanh/Makefile.am +++ b/src/elementaryFunctions/atanh/Makefile.am @@ -47,6 +47,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAtanh testDoubleAtanh diff --git a/src/elementaryFunctions/atanh/Makefile.in b/src/elementaryFunctions/atanh/Makefile.in index 96da0d86..33e21f7f 100644 --- a/src/elementaryFunctions/atanh/Makefile.in +++ b/src/elementaryFunctions/atanh/Makefile.in @@ -75,7 +75,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/atanh/libAtanh.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleAtanh_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAtanh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAtanh_CFLAGS) \ @@ -248,6 +249,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/cos/Makefile.am b/src/elementaryFunctions/cos/Makefile.am index d0724443..c1a4b016 100644 --- a/src/elementaryFunctions/cos/Makefile.am +++ b/src/elementaryFunctions/cos/Makefile.am @@ -51,6 +51,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatCos testDoubleCos @@ -66,4 +67,4 @@ testFloatCos_LDADD = $(check_LDADD) testDoubleCos_SOURCES = ../../includes/constant.h testCos.h testDoubleCos.c testDoubleCos_CFLAGS = $(check_INCLUDES) -testDoubleCos_LDADD = $(check_LDADD)
\ No newline at end of file +testDoubleCos_LDADD = $(check_LDADD) diff --git a/src/elementaryFunctions/cos/Makefile.in b/src/elementaryFunctions/cos/Makefile.in index 7fce0fb0..4e1459e6 100644 --- a/src/elementaryFunctions/cos/Makefile.in +++ b/src/elementaryFunctions/cos/Makefile.in @@ -75,7 +75,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/exp/libExp.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleCos_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleCos_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleCos_CFLAGS) \ @@ -250,6 +251,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/cosh/Makefile.am b/src/elementaryFunctions/cosh/Makefile.am index 5d1e1785..04aeab04 100644 --- a/src/elementaryFunctions/cosh/Makefile.am +++ b/src/elementaryFunctions/cosh/Makefile.am @@ -50,6 +50,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatCosh testDoubleCosh diff --git a/src/elementaryFunctions/cosh/Makefile.in b/src/elementaryFunctions/cosh/Makefile.in index 2e5c888f..d5616175 100644 --- a/src/elementaryFunctions/cosh/Makefile.in +++ b/src/elementaryFunctions/cosh/Makefile.in @@ -75,7 +75,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/exp/libExp.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleCosh_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleCosh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleCosh_CFLAGS) \ @@ -251,6 +252,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/exp/Makefile.am b/src/elementaryFunctions/exp/Makefile.am index c27beb19..81be5552 100644 --- a/src/elementaryFunctions/exp/Makefile.am +++ b/src/elementaryFunctions/exp/Makefile.am @@ -49,6 +49,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatExp testDoubleExp diff --git a/src/elementaryFunctions/exp/Makefile.in b/src/elementaryFunctions/exp/Makefile.in index 4e28b042..bcbe4302 100644 --- a/src/elementaryFunctions/exp/Makefile.in +++ b/src/elementaryFunctions/exp/Makefile.in @@ -75,7 +75,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/exp/libExp.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleExp_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleExp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleExp_CFLAGS) \ @@ -250,6 +251,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ testFloatExp_SOURCES = testExp.h testFloatExp.c diff --git a/src/elementaryFunctions/exp10/Makefile.am b/src/elementaryFunctions/exp10/Makefile.am index 14fed216..32ac9d56 100644 --- a/src/elementaryFunctions/exp10/Makefile.am +++ b/src/elementaryFunctions/exp10/Makefile.am @@ -11,6 +11,7 @@ ## libExp10_la_CFLAGS = -I ../../type \ + -I $(top_builddir)/operations/includes \ -I ../includes instdir = $(top_builddir)/lib @@ -54,6 +55,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatExp10 testDoubleExp10 diff --git a/src/elementaryFunctions/exp10/Makefile.in b/src/elementaryFunctions/exp10/Makefile.in index 42aff43b..323c0f67 100644 --- a/src/elementaryFunctions/exp10/Makefile.in +++ b/src/elementaryFunctions/exp10/Makefile.in @@ -82,7 +82,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/exp10/libExp10.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleExp10_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleExp10_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleExp10_CFLAGS) \ @@ -223,6 +224,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ libExp10_la_CFLAGS = -I ../../type \ + -I $(top_builddir)/operations/includes \ -I ../includes instdir = $(top_builddir)/lib @@ -262,6 +264,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ testFloatExp10_SOURCES = testExp10.h testFloatExp10.c diff --git a/src/elementaryFunctions/includes/pow.h b/src/elementaryFunctions/includes/pow.h index ab85a5c2..26206c9b 100644 --- a/src/elementaryFunctions/includes/pow.h +++ b/src/elementaryFunctions/includes/pow.h @@ -13,8 +13,7 @@ #ifndef __POW_H__ #define __POW_H__ -#include "floatComplex.h" -#include "doubleComplex.h" +#include "multiplication.h" float spows(float value, float expand); diff --git a/src/elementaryFunctions/lnp1m1/Makefile.am b/src/elementaryFunctions/lnp1m1/Makefile.am index 2735e938..27478fa3 100644 --- a/src/elementaryFunctions/lnp1m1/Makefile.am +++ b/src/elementaryFunctions/lnp1m1/Makefile.am @@ -40,6 +40,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatLnp1m1 testDoubleLnp1m1 diff --git a/src/elementaryFunctions/lnp1m1/Makefile.in b/src/elementaryFunctions/lnp1m1/Makefile.in index 276bb202..d31663ea 100644 --- a/src/elementaryFunctions/lnp1m1/Makefile.in +++ b/src/elementaryFunctions/lnp1m1/Makefile.in @@ -70,7 +70,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la + $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleLnp1m1_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleLnp1m1_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLnp1m1_CFLAGS) \ @@ -237,6 +238,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ testFloatLnp1m1_SOURCES = testLnp1m1.h testFloatLnp1m1.c diff --git a/src/elementaryFunctions/log/Makefile.am b/src/elementaryFunctions/log/Makefile.am index 9b6efadd..83d21bf5 100644 --- a/src/elementaryFunctions/log/Makefile.am +++ b/src/elementaryFunctions/log/Makefile.am @@ -49,6 +49,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatLog testDoubleLog diff --git a/src/elementaryFunctions/log/Makefile.in b/src/elementaryFunctions/log/Makefile.in index 2f4dafa9..ddc1490b 100644 --- a/src/elementaryFunctions/log/Makefile.in +++ b/src/elementaryFunctions/log/Makefile.in @@ -73,7 +73,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/log1p/libLog1p.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleLog_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleLog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLog_CFLAGS) \ @@ -248,6 +249,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ testFloatLog_SOURCES = testLog.h testFloatLog.c diff --git a/src/elementaryFunctions/log10/Makefile.am b/src/elementaryFunctions/log10/Makefile.am index a692f87d..7b6589c8 100644 --- a/src/elementaryFunctions/log10/Makefile.am +++ b/src/elementaryFunctions/log10/Makefile.am @@ -48,6 +48,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatLog10 testDoubleLog10 @@ -63,4 +64,4 @@ testFloatLog10_LDADD = $(check_LDADD) testDoubleLog10_SOURCES = testLog10.h testDoubleLog10.c testDoubleLog10_CFLAGS = $(check_INCLUDES) -testDoubleLog10_LDADD = $(check_LDADD)
\ No newline at end of file +testDoubleLog10_LDADD = $(check_LDADD) diff --git a/src/elementaryFunctions/log10/Makefile.in b/src/elementaryFunctions/log10/Makefile.in index d3cbfb4f..a0476728 100644 --- a/src/elementaryFunctions/log10/Makefile.in +++ b/src/elementaryFunctions/log10/Makefile.in @@ -76,7 +76,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleLog10_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleLog10_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLog10_CFLAGS) \ @@ -250,6 +251,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/log1p/Makefile.am b/src/elementaryFunctions/log1p/Makefile.am index c60aceda..6425f19c 100644 --- a/src/elementaryFunctions/log1p/Makefile.am +++ b/src/elementaryFunctions/log1p/Makefile.am @@ -47,6 +47,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/log/libLog.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatLog1p testDoubleLog1p @@ -62,4 +63,4 @@ testFloatLog1p_LDADD = $(check_LDADD) testDoubleLog1p_SOURCES = testLog1p.h testDoubleLog1p.c testDoubleLog1p_CFLAGS = $(check_INCLUDES) -testDoubleLog1p_LDADD = $(check_LDADD)
\ No newline at end of file +testDoubleLog1p_LDADD = $(check_LDADD) diff --git a/src/elementaryFunctions/log1p/Makefile.in b/src/elementaryFunctions/log1p/Makefile.in index edb8a483..a1a3ea1d 100644 --- a/src/elementaryFunctions/log1p/Makefile.in +++ b/src/elementaryFunctions/log1p/Makefile.in @@ -75,7 +75,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/elementaryFunctions/log/libLog.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la + $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleLog1p_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleLog1p_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLog1p_CFLAGS) \ @@ -248,6 +249,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/log/libLog.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/pow/Makefile.am b/src/elementaryFunctions/pow/Makefile.am index 4fa06570..f9814fff 100644 --- a/src/elementaryFunctions/pow/Makefile.am +++ b/src/elementaryFunctions/pow/Makefile.am @@ -11,6 +11,7 @@ ## libPow_la_CFLAGS = -I $(top_builddir)/type \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes instdir = $(top_builddir)/lib @@ -35,6 +36,7 @@ HEAD = ../includes/pow.h #### check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/type check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \ @@ -53,6 +55,7 @@ check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatPow testDoublePow diff --git a/src/elementaryFunctions/pow/Makefile.in b/src/elementaryFunctions/pow/Makefile.in index 76c32b22..e3008c99 100644 --- a/src/elementaryFunctions/pow/Makefile.in +++ b/src/elementaryFunctions/pow/Makefile.in @@ -79,7 +79,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/elementaryFunctions/cosh/libCosh.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la + $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoublePow_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoublePow_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoublePow_CFLAGS) \ @@ -220,6 +221,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ libPow_la_CFLAGS = -I $(top_builddir)/type \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes instdir = $(top_builddir)/lib @@ -240,6 +242,7 @@ HEAD = ../includes/pow.h # Checking Part #### check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/type check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \ @@ -258,6 +261,7 @@ check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ testFloatPow_SOURCES = testPow.h testFloatPow.c diff --git a/src/elementaryFunctions/sin/Makefile.am b/src/elementaryFunctions/sin/Makefile.am index 12639df7..967c7c23 100644 --- a/src/elementaryFunctions/sin/Makefile.am +++ b/src/elementaryFunctions/sin/Makefile.am @@ -49,6 +49,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatSin testDoubleSin diff --git a/src/elementaryFunctions/sin/Makefile.in b/src/elementaryFunctions/sin/Makefile.in index 0bb76526..c9441d87 100644 --- a/src/elementaryFunctions/sin/Makefile.in +++ b/src/elementaryFunctions/sin/Makefile.in @@ -75,7 +75,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/cosh/libCosh.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleSin_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleSin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSin_CFLAGS) \ @@ -250,6 +251,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/sinh/Makefile.am b/src/elementaryFunctions/sinh/Makefile.am index fcdcb298..8dc5e785 100644 --- a/src/elementaryFunctions/sinh/Makefile.am +++ b/src/elementaryFunctions/sinh/Makefile.am @@ -49,6 +49,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatSinh testDoubleSinh diff --git a/src/elementaryFunctions/sinh/Makefile.in b/src/elementaryFunctions/sinh/Makefile.in index 2711e162..9e678ca9 100644 --- a/src/elementaryFunctions/sinh/Makefile.in +++ b/src/elementaryFunctions/sinh/Makefile.in @@ -75,7 +75,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/exp/libExp.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleSinh_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleSinh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSinh_CFLAGS) \ @@ -250,6 +251,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/sqrt/Makefile.am b/src/elementaryFunctions/sqrt/Makefile.am index da24a0a9..978c84e0 100644 --- a/src/elementaryFunctions/sqrt/Makefile.am +++ b/src/elementaryFunctions/sqrt/Makefile.am @@ -46,6 +46,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatSqrt testDoubleSqrt diff --git a/src/elementaryFunctions/sqrt/Makefile.in b/src/elementaryFunctions/sqrt/Makefile.in index 7e2c20a5..ffc619ff 100644 --- a/src/elementaryFunctions/sqrt/Makefile.in +++ b/src/elementaryFunctions/sqrt/Makefile.in @@ -70,7 +70,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleSqrt_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleSqrt_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSqrt_CFLAGS) \ @@ -242,6 +243,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/tan/Makefile.am b/src/elementaryFunctions/tan/Makefile.am index 6f40ef4b..19489e83 100644 --- a/src/elementaryFunctions/tan/Makefile.am +++ b/src/elementaryFunctions/tan/Makefile.am @@ -54,6 +54,7 @@ check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatTan testDoubleTan diff --git a/src/elementaryFunctions/tan/Makefile.in b/src/elementaryFunctions/tan/Makefile.in index b8564c11..e789212c 100644 --- a/src/elementaryFunctions/tan/Makefile.in +++ b/src/elementaryFunctions/tan/Makefile.in @@ -79,7 +79,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/elementaryFunctions/log1p/libLog1p.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleTan_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleTan_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleTan_CFLAGS) \ @@ -259,6 +260,7 @@ check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/elementaryFunctions/tanh/Makefile.am b/src/elementaryFunctions/tanh/Makefile.am index 9470758d..2fa67250 100644 --- a/src/elementaryFunctions/tanh/Makefile.am +++ b/src/elementaryFunctions/tanh/Makefile.am @@ -54,6 +54,7 @@ check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/elementaryFunctions/tanh/libTanh.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatTanh testDoubleTanh @@ -69,4 +70,4 @@ testFloatTanh_LDADD = $(check_LDADD) testDoubleTanh_SOURCES = testTanh.h testDoubleTanh.c testDoubleTanh_CFLAGS = $(check_INCLUDES) -testDoubleTanh_LDADD = $(check_LDADD)
\ No newline at end of file +testDoubleTanh_LDADD = $(check_LDADD) diff --git a/src/elementaryFunctions/tanh/Makefile.in b/src/elementaryFunctions/tanh/Makefile.in index eb78ddf5..ffcc1009 100644 --- a/src/elementaryFunctions/tanh/Makefile.in +++ b/src/elementaryFunctions/tanh/Makefile.in @@ -80,7 +80,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/elementaryFunctions/tanh/libTanh.la + $(top_builddir)/elementaryFunctions/tanh/libTanh.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleTanh_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleTanh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleTanh_CFLAGS) \ @@ -260,6 +261,7 @@ check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/elementaryFunctions/tanh/libTanh.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/matrixOperations/Makefile.am b/src/matrixOperations/Makefile.am index 2c8cd8a4..177f0013 100644 --- a/src/matrixOperations/Makefile.am +++ b/src/matrixOperations/Makefile.am @@ -21,7 +21,10 @@ SUBDIRS= addition \ subtraction \ trace \ transpose \ - ones + ones + # inversion + + diff --git a/src/matrixOperations/Makefile.in b/src/matrixOperations/Makefile.in index f114bf3d..a3730bc4 100644 --- a/src/matrixOperations/Makefile.in +++ b/src/matrixOperations/Makefile.in @@ -176,7 +176,7 @@ SUBDIRS = addition \ subtraction \ trace \ transpose \ - ones + ones all: all-recursive diff --git a/src/matrixOperations/division/Makefile.am b/src/matrixOperations/division/Makefile.am index 6549944e..0638f845 100644 --- a/src/matrixOperations/division/Makefile.am +++ b/src/matrixOperations/division/Makefile.am @@ -22,14 +22,14 @@ pkglib_LTLIBRARIES = libMatrixDivision.la HEAD = ../includes/matrixDivision.h libMatrixDivision_la_SOURCES = $(HEAD) \ - srdiva.c \ - sldiva.c \ - drdiva.c \ - dldiva.c \ - zrdiva.c \ - zldiva.c \ - crdiva.c \ - cldiva.c + srdivma.c \ + sldivma.c \ + drdivma.c \ + dldivma.c \ + zrdivma.c \ + zldivma.c \ + crdivma.c \ + cldivma.c check_PROGRAMS = testMatrixRDivision \ testMatrixLDivision diff --git a/src/matrixOperations/division/Makefile.in b/src/matrixOperations/division/Makefile.in index b8c8001b..6b0bbdcd 100644 --- a/src/matrixOperations/division/Makefile.in +++ b/src/matrixOperations/division/Makefile.in @@ -56,10 +56,14 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) libMatrixDivision_la_LIBADD = 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-crdiva.lo libMatrixDivision_la-cldiva.lo + libMatrixDivision_la-srdivma.lo \ + libMatrixDivision_la-sldivma.lo \ + libMatrixDivision_la-drdivma.lo \ + libMatrixDivision_la-dldivma.lo \ + libMatrixDivision_la-zrdivma.lo \ + libMatrixDivision_la-zldivma.lo \ + libMatrixDivision_la-crdivma.lo \ + libMatrixDivision_la-cldivma.lo libMatrixDivision_la_OBJECTS = $(am_libMatrixDivision_la_OBJECTS) libMatrixDivision_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -219,14 +223,14 @@ instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libMatrixDivision.la HEAD = ../includes/matrixDivision.h libMatrixDivision_la_SOURCES = $(HEAD) \ - srdiva.c \ - sldiva.c \ - drdiva.c \ - dldiva.c \ - zrdiva.c \ - zldiva.c \ - crdiva.c \ - cldiva.c + srdivma.c \ + sldivma.c \ + drdivma.c \ + dldivma.c \ + zrdivma.c \ + zldivma.c \ + crdivma.c \ + cldivma.c check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ @@ -329,14 +333,14 @@ 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@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-srdiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-zldiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-zrdiva.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-cldivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-crdivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-dldivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-drdivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-sldivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-srdivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-zldivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-zrdivma.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMatrixLDivision-testMatrixLDivision.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMatrixRDivision-testMatrixRDivision.Po@am__quote@ @@ -361,61 +365,61 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -libMatrixDivision_la-srdiva.lo: srdiva.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-srdiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-srdiva.Tpo -c -o libMatrixDivision_la-srdiva.lo `test -f 'srdiva.c' || echo '$(srcdir)/'`srdiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-srdiva.Tpo $(DEPDIR)/libMatrixDivision_la-srdiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srdiva.c' object='libMatrixDivision_la-srdiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-srdivma.lo: srdivma.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-srdivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-srdivma.Tpo -c -o libMatrixDivision_la-srdivma.lo `test -f 'srdivma.c' || echo '$(srcdir)/'`srdivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-srdivma.Tpo $(DEPDIR)/libMatrixDivision_la-srdivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srdivma.c' object='libMatrixDivision_la-srdivma.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-srdiva.lo `test -f 'srdiva.c' || echo '$(srcdir)/'`srdiva.c +@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-srdivma.lo `test -f 'srdivma.c' || echo '$(srcdir)/'`srdivma.c -libMatrixDivision_la-sldiva.lo: sldiva.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-sldiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-sldiva.Tpo -c -o libMatrixDivision_la-sldiva.lo `test -f 'sldiva.c' || echo '$(srcdir)/'`sldiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-sldiva.Tpo $(DEPDIR)/libMatrixDivision_la-sldiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sldiva.c' object='libMatrixDivision_la-sldiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-sldivma.lo: sldivma.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-sldivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-sldivma.Tpo -c -o libMatrixDivision_la-sldivma.lo `test -f 'sldivma.c' || echo '$(srcdir)/'`sldivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-sldivma.Tpo $(DEPDIR)/libMatrixDivision_la-sldivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sldivma.c' object='libMatrixDivision_la-sldivma.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-sldiva.lo `test -f 'sldiva.c' || echo '$(srcdir)/'`sldiva.c +@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-sldivma.lo `test -f 'sldivma.c' || echo '$(srcdir)/'`sldivma.c -libMatrixDivision_la-drdiva.lo: drdiva.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-drdiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-drdiva.Tpo -c -o libMatrixDivision_la-drdiva.lo `test -f 'drdiva.c' || echo '$(srcdir)/'`drdiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-drdiva.Tpo $(DEPDIR)/libMatrixDivision_la-drdiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drdiva.c' object='libMatrixDivision_la-drdiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-drdivma.lo: drdivma.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-drdivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-drdivma.Tpo -c -o libMatrixDivision_la-drdivma.lo `test -f 'drdivma.c' || echo '$(srcdir)/'`drdivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-drdivma.Tpo $(DEPDIR)/libMatrixDivision_la-drdivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drdivma.c' object='libMatrixDivision_la-drdivma.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-drdiva.lo `test -f 'drdiva.c' || echo '$(srcdir)/'`drdiva.c +@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-drdivma.lo `test -f 'drdivma.c' || echo '$(srcdir)/'`drdivma.c -libMatrixDivision_la-dldiva.lo: dldiva.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-dldiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-dldiva.Tpo -c -o libMatrixDivision_la-dldiva.lo `test -f 'dldiva.c' || echo '$(srcdir)/'`dldiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-dldiva.Tpo $(DEPDIR)/libMatrixDivision_la-dldiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dldiva.c' object='libMatrixDivision_la-dldiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-dldivma.lo: dldivma.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-dldivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-dldivma.Tpo -c -o libMatrixDivision_la-dldivma.lo `test -f 'dldivma.c' || echo '$(srcdir)/'`dldivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-dldivma.Tpo $(DEPDIR)/libMatrixDivision_la-dldivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dldivma.c' object='libMatrixDivision_la-dldivma.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-dldiva.lo `test -f 'dldiva.c' || echo '$(srcdir)/'`dldiva.c +@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-dldivma.lo `test -f 'dldivma.c' || echo '$(srcdir)/'`dldivma.c -libMatrixDivision_la-zrdiva.lo: zrdiva.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-zrdiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-zrdiva.Tpo -c -o libMatrixDivision_la-zrdiva.lo `test -f 'zrdiva.c' || echo '$(srcdir)/'`zrdiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-zrdiva.Tpo $(DEPDIR)/libMatrixDivision_la-zrdiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zrdiva.c' object='libMatrixDivision_la-zrdiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-zrdivma.lo: zrdivma.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-zrdivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-zrdivma.Tpo -c -o libMatrixDivision_la-zrdivma.lo `test -f 'zrdivma.c' || echo '$(srcdir)/'`zrdivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-zrdivma.Tpo $(DEPDIR)/libMatrixDivision_la-zrdivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zrdivma.c' object='libMatrixDivision_la-zrdivma.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-zrdiva.lo `test -f 'zrdiva.c' || echo '$(srcdir)/'`zrdiva.c +@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-zrdivma.lo `test -f 'zrdivma.c' || echo '$(srcdir)/'`zrdivma.c -libMatrixDivision_la-zldiva.lo: zldiva.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-zldiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-zldiva.Tpo -c -o libMatrixDivision_la-zldiva.lo `test -f 'zldiva.c' || echo '$(srcdir)/'`zldiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-zldiva.Tpo $(DEPDIR)/libMatrixDivision_la-zldiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zldiva.c' object='libMatrixDivision_la-zldiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-zldivma.lo: zldivma.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-zldivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-zldivma.Tpo -c -o libMatrixDivision_la-zldivma.lo `test -f 'zldivma.c' || echo '$(srcdir)/'`zldivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-zldivma.Tpo $(DEPDIR)/libMatrixDivision_la-zldivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zldivma.c' object='libMatrixDivision_la-zldivma.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-zldiva.lo `test -f 'zldiva.c' || echo '$(srcdir)/'`zldiva.c +@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-zldivma.lo `test -f 'zldivma.c' || echo '$(srcdir)/'`zldivma.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@ +libMatrixDivision_la-crdivma.lo: crdivma.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-crdivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-crdivma.Tpo -c -o libMatrixDivision_la-crdivma.lo `test -f 'crdivma.c' || echo '$(srcdir)/'`crdivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-crdivma.Tpo $(DEPDIR)/libMatrixDivision_la-crdivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='crdivma.c' object='libMatrixDivision_la-crdivma.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 +@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-crdivma.lo `test -f 'crdivma.c' || echo '$(srcdir)/'`crdivma.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@ +libMatrixDivision_la-cldivma.lo: cldivma.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-cldivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-cldivma.Tpo -c -o libMatrixDivision_la-cldivma.lo `test -f 'cldivma.c' || echo '$(srcdir)/'`cldivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-cldivma.Tpo $(DEPDIR)/libMatrixDivision_la-cldivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cldivma.c' object='libMatrixDivision_la-cldivma.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 +@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-cldivma.lo `test -f 'cldivma.c' || echo '$(srcdir)/'`cldivma.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 diff --git a/src/matrixOperations/division/testMatrixLDivision.c b/src/matrixOperations/division/testMatrixLDivision.c index 9b10c885..ad5bb9bd 100644 --- a/src/matrixOperations/division/testMatrixLDivision.c +++ b/src/matrixOperations/division/testMatrixLDivision.c @@ -25,7 +25,7 @@ #define ZCOLUMNS2 1 -static void sldivaTest ( void ){ +static void sldivmaTest ( void ){ int i = 0; float in1[] = { 4.0f , 3.0f , 8.0f , 9.0f } ; @@ -35,7 +35,7 @@ static void sldivaTest ( void ){ float out [(COLUMNS2)*(LINES)] ; - sldiva( in1 , LINES , COLUMNS1 , in2 , LINES , COLUMNS2 , out ) ; + sldivma( in1 , LINES , COLUMNS1 , in2 , LINES , COLUMNS2 , out ) ; for ( i = 0 ; i < LINES *COLUMNS2 ; i++ ) { printf ( "\t\t %d out : %e\tresult : %e\tassert : %e \n" , i , out[i] , result[i] , fabs ( out[i] - result[i] ) / fabs( out[i]) ) ; @@ -48,7 +48,7 @@ static void sldivaTest ( void ){ } -static void dldivaTest ( void ) +static void dldivmaTest ( void ) { int i = 0 ; /* here the matrixes are linearized in the wrong way so need to transpose them */ @@ -282,7 +282,7 @@ static void dldivaTest ( void ) double out [(COLUMNS2)*(LINES)] ; - dldiva( in1 , LINES , COLUMNS1 , in2 , LINES , COLUMNS2 , out ) ; + dldivma( in1 , LINES , COLUMNS1 , in2 , LINES , COLUMNS2 , out ) ; for ( i = 0 ; i < LINES *COLUMNS2 ; i++ ) { printf ( "\t\t %d out : %e\tresult : %e\tassert : %e \n" , i , out[i] , result[i] , fabs ( out[i] - result[i] ) / fabs( out[i]) ) ; @@ -294,7 +294,7 @@ static void dldivaTest ( void ) -static void cldivaTest (void ) +static void cldivmaTest (void ) { int i = 0 ; @@ -323,7 +323,7 @@ static void cldivaTest (void ) Result[2] = FloatComplex ( -1.16666666f , 0 ); Result[3] = FloatComplex ( 0.833333333333f , 0 );*/ - cldiva ( in1 , ZLINES , ZCOLUMNS1 , in2 ,ZLINES , ZCOLUMNS2 , out) ; + cldivma ( in1 , ZLINES , ZCOLUMNS1 , in2 ,ZLINES , ZCOLUMNS2 , out) ; for ( i = 0 ; i < (ZCOLUMNS1*ZCOLUMNS2 ) ; i++ ) { @@ -354,7 +354,7 @@ static void cldivaTest (void ) -static void zldivaTest (void ) +static void zldivmaTest (void ) { int i = 0 ; @@ -383,7 +383,7 @@ static void zldivaTest (void ) Result[2] = DoubleComplex ( -1.16666666 , 0 ); Result[3] = DoubleComplex ( 0.833333333333 , 0 ); */ - zldiva ( in1 , ZLINES , ZCOLUMNS1 , in2 ,ZLINES , ZCOLUMNS2 , out) ; + zldivma ( in1 , ZLINES , ZCOLUMNS1 , in2 ,ZLINES , ZCOLUMNS2 , out) ; for ( i = 0 ; i < (ZCOLUMNS1*ZCOLUMNS2 ) ; i++ ) { @@ -411,7 +411,7 @@ static void zldivaTest (void ) -static int testLDiva (void) { +static int testLDivma (void) { printf ("&&&& WARNING , TESTS FOR COMPLEX ARE STILL WRONG &&&&&&\n\n" ) ; printf("\n\n\n\n*********************\n"); @@ -419,23 +419,23 @@ static int testLDiva (void) { printf("*********************\n"); printf("\n\t>>>>Float real Tests\n"); - sldivaTest(); + sldivmaTest(); printf("\n\n\n\t>>>> Double real Tests\n"); - dldivaTest(); + dldivmaTest(); printf("\n\t>>>> Double complex Tests\n"); - zldivaTest(); + zldivmaTest(); printf("\n\t>>>> Float complex Tests\n"); - cldivaTest(); + cldivmaTest(); return 0; } int main(void) { - assert(testLDiva () == 0); + assert(testLDivma () == 0); return 0; } diff --git a/src/matrixOperations/division/testMatrixRDivision.c b/src/matrixOperations/division/testMatrixRDivision.c index 884bbc35..a6947377 100644 --- a/src/matrixOperations/division/testMatrixRDivision.c +++ b/src/matrixOperations/division/testMatrixRDivision.c @@ -26,7 +26,7 @@ -static void sdivaTest ( void ) +static void sdivmaTest ( void ) { int i = 0 ; /* @@ -220,7 +220,7 @@ float out[(COLUMNS)*(LINES2)] ;*/ - srdiva ( in1 , LINES1 , COLUMNS , in2 , LINES2 , COLUMNS , out) ; + srdivma ( in1 , LINES1 , COLUMNS , in2 , LINES2 , COLUMNS , out) ; for ( i = 0 ; i < LINES2 *COLUMNS ; ++i ) { @@ -237,7 +237,7 @@ float out[(COLUMNS)*(LINES2)] ;*/ -static void drdivaTest ( void ) +static void drdivmaTest ( void ) { int i = 0 ; @@ -251,7 +251,7 @@ static void drdivaTest ( void ) double result[] = { 1 , 2.2 }; double out [(COLUMNS)*(LINES2)] ; - drdiva ( in1 , LINES1 , COLUMNS , in2 , LINES2 , COLUMNS , out) ; + drdivma ( in1 , LINES1 , COLUMNS , in2 , LINES2 , COLUMNS , out) ; for ( i = 0 ; i < LINES2 *COLUMNS ; i++ ) { printf ( "\t\t %d out : %e result : %e assert : %e \n" , @@ -262,7 +262,7 @@ static void drdivaTest ( void ) } -static void crdivaTest (void ) +static void crdivmaTest (void ) { int i = 0 ; @@ -282,7 +282,7 @@ static void crdivaTest (void ) Result[0] = FloatComplex ( 1.0f , 0 ); Result[1] = FloatComplex ( 2.2f , 0 ); - crdiva ( in1 , ZLINES1 , ZCOLUMNS , in2 ,ZLINES2 , ZCOLUMNS , out) ; + crdivma ( in1 , ZLINES1 , ZCOLUMNS , in2 ,ZLINES2 , ZCOLUMNS , out) ; for ( i = 0 ; i < (ZLINES2*ZCOLUMNS ) ; i++ ) { @@ -310,7 +310,7 @@ static void crdivaTest (void ) -static void zrdivaTest ( void ){ +static void zrdivmaTest ( void ){ int i = 0 ; /* double tin1 [] = @@ -423,7 +423,7 @@ static void zrdivaTest ( void ){ Result[0] = DoubleComplex ( 1 , 0 ); Result[1] = DoubleComplex ( 2.2 , 0 ); - zrdiva ( in1 , ZLINES1 , ZCOLUMNS , in2 ,ZLINES2 , ZCOLUMNS , out) ; + zrdivma ( in1 , ZLINES1 , ZCOLUMNS , in2 ,ZLINES2 , ZCOLUMNS , out) ; for ( i = 0 ; i < (ZLINES2*ZCOLUMNS ) ; i++ ) { @@ -448,28 +448,28 @@ static void zrdivaTest ( void ){ } } -static int testRDiva (void) { +static int testRDivma (void) { printf("\n\n\n\n**********************\n"); printf("***** Right Tests ****\n"); printf("**********************\n"); printf("\n\t>>>> Float real Tests\n"); - sdivaTest(); + sdivmaTest(); printf("\n\n\n\n\t>>>> Double real Tests\n"); - drdivaTest(); + drdivmaTest(); printf("\n\t>>>> Float complex Tests\n"); - crdivaTest(); + crdivmaTest(); printf("\n\t>>>> Double complex Tests\n"); - zrdivaTest(); + zrdivmaTest(); return 0; } int main(void) { - assert(testRDiva () == 0); + assert(testRDivma () == 0); return 0; } diff --git a/src/matrixOperations/expm/Makefile.am b/src/matrixOperations/expm/Makefile.am index a369b489..77ece94e 100644 --- a/src/matrixOperations/expm/Makefile.am +++ b/src/matrixOperations/expm/Makefile.am @@ -61,6 +61,8 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/matrixOperations/eye/libMatrixEye.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ + $(top_builddir)/operations/division/libDivision.la \ libMatrixExponential.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/expm/Makefile.in b/src/matrixOperations/expm/Makefile.in index 91eeb14c..53760dc0 100644 --- a/src/matrixOperations/expm/Makefile.in +++ b/src/matrixOperations/expm/Makefile.in @@ -247,6 +247,8 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/matrixOperations/eye/libMatrixEye.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ + $(top_builddir)/operations/division/libDivision.la \ libMatrixExponential.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/expm/cexpma.c b/src/matrixOperations/expm/cexpma.c index b58855dd..fd73ea85 100644 --- a/src/matrixOperations/expm/cexpma.c +++ b/src/matrixOperations/expm/cexpma.c @@ -1,5 +1,4 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +/* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2008-2008 - INRIA - Allan SIMON * * This file must be used under the terms of the CeCILL. @@ -60,7 +59,7 @@ void cexpma(floatComplex * in, floatComplex * out, int _iLeadDim) /*A = A./2^s */ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) - pfltMatrixA[iIndex1] = cdevides ( in[iIndex1] , FloatComplex ( fltS2 , 0 )); + pfltMatrixA[iIndex1] = cdivides ( in[iIndex1] , FloatComplex ( fltS2 , 0 )); /* Pade approximation for exp(A) @@ -136,7 +135,7 @@ void cexpma(floatComplex * in, floatComplex * out, int _iLeadDim) pfltMatrixTemp[iIndex1] = out[iIndex1] ; /* E = D\E */ - cldiva ( pfltMatrixD , _iLeadDim , _iLeadDim , pfltMatrixTemp , _iLeadDim , _iLeadDim , out ) ; + cldivma ( pfltMatrixD , _iLeadDim , _iLeadDim , pfltMatrixTemp , _iLeadDim , _iLeadDim , out ) ; /*/ Undo scaling by repeated squaring */ for(iLoop1 = 0 ; iLoop1 < fltS ; iLoop1++) diff --git a/src/matrixOperations/expm/dexpma.c b/src/matrixOperations/expm/dexpma.c index b8616d81..df25146c 100644 --- a/src/matrixOperations/expm/dexpma.c +++ b/src/matrixOperations/expm/dexpma.c @@ -127,7 +127,7 @@ void dexpma (double* in, double* out, int _iLeadDim){ pdblMatrixTemp[iIndex1] = out[iIndex1] ; /*E = D\E*/ - dldiva ( pdblMatrixD , _iLeadDim , _iLeadDim , pdblMatrixTemp , _iLeadDim , _iLeadDim , out ); + dldivma ( pdblMatrixD , _iLeadDim , _iLeadDim , pdblMatrixTemp , _iLeadDim , _iLeadDim , out ); /* Undo scaling by repeated squaring*/ for(iLoop1 = 0 ; iLoop1 < dblS ; iLoop1++) diff --git a/src/matrixOperations/expm/sexpma.c b/src/matrixOperations/expm/sexpma.c index 7bc1e91b..77a1e43a 100644 --- a/src/matrixOperations/expm/sexpma.c +++ b/src/matrixOperations/expm/sexpma.c @@ -131,7 +131,7 @@ void sexpma (float* in, float* out, int _iLeadDim){ pfltMatrixTemp[iIndex1] = out[iIndex1] ; /*E = D\E*/ - sldiva ( pfltMatrixD , _iLeadDim , _iLeadDim , pfltMatrixTemp , _iLeadDim , _iLeadDim , out ); + sldivma ( pfltMatrixD , _iLeadDim , _iLeadDim , pfltMatrixTemp , _iLeadDim , _iLeadDim , out ); /* Undo scaling by repeated squaring*/ for(iLoop1 = 0 ; iLoop1 < fltS ; iLoop1++) diff --git a/src/matrixOperations/expm/zexpma.c b/src/matrixOperations/expm/zexpma.c index 331238d4..fcbb8222 100644 --- a/src/matrixOperations/expm/zexpma.c +++ b/src/matrixOperations/expm/zexpma.c @@ -61,7 +61,7 @@ void zexpma(doubleComplex * in, doubleComplex * out, int _iLeadDim) /*A = A./2^s */ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) - pdblMatrixA[iIndex1] = zdevides ( in[iIndex1] , DoubleComplex ( dblS2 , 0 )); + pdblMatrixA[iIndex1] = zdivides ( in[iIndex1] , DoubleComplex ( dblS2 , 0 )); /* Pade approximation for exp(A) @@ -140,7 +140,7 @@ void zexpma(doubleComplex * in, doubleComplex * out, int _iLeadDim) pdblMatrixTemp[iIndex1] = out[iIndex1] ; /* E = D\E */ - zldiva ( pdblMatrixD , _iLeadDim , _iLeadDim , pdblMatrixTemp , _iLeadDim , _iLeadDim , out ) ; + zldivma ( pdblMatrixD , _iLeadDim , _iLeadDim , pdblMatrixTemp , _iLeadDim , _iLeadDim , out ) ; /*/ Undo scaling by repeated squaring */ for(iLoop1 = 0 ; iLoop1 < dblS ; iLoop1++) diff --git a/src/matrixOperations/includes/matrixDivision.h b/src/matrixOperations/includes/matrixDivision.h index 38fc9634..55006c54 100644 --- a/src/matrixOperations/includes/matrixDivision.h +++ b/src/matrixOperations/includes/matrixDivision.h @@ -23,37 +23,37 @@ #include "max.h" -void srdiva ( float* in1, int lines1, int columns1 , +void srdivma ( float* in1, int lines1, int columns1 , float* in2, int lines2, int columns2 , float* out ); -void sldiva ( float* in1, int lines1, int columns1 , +void sldivma ( float* in1, int lines1, int columns1 , float* in2, int lines2, int columns2 , float* out ); -void drdiva ( double* in1, int lines1, int columns1 , +void drdivma ( double* in1, int lines1, int columns1 , double* in2, int lines2, int columns2 , double* out ); -void dldiva ( double* in1, int lines1, int columns1 , +void dldivma ( double* in1, int lines1, int columns1 , double* in2, int lines2, int columns2 , double* out ); -void zrdiva( doubleComplex* in1, int lines1, int columns1 , +void zrdivma( doubleComplex* in1, int lines1, int columns1 , doubleComplex* in2, int lines2, int columns2 , doubleComplex* out ); -void zldiva( doubleComplex* in1, int lines1, int columns1 , +void zldivma( doubleComplex* in1, int lines1, int columns1 , doubleComplex* in2, int lines2, int columns2 , doubleComplex* out ); -void crdiva( floatComplex* in1, int lines1, int columns1 , +void crdivma( floatComplex* in1, int lines1, int columns1 , floatComplex* in2, int lines2, int columns2 , floatComplex* out ); -void cldiva( floatComplex* in1, int lines1, int columns1 , +void cldivma( floatComplex* in1, int lines1, int columns1 , floatComplex* in2, int lines2, int columns2 , floatComplex* out ); diff --git a/src/matrixOperations/includes/matrixExponential.h b/src/matrixOperations/includes/matrixExponential.h index aceed63b..44b89a68 100644 --- a/src/matrixOperations/includes/matrixExponential.h +++ b/src/matrixOperations/includes/matrixExponential.h @@ -28,7 +28,7 @@ #include "eye.h" #include "infiniteNorm.h" #include "frexp.h" - +#include "division.h" void sexpma (float* in, float* out, int _iLeadDim); diff --git a/src/matrixOperations/includes/matrixMultiplication.h b/src/matrixOperations/includes/matrixMultiplication.h index b2620498..99091a7e 100644 --- a/src/matrixOperations/includes/matrixMultiplication.h +++ b/src/matrixOperations/includes/matrixMultiplication.h @@ -13,8 +13,7 @@ #ifndef __MATRIXMULTIPLICATION_H__ #define __MATRIXMULTIPLICATION_H__ -#include "floatComplex.h" -#include "doubleComplex.h" +#include "multiplication.h" #include "addition.h" /* diff --git a/src/matrixOperations/infiniteNorm/Makefile.am b/src/matrixOperations/infiniteNorm/Makefile.am index 36da5130..0fae9268 100644 --- a/src/matrixOperations/infiniteNorm/Makefile.am +++ b/src/matrixOperations/infiniteNorm/Makefile.am @@ -41,6 +41,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libMatrixInfiniteNorm.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/infiniteNorm/Makefile.in b/src/matrixOperations/infiniteNorm/Makefile.in index 605e9619..d93ce6a9 100644 --- a/src/matrixOperations/infiniteNorm/Makefile.in +++ b/src/matrixOperations/infiniteNorm/Makefile.in @@ -227,6 +227,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libMatrixInfiniteNorm.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/multiplication/Makefile.am b/src/matrixOperations/multiplication/Makefile.am index 2e88893f..fc852e4f 100644 --- a/src/matrixOperations/multiplication/Makefile.am +++ b/src/matrixOperations/multiplication/Makefile.am @@ -32,6 +32,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libMatrixMultiplication.la check_INCLUDES = -I $(top_builddir)/type \ @@ -43,4 +44,4 @@ testMatrixMultiplication_SOURCES = testFloatMatrixMultiplication.c \ testMatrixMultiplication_LDADD = $(check_LDADD) testMatrixMultiplication_CFLAGS = $(check_INCLUDES) -TESTS = testMatrixMultiplication
\ No newline at end of file +TESTS = testMatrixMultiplication diff --git a/src/matrixOperations/multiplication/Makefile.in b/src/matrixOperations/multiplication/Makefile.in index 50ed8661..6ac07df7 100644 --- a/src/matrixOperations/multiplication/Makefile.in +++ b/src/matrixOperations/multiplication/Makefile.in @@ -220,6 +220,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libMatrixMultiplication.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/multiplication/testFloatMatrixMultiplication.c b/src/matrixOperations/multiplication/testFloatMatrixMultiplication.c index 6091fc66..6e83c573 100644 --- a/src/matrixOperations/multiplication/testFloatMatrixMultiplication.c +++ b/src/matrixOperations/multiplication/testFloatMatrixMultiplication.c @@ -194,6 +194,8 @@ static void smulmaTest(void) { assert(miscM7_by_M8[7] == 34.0f); assert(miscM7_by_M8[8] == 44.0f); + + } int testFloatMultiplication(void) { diff --git a/src/operations/Makefile.am b/src/operations/Makefile.am index 0a775d1d..c18c67e4 100644 --- a/src/operations/Makefile.am +++ b/src/operations/Makefile.am @@ -13,4 +13,6 @@ dist_SUBDIRS= includes SUBDIRS= addition \ - subtraction + subtraction \ + division \ + multiplication diff --git a/src/operations/Makefile.in b/src/operations/Makefile.in index 037caccf..647720a4 100644 --- a/src/operations/Makefile.in +++ b/src/operations/Makefile.in @@ -167,7 +167,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ dist_SUBDIRS = includes SUBDIRS = addition \ - subtraction + subtraction \ + division \ + multiplication all: all-recursive diff --git a/src/operations/includes/division.h b/src/operations/includes/division.h index 49c2a4c4..f191451e 100644 --- a/src/operations/includes/division.h +++ b/src/operations/includes/division.h @@ -185,4 +185,17 @@ void zldiva(doubleComplex* in1, int size1, doubleComplex* out ); +/* +** \function cdivides +** \brief Divide 2 Complex numbers. +*/ +floatComplex cdivides(floatComplex z1, floatComplex z2); + + +/* +** \function zdivides +** \brief Divide 2 Complex numbers. +*/ +doubleComplex zdivides(doubleComplex z1, doubleComplex z2); + #endif /* !__DIVISION_H__ */ diff --git a/src/operations/includes/multiplication.h b/src/operations/includes/multiplication.h index 69c4b076..0553917d 100644 --- a/src/operations/includes/multiplication.h +++ b/src/operations/includes/multiplication.h @@ -69,7 +69,7 @@ void dmula(double *in1, int size1, ** \param in2 : input float complex. ** \return : in1 + in2 */ -floatComplex smuls(floatComplex in1, floatComplex in2); +floatComplex cmuls(floatComplex in1, floatComplex in2); /* ** \brief Compute a multiplication element ways for complex single precision. @@ -89,7 +89,7 @@ void cmula(floatComplex *in1, int size1, ** \param in2 : input double conplex. ** \return : in1 + in2 */ -doubleComplex dmuls(doubleComplex in1, doubleComplex in2); +doubleComplex zmuls(doubleComplex in1, doubleComplex in2); /* ** \brief Compute a multiplication element ways for complex double precision. @@ -103,4 +103,17 @@ void zmula(doubleComplex *in1, int size1, doubleComplex *in2, int size2, doubleComplex *out); + +/* +** \function ctimess +** \brief Multiply 2 Complex numbers. +*/ +floatComplex ctimess(floatComplex z1, floatComplex z2); + +/* +** \function ztimess +** \brief Multiply 2 Complex numbers. +*/ +doubleComplex ztimess(doubleComplex z1, doubleComplex z2); + #endif /* !__MULTIPLICATION_H__ */ diff --git a/src/statisticsFunctions/includes/mean.h b/src/statisticsFunctions/includes/mean.h index c07cad58..275d2ddb 100644 --- a/src/statisticsFunctions/includes/mean.h +++ b/src/statisticsFunctions/includes/mean.h @@ -13,8 +13,7 @@ #ifndef __MEAN_H__ #define __MEAN_H__ -#include "floatComplex.h" -#include "doubleComplex.h" +#include "division.h" #include "addition.h" /* diff --git a/src/statisticsFunctions/includes/variance.h b/src/statisticsFunctions/includes/variance.h index 6ed0b36f..be984236 100644 --- a/src/statisticsFunctions/includes/variance.h +++ b/src/statisticsFunctions/includes/variance.h @@ -14,6 +14,7 @@ #define __VARIANCE_H__ #include "subtraction.h" +#include "division.h" #include "pow.h" #include "sum.h" @@ -25,8 +26,7 @@ #include <stdlib.h> #include <math.h> -#include "doubleComplex.h" -#include "floatComplex.h" + diff --git a/src/statisticsFunctions/mean/Makefile.am b/src/statisticsFunctions/mean/Makefile.am index b9a9eb5c..9d23e3db 100644 --- a/src/statisticsFunctions/mean/Makefile.am +++ b/src/statisticsFunctions/mean/Makefile.am @@ -48,6 +48,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/statisticsFunctions/mean/libMean.la \ $(top_builddir)/statisticsFunctions/sum/libSum.la \ + $(top_builddir)/operations/division/libDivision.la \ @LIBMATH@ check_PROGRAMS = testFloatMean testDoubleMean @@ -63,4 +64,4 @@ testFloatMean_LDADD = $(check_LDADD) testDoubleMean_SOURCES =testDoubleMean.c testDoubleMean_CFLAGS = $(check_INCLUDES) -testDoubleMean_LDADD = $(check_LDADD)
\ No newline at end of file +testDoubleMean_LDADD = $(check_LDADD) diff --git a/src/statisticsFunctions/mean/Makefile.in b/src/statisticsFunctions/mean/Makefile.in index fe75fe8a..b43517a0 100644 --- a/src/statisticsFunctions/mean/Makefile.in +++ b/src/statisticsFunctions/mean/Makefile.in @@ -71,7 +71,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/statisticsFunctions/mean/libMean.la \ - $(top_builddir)/statisticsFunctions/sum/libSum.la + $(top_builddir)/statisticsFunctions/sum/libSum.la \ + $(top_builddir)/operations/division/libDivision.la testDoubleMean_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleMean_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleMean_CFLAGS) \ @@ -245,6 +246,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/statisticsFunctions/mean/libMean.la \ $(top_builddir)/statisticsFunctions/sum/libSum.la \ + $(top_builddir)/operations/division/libDivision.la \ @LIBMATH@ diff --git a/src/statisticsFunctions/mean/ccolumnmeana.c b/src/statisticsFunctions/mean/ccolumnmeana.c index 888150c2..41b83896 100644 --- a/src/statisticsFunctions/mean/ccolumnmeana.c +++ b/src/statisticsFunctions/mean/ccolumnmeana.c @@ -19,6 +19,6 @@ void ccolumnmeana(floatComplex *in, int lines, int columns, floatComplex *out) { ccolumnsuma(in, lines, columns, out); for (i = 0; i < lines; ++i) { - out[i] = cdevides(out[i] , FloatComplex((float) columns, 0.0f)); + out[i] = cdivides(out[i] , FloatComplex((float) columns, 0.0f)); } } diff --git a/src/statisticsFunctions/mean/crowmeana.c b/src/statisticsFunctions/mean/crowmeana.c index 05f3f523..b5d98444 100644 --- a/src/statisticsFunctions/mean/crowmeana.c +++ b/src/statisticsFunctions/mean/crowmeana.c @@ -19,6 +19,6 @@ void crowmeana(floatComplex *in, int lines, int columns, floatComplex *out) { crowsuma(in, lines, columns, out); for (i = 0; i < columns; ++i) { - out[i] = cdevides(out[i], FloatComplex((float)lines, 0.0f)); + out[i] = cdivides(out[i], FloatComplex((float)lines, 0.0f)); } } diff --git a/src/statisticsFunctions/mean/zcolumnmeana.c b/src/statisticsFunctions/mean/zcolumnmeana.c index c4ffef3c..c72b70ca 100644 --- a/src/statisticsFunctions/mean/zcolumnmeana.c +++ b/src/statisticsFunctions/mean/zcolumnmeana.c @@ -19,6 +19,6 @@ void zcolumnmeana(doubleComplex *in, int lines, int columns, doubleComplex *out) zcolumnsuma(in, lines, columns, out); for (i = 0; i < lines; ++i) { - out[i] = zdevides(out[i] , DoubleComplex((double) columns, 0.0f)); + out[i] = zdivides(out[i] , DoubleComplex((double) columns, 0.0f)); } } diff --git a/src/statisticsFunctions/mean/zrowmeana.c b/src/statisticsFunctions/mean/zrowmeana.c index 280df796..5390bc6d 100644 --- a/src/statisticsFunctions/mean/zrowmeana.c +++ b/src/statisticsFunctions/mean/zrowmeana.c @@ -19,6 +19,6 @@ void zrowmeana(doubleComplex *in, int lines, int columns, doubleComplex *out) { zrowsuma(in, lines, columns, out); for (i = 0; i < columns; ++i) { - out[i] = zdevides(out[i], DoubleComplex((double)lines, 0.0f)); + out[i] = zdivides(out[i], DoubleComplex((double)lines, 0.0f)); } } diff --git a/src/statisticsFunctions/variance/Makefile.am b/src/statisticsFunctions/variance/Makefile.am index 63c18c0c..656a1249 100644 --- a/src/statisticsFunctions/variance/Makefile.am +++ b/src/statisticsFunctions/variance/Makefile.am @@ -67,7 +67,9 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la + $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ + $(top_builddir)/operations/division/libDivision.la \ @LIBMATH@ check_PROGRAMS = testFloatVariance testDoubleVariance diff --git a/src/statisticsFunctions/variance/Makefile.in b/src/statisticsFunctions/variance/Makefile.in index 6dd00c9d..77ee5f92 100644 --- a/src/statisticsFunctions/variance/Makefile.in +++ b/src/statisticsFunctions/variance/Makefile.in @@ -72,7 +72,30 @@ libVariance_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ am_testDoubleVariance_OBJECTS = \ testDoubleVariance-testDoubleVariance.$(OBJEXT) testDoubleVariance_OBJECTS = $(am_testDoubleVariance_OBJECTS) -testDoubleVariance_DEPENDENCIES = $(check_LDADD) +am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ + $(top_builddir)/type/libFloatComplex.la \ + $(top_builddir)/operations/addition/libAddition.la \ + $(top_builddir)/operations/subtraction/libSubtraction.la \ + $(top_builddir)/lib/lapack/libscilapack.la \ + $(top_builddir)/statisticsFunctions/variance/libVariance.la \ + $(top_builddir)/statisticsFunctions/sum/libSum.la \ + $(top_builddir)/statisticsFunctions/mean/libMean.la \ + $(top_builddir)/elementaryFunctions/pow/libPow.la \ + $(top_builddir)/elementaryFunctions/log/libLog.la \ + $(top_builddir)/elementaryFunctions/exp/libExp.la \ + $(top_builddir)/elementaryFunctions/cos/libCos.la \ + $(top_builddir)/elementaryFunctions/sin/libSin.la \ + $(top_builddir)/elementaryFunctions/cosh/libCosh.la \ + $(top_builddir)/elementaryFunctions/sinh/libSinh.la \ + $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/elementaryFunctions/log1p/libLog1p.la \ + $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ + $(top_builddir)/operations/division/libDivision.la +testDoubleVariance_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleVariance_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(testDoubleVariance_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -80,7 +103,7 @@ testDoubleVariance_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ am_testFloatVariance_OBJECTS = \ testFloatVariance-testFloatVariance.$(OBJEXT) testFloatVariance_OBJECTS = $(am_testFloatVariance_OBJECTS) -testFloatVariance_DEPENDENCIES = $(check_LDADD) +testFloatVariance_DEPENDENCIES = $(am__DEPENDENCIES_1) testFloatVariance_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(testFloatVariance_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ @@ -267,7 +290,10 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la + $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ + $(top_builddir)/operations/division/libDivision.la \ + @LIBMATH@ # @@ -770,7 +796,6 @@ uninstall-am: uninstall-pkglibLTLIBRARIES mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-pkglibLTLIBRARIES - @LIBMATH@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/statisticsFunctions/variance/cvariancea.c b/src/statisticsFunctions/variance/cvariancea.c index bff8c91f..065b58ae 100644 --- a/src/statisticsFunctions/variance/cvariancea.c +++ b/src/statisticsFunctions/variance/cvariancea.c @@ -38,12 +38,12 @@ floatComplex cvariancea(floatComplex *in, int size) if ( fabs ( creals ( sumc)) > 1e-08 || fabs ( cimags ( sumc)) > 1e-08 ) { variance = cpows ( sumc ,FloatComplex (2.0f , 0)) ; - variance = cdevides ( variance , FloatComplex ((float) size , 0 ) ) ; + variance = cdivides ( variance , FloatComplex ((float) size , 0 ) ) ; variance = cdiffs ( sum , variance ); - variance = cdevides (variance , FloatComplex ((float) (size - 1),0 )); + variance = cdivides (variance , FloatComplex ((float) (size - 1),0 )); } else - variance = cdevides (sum , FloatComplex ((float) (size - 1),0 )); + variance = cdivides (sum , FloatComplex ((float) (size - 1),0 )); return variance ; } diff --git a/src/statisticsFunctions/variance/zvariancea.c b/src/statisticsFunctions/variance/zvariancea.c index 57d4bcf8..add08df5 100644 --- a/src/statisticsFunctions/variance/zvariancea.c +++ b/src/statisticsFunctions/variance/zvariancea.c @@ -38,12 +38,12 @@ doubleComplex zvariancea(doubleComplex *in, int size) if ( fabs ( zreals ( sumc)) > 1e-16 || fabs ( zimags ( sumc)) > 1e-16 ) { variance = zpows ( sumc ,DoubleComplex (2 , 0)) ; - variance = zdevides ( variance , DoubleComplex ( size , 0 ) ) ; + variance = zdivides ( variance , DoubleComplex ( size , 0 ) ) ; variance = zdiffs ( sum , variance ); - variance = zdevides (variance , DoubleComplex ( (size - 1),0 )); + variance = zdivides (variance , DoubleComplex ( (size - 1),0 )); } else - variance = zdevides (sum , DoubleComplex ( (size - 1),0 )); + variance = zdivides (sum , DoubleComplex ( (size - 1),0 )); return variance ; } diff --git a/src/type/doubleComplex.c b/src/type/doubleComplex.c index 6ef9deeb..710a13f9 100644 --- a/src/type/doubleComplex.c +++ b/src/type/doubleComplex.c @@ -133,38 +133,4 @@ bool zisimags(doubleComplex z) { return false; } -/* -** Operators -** { -*/ - -/* -** \function ztimess -** \brief Multiply 2 Complex numbers. -*/ -doubleComplex ztimess(doubleComplex z1, doubleComplex z2) { -#ifndef STDC99 - return DoubleComplex(z1.real*z2.real - z1.imag*z2.imag, - z1.real*z2.imag + z2.real*z1.imag); -#else - return z1 * z2; -#endif -} -/* -** \function zdivides -** \brief Divide 2 Complex numbers. -*/ -doubleComplex zdevides(doubleComplex z1, doubleComplex z2) { -#ifndef STDC99 - return DoubleComplex((z1.real*z2.real + z1.imag*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag), - (z1.imag*z2.real - z1.real*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag)); -#else - return z1 / z2; -#endif -} - - -/* -** } -*/ diff --git a/src/type/doubleComplex.h b/src/type/doubleComplex.h index ce491b90..51cede5d 100644 --- a/src/type/doubleComplex.h +++ b/src/type/doubleComplex.h @@ -64,6 +64,4 @@ doubleComplex* DoubleComplexMatrix(double*, double*, int); bool zisreals(doubleComplex); bool zisimags(doubleComplex); -doubleComplex ztimess(doubleComplex, doubleComplex); -doubleComplex zdevides(doubleComplex, doubleComplex); #endif /* !__DOUBLECOMPLEX_H__ */ diff --git a/src/type/floatComplex.c b/src/type/floatComplex.c index 09ae0159..d160e2d3 100644 --- a/src/type/floatComplex.c +++ b/src/type/floatComplex.c @@ -135,39 +135,4 @@ bool cisimags(floatComplex z) { return false; } -/* -** Operators -** { -*/ - -/* -** \function ctimess -** \brief Multiply 2 Complex numbers. -*/ -floatComplex ctimess(floatComplex z1, floatComplex z2) { -#ifndef STDC99 - return FloatComplex(z1.real*z2.real - z1.imag*z2.imag, - z1.real*z2.imag + z2.real*z1.imag); -#else - return z1 * z2; -#endif -} - -/* -** \function cdivides -** \brief Divide 2 Complex numbers. -*/ -floatComplex cdevides(floatComplex z1, floatComplex z2) { -#ifndef STDC99 - return FloatComplex((z1.real*z2.real + z1.imag*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag), - (z1.imag*z2.real - z1.real*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag)); -#else - return z1 / z2; -#endif -} - - -/* -** } -*/ diff --git a/src/type/floatComplex.h b/src/type/floatComplex.h index 47a77899..a4e4f658 100644 --- a/src/type/floatComplex.h +++ b/src/type/floatComplex.h @@ -64,7 +64,4 @@ floatComplex* FloatComplexMatrix(float*, float*, int); bool cisreals(floatComplex); bool cisimags(floatComplex); -floatComplex ctimess(floatComplex, floatComplex); -floatComplex cdevides(floatComplex, floatComplex); - #endif /* !__FLOATCOMPLEX_H__ */ |