summaryrefslogtreecommitdiff
path: root/src/statisticsFunctions
diff options
context:
space:
mode:
Diffstat (limited to 'src/statisticsFunctions')
-rw-r--r--src/statisticsFunctions/includes/mean.h3
-rw-r--r--src/statisticsFunctions/includes/variance.h4
-rw-r--r--src/statisticsFunctions/mean/Makefile.am3
-rw-r--r--src/statisticsFunctions/mean/Makefile.in4
-rw-r--r--src/statisticsFunctions/mean/ccolumnmeana.c2
-rw-r--r--src/statisticsFunctions/mean/crowmeana.c2
-rw-r--r--src/statisticsFunctions/mean/zcolumnmeana.c2
-rw-r--r--src/statisticsFunctions/mean/zrowmeana.c2
-rw-r--r--src/statisticsFunctions/variance/Makefile.am4
-rw-r--r--src/statisticsFunctions/variance/Makefile.in33
-rw-r--r--src/statisticsFunctions/variance/cvariancea.c6
-rw-r--r--src/statisticsFunctions/variance/zvariancea.c6
12 files changed, 50 insertions, 21 deletions
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 ;
}
generated by cgit (git 2.34.1) at 2025-03-26 03:19:13 +0000