addition and subtraction are now in operations module

9 files changed, 64 insertions, 39 deletions

diff --git a/src/statisticsFunctions/includes/mean.h b/src/statisticsFunctions/includes/mean.h
index ae5cc46a..c07cad58 100644
--- a/src/statisticsFunctions/includes/mean.h
+++ b/src/statisticsFunctions/includes/mean.h
@@ -15,6 +15,7 @@
 
 #include "floatComplex.h"
 #include "doubleComplex.h"
+#include "addition.h"
 
 /*
 ** \brief Mean of a scalar element, just returns it
diff --git a/src/statisticsFunctions/includes/sum.h b/src/statisticsFunctions/includes/sum.h
index 55158b93..8df782cc 100644
--- a/src/statisticsFunctions/includes/sum.h
+++ b/src/statisticsFunctions/includes/sum.h
@@ -15,6 +15,7 @@
 
 #include "floatComplex.h"
 #include "doubleComplex.h"
+#include "addition.h"
 
 /*
 ** \brief Sum of a scalar element, just returns it
diff --git a/src/statisticsFunctions/includes/variance.h b/src/statisticsFunctions/includes/variance.h
index 4631da52..6ed0b36f 100644
--- a/src/statisticsFunctions/includes/variance.h
+++ b/src/statisticsFunctions/includes/variance.h
@@ -13,6 +13,8 @@
 #ifndef __VARIANCE_H__
 #define __VARIANCE_H__
 
+#include "subtraction.h"
+
 #include "pow.h"
 #include "sum.h"
 
diff --git a/src/statisticsFunctions/mean/Makefile.am b/src/statisticsFunctions/mean/Makefile.am
index 695ababa..b9a9eb5c 100644
--- a/src/statisticsFunctions/mean/Makefile.am
+++ b/src/statisticsFunctions/mean/Makefile.am
@@ -11,6 +11,7 @@
 ##
 
 libMean_la_CFLAGS =	-I $(top_builddir)/type \
+			-I $(top_builddir)/operations/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -39,10 +40,12 @@ HEAD	=	../includes/mean.h
 ####
 
 check_INCLUDES	=	-I $(top_builddir)/statisticsFunctions/includes \
+			-I $(top_builddir)/operations/includes \
 			-I $(top_builddir)/type
 
 check_LDADD	=	$(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 \
 			@LIBMATH@
diff --git a/src/statisticsFunctions/mean/Makefile.in b/src/statisticsFunctions/mean/Makefile.in
index 19a30094..fe75fe8a 100644
--- a/src/statisticsFunctions/mean/Makefile.in
+++ b/src/statisticsFunctions/mean/Makefile.in
@@ -69,6 +69,7 @@ am_testDoubleMean_OBJECTS = testDoubleMean-testDoubleMean.$(OBJEXT)
 testDoubleMean_OBJECTS = $(am_testDoubleMean_OBJECTS)
 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
 testDoubleMean_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -211,6 +212,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libMean_la_CFLAGS = -I $(top_builddir)/type \
+			-I $(top_builddir)/operations/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -235,10 +237,12 @@ HEAD = ../includes/mean.h
 # Checking Part
 ####
 check_INCLUDES = -I $(top_builddir)/statisticsFunctions/includes \
+			-I $(top_builddir)/operations/includes \
 			-I $(top_builddir)/type
 
 check_LDADD = $(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 \
 			@LIBMATH@
diff --git a/src/statisticsFunctions/sum/Makefile.am b/src/statisticsFunctions/sum/Makefile.am
index f97f4579..a0f039d3 100644
--- a/src/statisticsFunctions/sum/Makefile.am
+++ b/src/statisticsFunctions/sum/Makefile.am
@@ -11,6 +11,7 @@
 ##
 
 libSum_la_CFLAGS =	-I $(top_builddir)/type \
+			-I $(top_builddir)/operations/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -39,10 +40,12 @@ HEAD	=	../includes/sum.h
 ####
 
 check_INCLUDES	=	-I $(top_builddir)/statisticsFunctions/includes \
+			-I $(top_builddir)/operations/includes \
 			-I $(top_builddir)/type
 
 check_LDADD	=	$(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/addition/libAddition.la \
 			$(top_builddir)/statisticsFunctions/sum/libSum.la \
 			@LIBMATH@
 
diff --git a/src/statisticsFunctions/sum/Makefile.in b/src/statisticsFunctions/sum/Makefile.in
index 94bafc5d..071d90e6 100644
--- a/src/statisticsFunctions/sum/Makefile.in
+++ b/src/statisticsFunctions/sum/Makefile.in
@@ -69,6 +69,7 @@ am_testDoubleSum_OBJECTS = testDoubleSum-testDoubleSum.$(OBJEXT)
 testDoubleSum_OBJECTS = $(am_testDoubleSum_OBJECTS)
 am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \
 	$(top_builddir)/type/libFloatComplex.la \
+	$(top_builddir)/operations/addition/libAddition.la \
 	$(top_builddir)/statisticsFunctions/sum/libSum.la
 testDoubleSum_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleSum_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -210,6 +211,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libSum_la_CFLAGS = -I $(top_builddir)/type \
+			-I $(top_builddir)/operations/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -234,10 +236,12 @@ HEAD = ../includes/sum.h
 # Checking Part
 ####
 check_INCLUDES = -I $(top_builddir)/statisticsFunctions/includes \
+			-I $(top_builddir)/operations/includes \
 			-I $(top_builddir)/type
 
 check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/addition/libAddition.la \
 			$(top_builddir)/statisticsFunctions/sum/libSum.la \
 			@LIBMATH@
 
diff --git a/src/statisticsFunctions/variance/Makefile.am b/src/statisticsFunctions/variance/Makefile.am
index c0bfbd96..63c18c0c 100644
--- a/src/statisticsFunctions/variance/Makefile.am
+++ b/src/statisticsFunctions/variance/Makefile.am
@@ -11,10 +11,10 @@
 ##
 
 libVariance_la_CFLAGS =	-I $(top_builddir)/type \
-            -I $(top_builddir)/elementaryFunctions/includes \
-            -I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/elementaryFunctions/includes \
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes \
 			-I ../includes
-            
 
 instdir = $(top_builddir)/lib
 
@@ -25,7 +25,7 @@ libVariance_la_SOURCES =	$(HEAD) $(SRC)
 SRC	=	svariancea.c \
 		scolumnvariancea.c \
 		dvariancea.c \
-        srowvariancea.c \
+		srowvariancea.c \
 		drowvariancea.c \
 		dcolumnvariancea.c \
 		cvariancea.c \
@@ -42,29 +42,32 @@ HEAD	=	../includes/variance.h
 ####
 
 check_INCLUDES	=	-I $(top_builddir)/statisticsFunctions/includes \
-            -I $(top_builddir)/elementaryFunctions/includes \
-            -I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/elementaryFunctions/includes \
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes \
 			-I $(top_builddir)/type
 
 check_LDADD	=	$(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)/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
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatVariance testDoubleVariance
diff --git a/src/statisticsFunctions/variance/Makefile.in b/src/statisticsFunctions/variance/Makefile.in
index 394f4d3e..6dd00c9d 100644
--- a/src/statisticsFunctions/variance/Makefile.in
+++ b/src/statisticsFunctions/variance/Makefile.in
@@ -215,8 +215,9 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libVariance_la_CFLAGS = -I $(top_builddir)/type \
-            -I $(top_builddir)/elementaryFunctions/includes \
-            -I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/elementaryFunctions/includes \
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -225,7 +226,7 @@ libVariance_la_SOURCES = $(HEAD) $(SRC)
 SRC = svariancea.c \
 		scolumnvariancea.c \
 		dvariancea.c \
-        srowvariancea.c \
+		srowvariancea.c \
 		drowvariancea.c \
 		dcolumnvariancea.c \
 		cvariancea.c \
@@ -241,29 +242,32 @@ HEAD = ../includes/variance.h
 # Checking Part
 ####
 check_INCLUDES = -I $(top_builddir)/statisticsFunctions/includes \
-            -I $(top_builddir)/elementaryFunctions/includes \
-            -I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/elementaryFunctions/includes \
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes \
 			-I $(top_builddir)/type
 
 check_LDADD = $(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)/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
 
 
 #