summaryrefslogtreecommitdiff
path: root/src/statisticsFunctions/variance
diff options
context:
space:
mode:
Diffstat (limited to 'src/statisticsFunctions/variance')
-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
4 files changed, 38 insertions, 11 deletions
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 ;
}