diff options
author | jofret | 2009-04-28 06:55:15 +0000 |
---|---|---|
committer | jofret | 2009-04-28 06:55:15 +0000 |
commit | 89ce1d449dde70966962946e197c576cf350dc31 (patch) | |
tree | 913252b78bddfb80d8a7a98db0592950372f91d0 /src/matrixOperations/cat/scata.c | |
parent | 49ad35ec2d8a12428a1613e2a955ddae4195e216 (diff) | |
download | scilab2c-89ce1d449dde70966962946e197c576cf350dc31.tar.gz scilab2c-89ce1d449dde70966962946e197c576cf350dc31.tar.bz2 scilab2c-89ce1d449dde70966962946e197c576cf350dc31.zip |
Moving source code
Diffstat (limited to 'src/matrixOperations/cat/scata.c')
-rw-r--r-- | src/matrixOperations/cat/scata.c | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/src/matrixOperations/cat/scata.c b/src/matrixOperations/cat/scata.c deleted file mode 100644 index da0853c6..00000000 --- a/src/matrixOperations/cat/scata.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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" -#include "stdio.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 6 ;7 8 9; 10 11 12] -** -*/ - -void srowcata(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float* 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 < lines2 ; ++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 scolumncata(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float* 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]; - } -} |