From 8300ec0083309b189f41594c0311a3eaafc403ad Mon Sep 17 00:00:00 2001 From: jofret Date: Fri, 20 Jun 2008 06:53:21 +0000 Subject: - Enable ROW concatenation - Enable COLUMN concatenation - Add cat to compilation process --- src/matrixOperations/includes/cat.h | 95 +++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 src/matrixOperations/includes/cat.h (limited to 'src/matrixOperations/includes/cat.h') diff --git a/src/matrixOperations/includes/cat.h b/src/matrixOperations/includes/cat.h new file mode 100644 index 00000000..a28f004c --- /dev/null +++ b/src/matrixOperations/includes/cat.h @@ -0,0 +1,95 @@ +/* + * 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 + * + */ + +#ifndef __CAT_H__ +#define __CAT_H__ + +#include "floatComplex.h" +#include "doubleComplex.h" + +/* +** \brief concat 2 floats scalars +*/ +void srowcats(float in1, float in2, float *out); +void scolumncats(float in1, float in2, float *out); + +/* +** \brief concat 2 double scalars +*/ +void drowcats(double in1, double in2, double *out); +void dcolumncats(double in1, double in2, double *out); + +/* +** \brief concat 2 floats complex scalars +*/ +void crowcats(floatComplex in1, floatComplex in2, floatComplex *out); +void ccolumncats(floatComplex in1, floatComplex in2, floatComplex *out); + +/* +** \brief concat 2 double complex scalars +*/ +void zrowcats(doubleComplex in1, doubleComplex in2, doubleComplex *out); +void zcolumncats(doubleComplex in1, doubleComplex in2, doubleComplex *out); + +/* +** \brief Concat float arrays +** \param in1 the float array to process +** \param lines1 +** \param columns1 +** \param in2 the float array to process to concat +** \param lines2 +** \param columns2 +** \param out the concatenation +*/ +void srowcata(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float* out); +void scolumncata(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float* out); + +/* +** \brief Concat double arrays +** \param in1 the double array to process +** \param lines1 +** \param columns1 +** \param in2 the double array to process to concat +** \param lines2 +** \param columns2 +** \param out the concatenation +*/ +void drowcata(double *in1, int lines1, int columns1, double *in2, int lines2, int columns2, double* out); +void dcolumncata(double *in1, int lines1, int columns1, double *in2, int lines2, int columns2, double* out); + +/* +** \brief Concat Complex float arrays +** \param in1 the Complex float array to process +** \param lines1 +** \param columns1 +** \param in2 the Complex float array to process to concat +** \param lines2 +** \param columns2 +** \param out the concatenation +*/ +void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, int lines2, int columns2, floatComplex* out); +void ccolumncata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, int lines2, int columns2, floatComplex* out); + +/* +** \brief Concat Complex double arrays +** \param in1 the Complex double array to process +** \param lines1 +** \param columns1 +** \param in2 the Complex double array to process to concat +** \param lines2 +** \param columns2 +** \param out the concatenation +*/ +void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out); +void zcolumncata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out); + +#endif /* !__CAT_H__ */ -- cgit