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/cat/ccata.c | 54 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 src/matrixOperations/cat/ccata.c
(limited to 'src/matrixOperations/cat/ccata.c')
diff --git a/src/matrixOperations/cat/ccata.c b/src/matrixOperations/cat/ccata.c
new file mode 100644
index 00000000..d47fb613
--- /dev/null
+++ b/src/matrixOperations/cat/ccata.c
@@ -0,0 +1,54 @@
+/*
+ * 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 "cat.h"
+/*
+** Emulate Scilab (from help cat) :
+** then the concatenation is done according to the rows
+**
+** A1=[1 2 3 ; 4 5 6]; A2=[7 8 9 ; 10 11 12]; y=cat(1,A1,A2) => y=[1 2 3 ; 4 5 61 ;7 8 9; 10 11 12]
+**
+*/
+
+void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, int lines2, int columns2, floatComplex* out) {
+ int i = 0;
+ int j = 0;
+ for (i = 0 ; i < columns1 && i < columns2 ; ++i)
+ {
+ for (j = 0 ; j < lines1 ; ++j)
+ {
+ out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];
+ }
+ for (j = 0 ; j < lines1 ; ++j)
+ {
+ out[i*(lines1 + lines2) + lines1 + j] = in2[i*lines2 + j];
+ }
+ }
+}
+
+
+/*
+** Emulate Scilab (from help cat) :
+** the concatenation is done according to the columns
+**
+** A1=[1 2 3;4 5 6]; A2=[7 8 9 ;10 11 12]; y=cat(2,A1,A2) => y=[1 2 3 7 8 9 ; 4 5 6 10 11 12]
+**
+*/
+void ccolumncata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, int lines2, int columns2, floatComplex* out) {
+ int i = 0;
+ for (i = 0 ; i < lines1 * columns1 ; ++i) {
+ out[i] = in1[i];
+ }
+ for (i = 0; i < lines2 * columns2 ; ++i) {
+ out[i + lines1 * columns1] = in2[i];
+ }
+}
--
cgit