Split Addition

6 files changed, 141 insertions, 70 deletions

diff --git a/src/matrixOperations/addition/Makefile.am b/src/matrixOperations/addition/Makefile.am
index bc2b0db8..ebef1b1c 100644
--- a/src/matrixOperations/addition/Makefile.am
+++ b/src/matrixOperations/addition/Makefile.am
@@ -17,7 +17,10 @@ instdir = $(top_builddir)/lib
 
 pkglib_LTLIBRARIES = libMatrixAddition.la
 
-libMatrixAddition_la_SOURCES = matrixAddition.c
+libMatrixAddition_la_SOURCES = 	saddma.c \
+				daddma.c \
+				caddma.c \
+				zaddma.c
 
 check_PROGRAMS = 	testMatrixAddition
 
diff --git a/src/matrixOperations/addition/Makefile.in b/src/matrixOperations/addition/Makefile.in
index a972524b..c1787e3d 100644
--- a/src/matrixOperations/addition/Makefile.in
+++ b/src/matrixOperations/addition/Makefile.in
@@ -53,8 +53,9 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libMatrixAddition_la_LIBADD =
-am_libMatrixAddition_la_OBJECTS =  \
-	libMatrixAddition_la-matrixAddition.lo
+am_libMatrixAddition_la_OBJECTS = libMatrixAddition_la-saddma.lo \
+	libMatrixAddition_la-daddma.lo libMatrixAddition_la-caddma.lo \
+	libMatrixAddition_la-zaddma.lo
 libMatrixAddition_la_OBJECTS = $(am_libMatrixAddition_la_OBJECTS)
 libMatrixAddition_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -202,7 +203,11 @@ libMatrixAddition_la_CFLAGS = -I $(top_builddir)/type \
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixAddition.la
-libMatrixAddition_la_SOURCES = matrixAddition.c
+libMatrixAddition_la_SOURCES = saddma.c \
+				daddma.c \
+				caddma.c \
+				zaddma.c
+
 check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
 			libMatrixAddition.la
@@ -292,7 +297,10 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-matrixAddition.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-caddma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-daddma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-saddma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-zaddma.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMatrixAddition-testMatrixAddition.Po@am__quote@
 
 .c.o:
@@ -316,12 +324,33 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-libMatrixAddition_la-matrixAddition.lo: matrixAddition.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-matrixAddition.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-matrixAddition.Tpo -c -o libMatrixAddition_la-matrixAddition.lo `test -f 'matrixAddition.c' || echo '$(srcdir)/'`matrixAddition.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libMatrixAddition_la-matrixAddition.Tpo $(DEPDIR)/libMatrixAddition_la-matrixAddition.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='matrixAddition.c' object='libMatrixAddition_la-matrixAddition.lo' libtool=yes @AMDEPBACKSLASH@
+libMatrixAddition_la-saddma.lo: saddma.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-saddma.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-saddma.Tpo -c -o libMatrixAddition_la-saddma.lo `test -f 'saddma.c' || echo '$(srcdir)/'`saddma.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libMatrixAddition_la-saddma.Tpo $(DEPDIR)/libMatrixAddition_la-saddma.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='saddma.c' object='libMatrixAddition_la-saddma.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) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-saddma.lo `test -f 'saddma.c' || echo '$(srcdir)/'`saddma.c
+
+libMatrixAddition_la-daddma.lo: daddma.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-daddma.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-daddma.Tpo -c -o libMatrixAddition_la-daddma.lo `test -f 'daddma.c' || echo '$(srcdir)/'`daddma.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libMatrixAddition_la-daddma.Tpo $(DEPDIR)/libMatrixAddition_la-daddma.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='daddma.c' object='libMatrixAddition_la-daddma.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) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-daddma.lo `test -f 'daddma.c' || echo '$(srcdir)/'`daddma.c
+
+libMatrixAddition_la-caddma.lo: caddma.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-caddma.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-caddma.Tpo -c -o libMatrixAddition_la-caddma.lo `test -f 'caddma.c' || echo '$(srcdir)/'`caddma.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libMatrixAddition_la-caddma.Tpo $(DEPDIR)/libMatrixAddition_la-caddma.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='caddma.c' object='libMatrixAddition_la-caddma.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) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-caddma.lo `test -f 'caddma.c' || echo '$(srcdir)/'`caddma.c
+
+libMatrixAddition_la-zaddma.lo: zaddma.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-zaddma.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-zaddma.Tpo -c -o libMatrixAddition_la-zaddma.lo `test -f 'zaddma.c' || echo '$(srcdir)/'`zaddma.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libMatrixAddition_la-zaddma.Tpo $(DEPDIR)/libMatrixAddition_la-zaddma.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zaddma.c' object='libMatrixAddition_la-zaddma.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) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-matrixAddition.lo `test -f 'matrixAddition.c' || echo '$(srcdir)/'`matrixAddition.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-zaddma.lo `test -f 'zaddma.c' || echo '$(srcdir)/'`zaddma.c
 
 testMatrixAddition-testMatrixAddition.o: testMatrixAddition.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixAddition_CFLAGS) $(CFLAGS) -MT testMatrixAddition-testMatrixAddition.o -MD -MP -MF $(DEPDIR)/testMatrixAddition-testMatrixAddition.Tpo -c -o testMatrixAddition-testMatrixAddition.o `test -f 'testMatrixAddition.c' || echo '$(srcdir)/'`testMatrixAddition.c
diff --git a/src/matrixOperations/addition/caddma.c b/src/matrixOperations/addition/caddma.c
new file mode 100644
index 00000000..74311c68
--- /dev/null
+++ b/src/matrixOperations/addition/caddma.c
@@ -0,0 +1,33 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "matrixAddition.h"
+
+/*
+** \brief Compute an addition element ways for complex single precision.
+** \param in1 : input array.
+** \param size1 : size of in1 array.
+** \param in2 : input arry.
+** \param size2 : size of in2 array.
+** \param out : array that contains the addition in1 + in2.
+*/
+void	caddma(floatComplex *in1, int size1,
+	       floatComplex *in2, int size2,
+	       floatComplex *out)
+{
+  int i = 0;
+
+  for(i = 0 ; i < size1 && i < size2 ; ++i)
+    {
+      out[i] = cadds(in1[i], in2[i]);
+    }
+}
diff --git a/src/matrixOperations/addition/daddma.c b/src/matrixOperations/addition/daddma.c
new file mode 100644
index 00000000..868a4988
--- /dev/null
+++ b/src/matrixOperations/addition/daddma.c
@@ -0,0 +1,33 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "matrixAddition.h"
+
+/*
+** \brief Compute an addition element ways for double.
+** \param in1 : input array.
+** \param size1 : size of in1 array.
+** \param in2 : input arry.
+** \param size2 : size of in2 array.
+** \param out : array that contains the addition in1 + in2.
+*/
+void	daddma(double *in1, int size1,
+	       double *in2, int size2,
+	       double * out)
+{
+  int i = 0;
+
+  for(i = 0 ; i < size1 && i < size2 ; ++i)
+    {
+      out[i] = in1[i] + in2[i];
+    }
+}
diff --git a/src/matrixOperations/addition/saddma.c b/src/matrixOperations/addition/saddma.c
index f725424a..15a4f342 100644
--- a/src/matrixOperations/addition/saddma.c
+++ b/src/matrixOperations/addition/saddma.c
@@ -31,63 +31,3 @@ void	saddma(float *in1, int size1,
       out[i] = in1[i] + in2[i];
     }
 }
-
-/*
-** \brief Compute an addition element ways for double.
-** \param in1 : input array.
-** \param size1 : size of in1 array.
-** \param in2 : input arry.
-** \param size2 : size of in2 array.
-** \param out : array that contains the addition in1 + in2.
-*/
-void	daddma(double *in1, int size1,
-	       double *in2, int size2,
-	       double * out)
-{
-  int i = 0;
-
-  for(i = 0 ; i < size1 && i < size2 ; ++i)
-    {
-      out[i] = in1[i] + in2[i];
-    }
-}
-
-/*
-** \brief Compute an addition element ways for complex single precision.
-** \param in1 : input array.
-** \param size1 : size of in1 array.
-** \param in2 : input arry.
-** \param size2 : size of in2 array.
-** \param out : array that contains the addition in1 + in2.
-*/
-void	caddma(floatComplex *in1, int size1,
-	       floatComplex *in2, int size2,
-	       floatComplex *out)
-{
-  int i = 0;
-
-  for(i = 0 ; i < size1 && i < size2 ; ++i)
-    {
-      out[i] = cadds(in1[i], in2[i]);
-    }
-}
-
-/*
-** \brief Compute an addition element ways for complex double precision.
-** \param in1 : input array.
-** \param size1 : size of in1 array.
-** \param in2 : input arry.
-** \param size2 : size of in2 array.
-** \param out : array that contains the addition in1 + in2.
-*/
-void	zaddma(doubleComplex *in1, int size1,
-	       doubleComplex *in2, int size2,
-	       doubleComplex *out)
-{
-  int i = 0;
-
-  for(i = 0 ; i < size1 && i < size2 ; ++i)
-    {
-      out[i] = zadds(in1[i], in2[i]);
-    }
-}
diff --git a/src/matrixOperations/addition/zaddma.c b/src/matrixOperations/addition/zaddma.c
new file mode 100644
index 00000000..65efa959
--- /dev/null
+++ b/src/matrixOperations/addition/zaddma.c
@@ -0,0 +1,33 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "matrixAddition.h"
+
+/*
+** \brief Compute an addition element ways for complex double precision.
+** \param in1 : input array.
+** \param size1 : size of in1 array.
+** \param in2 : input arry.
+** \param size2 : size of in2 array.
+** \param out : array that contains the addition in1 + in2.
+*/
+void	zaddma(doubleComplex *in1, int size1,
+	       doubleComplex *in2, int size2,
+	       doubleComplex *out)
+{
+  int i = 0;
+
+  for(i = 0 ; i < size1 && i < size2 ; ++i)
+    {
+      out[i] = zadds(in1[i], in2[i]);
+    }
+}