diff options
| author | siddhu8990 | 2015-11-28 11:55:38 +0530 |
|---|---|---|
| committer | siddhu8990 | 2015-11-28 11:55:38 +0530 |
| commit | c41590dccb81670c8a81d94af47befaa72ee9928 (patch) | |
| tree | 03b87b91e199cd364ad7b354d754a3eb63f5c636 /2.3-1 | |
| parent | 3eeb9f450ed9360a4d84e64fa8bee9be2fafb5c7 (diff) | |
| download | Scilab2C-c41590dccb81670c8a81d94af47befaa72ee9928.tar.gz Scilab2C-c41590dccb81670c8a81d94af47befaa72ee9928.tar.bz2 Scilab2C-c41590dccb81670c8a81d94af47befaa72ee9928.zip | |
Merged 'master' with Mushir's work'
Diffstat (limited to '2.3-1')
103 files changed, 0 insertions, 2144 deletions
diff --git a/2.3-1/macros/CCodeGeneration/.fuse_hidden00001d2200000003 b/2.3-1/macros/CCodeGeneration/.fuse_hidden00001d2200000003 Binary files differdeleted file mode 100644 index 02f578ec..00000000 --- a/2.3-1/macros/CCodeGeneration/.fuse_hidden00001d2200000003 +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin Binary files differindex 40a8771d..f306cc14 100644 --- a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin +++ b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin Binary files differindex 98734690..57bbf43d 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin diff --git a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin Binary files differindex 72c7943e..1bc38769 100644 --- a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin +++ b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin diff --git a/2.3-1/macros/CCodeGeneration/C_Type.bin b/2.3-1/macros/CCodeGeneration/C_Type.bin Binary files differindex c2ff6e65..83996bb0 100644 --- a/2.3-1/macros/CCodeGeneration/C_Type.bin +++ b/2.3-1/macros/CCodeGeneration/C_Type.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin Binary files differindex 14dfb49c..2d6fb62f 100644 --- a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin +++ b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin Binary files differindex f80837e1..62ea01a9 100644 --- a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin +++ b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin Binary files differindex db8c34ba..ab778fa3 100644 --- a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin +++ b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin Binary files differindex f6059c98..5752c049 100644 --- a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin +++ b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin Binary files differindex 42b16627..577d0d6e 100644 --- a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin +++ b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin Binary files differindex fbbb6414..3e87dfb4 100644 --- a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin +++ b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin Binary files differindex 0740d242..84268c31 100644 --- a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin +++ b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin Binary files differindex b0b849b8..615ca83f 100644 --- a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin +++ b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin Binary files differindex 5aeaa274..37ed1ac1 100644 --- a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin +++ b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin diff --git a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin Binary files differindex 75360d7b..2bddc808 100644 --- a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin +++ b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin diff --git a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin Binary files differindex 3acb88aa..8abfbaf8 100644 --- a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin +++ b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin Binary files differindex 6c4c15f7..9bedf9f5 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.bin +++ b/2.3-1/macros/findDeps/getAllHeaders.bin diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin Binary files differindex ec75338c..3bde73d5 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.bin +++ b/2.3-1/macros/findDeps/getAllInterfaces.bin diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin Binary files differindex 6c3f91f5..9cfa087d 100644 --- a/2.3-1/macros/findDeps/getAllSources.bin +++ b/2.3-1/macros/findDeps/getAllSources.bin diff --git a/2.3-1/macros/findDeps/getArduinoFiles.bin b/2.3-1/macros/findDeps/getArduinoFiles.bin Binary files differindex c762c303..7c698ba1 100644 --- a/2.3-1/macros/findDeps/getArduinoFiles.bin +++ b/2.3-1/macros/findDeps/getArduinoFiles.bin diff --git a/2.3-1/src/c/auxiliaryFunctions/find/i16finda.c~ b/2.3-1/src/c/auxiliaryFunctions/find/i16finda.c~ deleted file mode 100644 index f7bde00d..00000000 --- a/2.3-1/src/c/auxiliaryFunctions/find/i16finda.c~ +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "find.h" - -void i16finda(int16* x, int size, int16 *out, int max) -{ - int i = 0; - int j = 0; - - /* if out is empty */ - out[0]=-1; - - - for (i = 0; i < size ; ++i) - { - /*to avoid useless search if we only want to find the max first founded value */ - if (j == max) - { - return ; - } - - if (x[i] != 0) - { - out[j] = (int16)(i+1); - ++j; - } - } -} - diff --git a/2.3-1/src/c/auxiliaryFunctions/find/i8finda.c~ b/2.3-1/src/c/auxiliaryFunctions/find/i8finda.c~ deleted file mode 100644 index ac223ae2..00000000 --- a/2.3-1/src/c/auxiliaryFunctions/find/i8finda.c~ +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "find.h" - -void dfinda(double* x, int size, double *out, int max) -{ - int i = 0; - int j = 0; - - /* if out is empty */ - out[0]=-1; - - - for (i = 0; i < size ; ++i) - { - /*to avoid useless search if we only want to find the max first founded value */ - if (j == max) - { - return ; - } - - if (x[i] != 0) - { - out[j] = (double)(i+1); - ++j; - } - } -} - diff --git a/2.3-1/src/c/auxiliaryFunctions/find/u16finda.c~ b/2.3-1/src/c/auxiliaryFunctions/find/u16finda.c~ deleted file mode 100644 index 3096d611..00000000 --- a/2.3-1/src/c/auxiliaryFunctions/find/u16finda.c~ +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "find.h" - -void u16finda(uint16* x, int size, uint16 *out, int max) -{ - int i = 0; - int j = 0; - - /* if out is empty */ - out[0]=-1; - - - for (i = 0; i < size ; ++i) - { - /*to avoid useless search if we only want to find the max first founded value */ - if (j == max) - { - return ; - } - - if (x[i] != 0) - { - out[j] = (uint16)(i+1); - ++j; - } - } -} - diff --git a/2.3-1/src/c/auxiliaryFunctions/find/u8finda.c~ b/2.3-1/src/c/auxiliaryFunctions/find/u8finda.c~ deleted file mode 100644 index d571c7c3..00000000 --- a/2.3-1/src/c/auxiliaryFunctions/find/u8finda.c~ +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "find.h" - -void u8finda(uint8* x, int size, uint8 *out, int max) -{ - int i = 0; - int j = 0; - - /* if out is empty */ - out[0]=-1; - - - for (i = 0; i < size ; ++i) - { - /*to avoid useless search if we only want to find the max first founded value */ - if (j == max) - { - return ; - } - - if (x[i] != 0) - { - out[j] = (uint8)(i+1); - ++j; - } - } -} - diff --git a/2.3-1/src/c/elementaryFunctions/pow/dpows.c~ b/2.3-1/src/c/elementaryFunctions/pow/dpows.c~ deleted file mode 100644 index cce89196..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/dpows.c~ +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 <math.h> -#include "pow.h" - -double dpows(double x, double p) -{ - return pow(x, p); -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/i16powa.c~ b/2.3-1/src/c/elementaryFunctions/pow/i16powa.c~ deleted file mode 100644 index e8e87fd3..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/i16powa.c~ +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 "pow.h" - -void i16powa(int16* x, int size, int16* power, int16 *out) { - /* - Computes Scilab x.^power - Computes power element by element - x and power must have same size - */ - int i = 0; - for (i = 0; i < size; ++i) { - out[i] = i16pows(x[i], power[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/i16pows.c~ b/2.3-1/src/c/elementaryFunctions/pow/i16pows.c~ deleted file mode 100644 index c8068c75..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/i16pows.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 <math.h> -#include "pow.h" - -int16 i16pows(int16 x, int16 p) { - return pow(x, p); -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/i8powa.c~ b/2.3-1/src/c/elementaryFunctions/pow/i8powa.c~ deleted file mode 100644 index e17b666d..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/i8powa.c~ +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 "pow.h" - -void i8powa(int8* x, int size, int8* power, int8 *out) { - /* - Computes Scilab x.^power - Computes power element by element - x and power must have same size - */ - int i = 0; - for (i = 0; i < size; ++i) { - out[i] = i8pows(x[i], power[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/i8pows.c~ b/2.3-1/src/c/elementaryFunctions/pow/i8pows.c~ deleted file mode 100644 index 3566c417..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/i8pows.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 <math.h> -#include "pow.h" - -int8 i8pows(int8 x, int8 p) { - return pow(x, p); -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/u16powa.c~ b/2.3-1/src/c/elementaryFunctions/pow/u16powa.c~ deleted file mode 100644 index 65ba77e7..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/u16powa.c~ +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 "pow.h" - -void u16powa(uint16* x, int size, uint16* power, uint16 *out) { - /* - Computes Scilab x.^power - Computes power element by element - x and power must have same size - */ - int i = 0; - for (i = 0; i < size; ++i) { - out[i] = u16pows(x[i], power[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/u16pows.c~ b/2.3-1/src/c/elementaryFunctions/pow/u16pows.c~ deleted file mode 100644 index 34672b0f..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/u16pows.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 <math.h> -#include "pow.h" - -uint16 u16pows(uint16 x, uint16 p) { - return pow(x, p); -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/u8powa.c~ b/2.3-1/src/c/elementaryFunctions/pow/u8powa.c~ deleted file mode 100644 index b69431c7..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/u8powa.c~ +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 "pow.h" - -void u8powa(uint8* x, int size, uint8* power, uint8 *out) { - /* - Computes Scilab x.^power - Computes power element by element - x and power must have same size - */ - int i = 0; - for (i = 0; i < size; ++i) { - out[i] = u8pows(x[i], power[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/u8pows.c~ b/2.3-1/src/c/elementaryFunctions/pow/u8pows.c~ deleted file mode 100644 index 4b5042ff..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/u8pows.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-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 <math.h> -#include "pow.h" - -uint8 u8pows(uint8 x, uint8 p) { - return pow(x, p); -} diff --git a/2.3-1/src/c/elementaryFunctions/pow/zpows.c~ b/2.3-1/src/c/elementaryFunctions/pow/zpows.c~ deleted file mode 100644 index 1a7059b2..00000000 --- a/2.3-1/src/c/elementaryFunctions/pow/zpows.c~ +++ /dev/null @@ -1,28 +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 "pow.h" -#include "log.h" -#include "exp.h" - -doubleComplex zpows(doubleComplex z, doubleComplex power) { - /*Cas z=0 */ - if ( (zreals(z)==0) && (zimags(z)==0) ){ - /* Cas 0^0 */ - if ( (zreals(power)==0) && (zimags(power)==0) ) return DoubleComplex(1,0); - /* Cas 0^x, x!=0 */ - return DoubleComplex(0,0); - } - - /* Cas z!=0 */ - return zexps(zmuls(zlogs(z), power)); -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/dsqrta.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/dsqrta.c~ deleted file mode 100644 index a948f35b..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/dsqrta.c~ +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "sqrt.h" - -void dsqrta(double* in, int size, double* out) { - int i = 0; - for (i = 0 ; i < size ; ++i) { - out[i] = dsqrts(in[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/dsqrts.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/dsqrts.c~ deleted file mode 100644 index 350cbbd0..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/dsqrts.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 <math.h> -#include "sqrt.h" - -double dsqrts(double in){ - return sqrt(in); -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/i16sqrta.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/i16sqrta.c~ deleted file mode 100644 index 95a67982..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/i16sqrta.c~ +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "sqrt.h" - -void i16sqrta(int16* in, int size, int16* out) { - int i = 0; - for (i = 0 ; i < size ; ++i) { - out[i] = i16sqrts(in[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/i16sqrts.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/i16sqrts.c~ deleted file mode 100644 index 2f286214..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/i16sqrts.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 <math.h> -#include "sqrt.h" - -int16 i16sqrts(int16 in){ - return sqrt(in); -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/i8sqrta.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/i8sqrta.c~ deleted file mode 100644 index b4b40c48..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/i8sqrta.c~ +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "sqrt.h" - -void i8sqrta(int8* in, int size, int8* out) { - int i = 0; - for (i = 0 ; i < size ; ++i) { - out[i] = i8sqrts(in[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/i8sqrts.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/i8sqrts.c~ deleted file mode 100644 index bbd6997e..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/i8sqrts.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 <math.h> -#include "sqrt.h" - -int8 i8sqrts(int8 in){ - return sqrt(in); -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/u16sqrta.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/u16sqrta.c~ deleted file mode 100644 index 2589a67d..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/u16sqrta.c~ +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "sqrt.h" - -void u16sqrta(uint16* in, int size, float* out) { - int i = 0; - for (i = 0 ; i < size ; ++i) { - out[i] = u16sqrts(in[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/u16sqrts.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/u16sqrts.c~ deleted file mode 100644 index 1226025e..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/u16sqrts.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 <math.h> -#include "sqrt.h" - -float u16sqrts(uint16 in){ - return sqrt(in); -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/u8sqrta.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/u8sqrta.c~ deleted file mode 100644 index 03424b99..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/u8sqrta.c~ +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 "sqrt.h" - -void u8sqrta(uint8* in, int size, float* out) { - int i = 0; - for (i = 0 ; i < size ; ++i) { - out[i] = u8sqrts(in[i]); - } -} diff --git a/2.3-1/src/c/elementaryFunctions/sqrt/u8sqrts.c~ b/2.3-1/src/c/elementaryFunctions/sqrt/u8sqrts.c~ deleted file mode 100644 index 29ecc40c..00000000 --- a/2.3-1/src/c/elementaryFunctions/sqrt/u8sqrts.c~ +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-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 <math.h> -#include "sqrt.h" - -float u8sqrts(uint8 in){ - return sqrt(in); -} diff --git a/2.3-1/src/c/matrixOperations/trace/i16tracea.c~ b/2.3-1/src/c/matrixOperations/trace/i16tracea.c~ deleted file mode 100644 index 6a3d6a8b..00000000 --- a/2.3-1/src/c/matrixOperations/trace/i16tracea.c~ +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 "matrixTrace.h" - -int16 i16tracea ( int16* in ,int lines){ - - - int i = 0 ; - //double out = 0 ; - int16 out = 0; - - for ( i = 0 ; i < lines ; ++i) - out += (int16)in[i*lines + i] ; - - return out; -} - - diff --git a/2.3-1/src/c/matrixOperations/trace/i8tracea.c~ b/2.3-1/src/c/matrixOperations/trace/i8tracea.c~ deleted file mode 100644 index 88a1c46e..00000000 --- a/2.3-1/src/c/matrixOperations/trace/i8tracea.c~ +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 "matrixTrace.h" - -int8 i8tracea ( int8* in ,int lines){ - - - int i = 0 ; - //double out = 0 ; - int8 out = 0; - - for ( i = 0 ; i < lines ; ++i) - out += (int8)in[i*lines + i] ; - - return out; -} - - diff --git a/2.3-1/src/c/matrixOperations/trace/u16tracea.c~ b/2.3-1/src/c/matrixOperations/trace/u16tracea.c~ deleted file mode 100644 index 3cf9943c..00000000 --- a/2.3-1/src/c/matrixOperations/trace/u16tracea.c~ +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 "matrixTrace.h" - -uint16 u16tracea ( uint16* in ,int lines){ - - - int i = 0 ; - //double out = 0 ; - uint16 out = 0; - - for ( i = 0 ; i < lines ; ++i) - out += (uint16)in[i*lines + i] ; - - return out; -} - - diff --git a/2.3-1/src/c/matrixOperations/trace/u8tracea.c~ b/2.3-1/src/c/matrixOperations/trace/u8tracea.c~ deleted file mode 100644 index 97e73e21..00000000 --- a/2.3-1/src/c/matrixOperations/trace/u8tracea.c~ +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 "matrixTrace.h" - -uint8 u8tracea ( uint8* in ,int lines){ - - - int i = 0 ; - //double out = 0 ; - uint8 out = 0; - - for ( i = 0 ; i < lines ; ++i) - out += (uint8)in[i*lines + i] ; - - return out; -} - - diff --git a/2.3-1/src/c/matrixOperations/transpose/i16transposea.c~ b/2.3-1/src/c/matrixOperations/transpose/i16transposea.c~ deleted file mode 100644 index 366de067..00000000 --- a/2.3-1/src/c/matrixOperations/transpose/i16transposea.c~ +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 "matrixTranspose.h" - -void i16transposea ( int16* in , int lines , int columns, int16* out ){ - - int i = 0 ; - int j = 0 ; - - for(i = 0 ; i < lines ; i++) - { - for(j = 0 ; j < columns ; j++) - - out[j+i*columns] = (int16)in[i+j*lines]; - } - -} diff --git a/2.3-1/src/c/matrixOperations/transpose/i8transposea.c~ b/2.3-1/src/c/matrixOperations/transpose/i8transposea.c~ deleted file mode 100644 index 20d451a0..00000000 --- a/2.3-1/src/c/matrixOperations/transpose/i8transposea.c~ +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 "matrixTranspose.h" - -void i8transposea ( int8* in , int lines , int columns, int8* out ){ - - int i = 0 ; - int j = 0 ; - - for(i = 0 ; i < lines ; i++) - { - for(j = 0 ; j < columns ; j++) - - out[j+i*columns] = (int8)in[i+j*lines]; - } - -} diff --git a/2.3-1/src/c/matrixOperations/transpose/u16transposea.c~ b/2.3-1/src/c/matrixOperations/transpose/u16transposea.c~ deleted file mode 100644 index 33b35ecb..00000000 --- a/2.3-1/src/c/matrixOperations/transpose/u16transposea.c~ +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 "matrixTranspose.h" - -void u16transposea ( uint16* in , int lines , int columns, uint16* out ){ - - int i = 0 ; - int j = 0 ; - - for(i = 0 ; i < lines ; i++) - { - for(j = 0 ; j < columns ; j++) - - out[j+i*columns] = (uint16)in[i+j*lines]; - } - -} diff --git a/2.3-1/src/c/matrixOperations/transpose/u8transposea.c~ b/2.3-1/src/c/matrixOperations/transpose/u8transposea.c~ deleted file mode 100644 index 2d0dd743..00000000 --- a/2.3-1/src/c/matrixOperations/transpose/u8transposea.c~ +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 "matrixTranspose.h" - -void u8transposea ( uint8* in , int lines , int columns, uint8* out ){ - - int i = 0 ; - int j = 0 ; - - for(i = 0 ; i < lines ; i++) - { - for(j = 0 ; j < columns ; j++) - - out[j+i*columns] = (uint8)in[i+j*lines]; - } - -} diff --git a/2.3-1/src/c/operations/division/cldiva.c~ b/2.3-1/src/c/operations/division/cldiva.c~ deleted file mode 100644 index 73b94f28..00000000 --- a/2.3-1/src/c/operations/division/cldiva.c~ +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void cldiva (floatComplex* in1, floatComplex* in2, int size, floatComplex* out ){ - int i=0; - for (i=0;i<size;i++) - { - out[i]=cldivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/crdiva.c~ b/2.3-1/src/c/operations/division/crdiva.c~ deleted file mode 100644 index ea9781e8..00000000 --- a/2.3-1/src/c/operations/division/crdiva.c~ +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void crdiva (floatComplex* in1, floatComplex* in2, int size, floatComplex* out ){ - int i=0; - for (i=0;i<size;i++) - { - out[i]=crdivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/i16ldiva.c~ b/2.3-1/src/c/operations/division/i16ldiva.c~ deleted file mode 100644 index a89aa69d..00000000 --- a/2.3-1/src/c/operations/division/i16ldiva.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void i16ldiva (int16* in1, int16* in2, int size, int16* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=i16ldivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/i16rdiva.c~ b/2.3-1/src/c/operations/division/i16rdiva.c~ deleted file mode 100644 index ad7672c2..00000000 --- a/2.3-1/src/c/operations/division/i16rdiva.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void i16rdiva (int16* in1, int16* in2, int size, int16* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=i16rdivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/i8ldiva.c~ b/2.3-1/src/c/operations/division/i8ldiva.c~ deleted file mode 100644 index 0f471171..00000000 --- a/2.3-1/src/c/operations/division/i8ldiva.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void i8ldiva (int8* in1, int8* in2, int size, int8* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=i8ldivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/i8rdiva.c~ b/2.3-1/src/c/operations/division/i8rdiva.c~ deleted file mode 100644 index 0e6b217a..00000000 --- a/2.3-1/src/c/operations/division/i8rdiva.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void i8rdiva (int8* in1, int8* in2, int size, int8* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=i8rdivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/u16ldiva.c~ b/2.3-1/src/c/operations/division/u16ldiva.c~ deleted file mode 100644 index 55d3222e..00000000 --- a/2.3-1/src/c/operations/division/u16ldiva.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void u16ldiva (uint16* in1, uint16* in2, int size, uint16* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=u16ldivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/u16rdiva.c~ b/2.3-1/src/c/operations/division/u16rdiva.c~ deleted file mode 100644 index eb21be16..00000000 --- a/2.3-1/src/c/operations/division/u16rdiva.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void u16rdiva (uint16* in1, uint16* in2, int size, uint16* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=u16rdivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/u8ldiva.c~ b/2.3-1/src/c/operations/division/u8ldiva.c~ deleted file mode 100644 index 76e59ad2..00000000 --- a/2.3-1/src/c/operations/division/u8ldiva.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void u8ldiva (uint8* in1, uint8* in2, int size, uint8* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=u8ldivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/u8rdiva .c~ b/2.3-1/src/c/operations/division/u8rdiva .c~ deleted file mode 100644 index d1eb5c4b..00000000 --- a/2.3-1/src/c/operations/division/u8rdiva .c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void u8rdiva (uint8* in1, uint8* in2, int size, uint8* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=u8rdivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/division/u8rdiva.c~ b/2.3-1/src/c/operations/division/u8rdiva.c~ deleted file mode 100644 index d1eb5c4b..00000000 --- a/2.3-1/src/c/operations/division/u8rdiva.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "division.h" - -void u8rdiva (uint8* in1, uint8* in2, int size, uint8* out ){ - int i=0; - for (i=0;i<size;i++){ - out[i]=u8rdivs(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/multiplication/dmula.c~ b/2.3-1/src/c/operations/multiplication/dmula.c~ deleted file mode 100644 index 77c204a7..00000000 --- a/2.3-1/src/c/operations/multiplication/dmula.c~ +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "multiplication.h" - -void dmula(double* in1, double* in2, int size, double* out){ - int i=0; - for (i=0;i<size;i++) - { - out[i]=dmuls(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/multiplication/dmuls.c~ b/2.3-1/src/c/operations/multiplication/dmuls.c~ deleted file mode 100644 index ac21ace0..00000000 --- a/2.3-1/src/c/operations/multiplication/dmuls.c~ +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "multiplication.h" - -double dmuls(double in1, double in2) -{ - return in1*in2; -} diff --git a/2.3-1/src/c/operations/multiplication/i16mula.c~ b/2.3-1/src/c/operations/multiplication/i16mula.c~ deleted file mode 100644 index b16378dd..00000000 --- a/2.3-1/src/c/operations/multiplication/i16mula.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "multiplication.h" - -void i16mula(int16* in1, int16* in2, int size, int16* out){ - int i=0; - for (i=0;i<size;i++){ - out[i]=i16muls(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/multiplication/i8mula.c~ b/2.3-1/src/c/operations/multiplication/i8mula.c~ deleted file mode 100644 index 4d27d628..00000000 --- a/2.3-1/src/c/operations/multiplication/i8mula.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "multiplication.h" - -void i8mula(int8* in1, int8* in2, int size, int8* out){ - int i=0; - for (i=0;i<size;i++){ - out[i]=i8muls(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/multiplication/u16mula.c~ b/2.3-1/src/c/operations/multiplication/u16mula.c~ deleted file mode 100644 index b6563d22..00000000 --- a/2.3-1/src/c/operations/multiplication/u16mula.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "multiplication.h" - -void u16mula(uint16* in1, uint16* in2, int size, uint16* out){ - int i=0; - for (i=0;i<size;i++){ - out[i]=u16muls(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/operations/multiplication/u8mula.c~ b/2.3-1/src/c/operations/multiplication/u8mula.c~ deleted file mode 100644 index ff76fa75..00000000 --- a/2.3-1/src/c/operations/multiplication/u8mula.c~ +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET - * - * 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 "multiplication.h" - -void u8mula(uint8* in1, uint8* in2, int size, uint8* out){ - int i=0; - for (i=0;i<size;i++){ - out[i]=u8muls(in1[i],in2[i]); - } -} diff --git a/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c~ deleted file mode 100644 index e66422a2..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c~ +++ /dev/null @@ -1,26 +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 "statMax.h" -//#include "max.h" - -void dcolumnmaxa(double *in, int rows, int columns, double* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]>out[i]) - out[i] = in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/dmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/dmaxa.c~ deleted file mode 100644 index 931c0d2d..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/dmaxa.c~ +++ /dev/null @@ -1,25 +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 "statMax.h" -//#include "max.h" -double dmaxa(double *in, int size) { - double out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]>out) out = in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/drowmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/drowmaxa.c~ deleted file mode 100644 index db0c72c0..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/drowmaxa.c~ +++ /dev/null @@ -1,24 +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 "statMax.h" -//#include "max.h" -void drowmaxa(double *in, int rows, int columns, double* out) { - int i = 0, j = 0; - for (i = 0; i < columns; i++) - { - out[i]=in[i*rows]; - for (j = 1 ; j < rows ; j++) - if (in[i*rows+j]>out[i]) - out[i] = in[i*rows+j]; - } -} diff --git a/2.3-1/src/c/statisticsFunctions/max/i16columnmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/i16columnmaxa.c~ deleted file mode 100644 index 94c5cf6a..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/i16columnmaxa.c~ +++ /dev/null @@ -1,25 +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 "statMax.h" -//#include "max.h" -void i16columnmaxa(int16 *in, int rows, int columns, int16* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=(int16)in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]>out[i]) - out[i] = (int16)in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/i16maxa.c~ b/2.3-1/src/c/statisticsFunctions/max/i16maxa.c~ deleted file mode 100644 index c1294193..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/i16maxa.c~ +++ /dev/null @@ -1,26 +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 "statMax.h" -//#include "max.h" -int16 i16maxa(int16 *in, int size) { - int16 out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]>out) - out = (int16)in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/i16rowmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/i16rowmaxa.c~ deleted file mode 100644 index 263e56ca..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/i16rowmaxa.c~ +++ /dev/null @@ -1,25 +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 "statMax.h" -//#include "max.h" - -void i16rowmaxa(int16 *in, int rows, int columns, int16* out) { - int i = 0, j = 0; - - for (i = 0; i < columns; i++) { - out[i]=(int16)in[i*rows]; - for (j = 1 ; j < rows ; j++) - if (in[i*rows+j]>out[i]) - out[i] = (int16)in[i*rows+j]; - } -} diff --git a/2.3-1/src/c/statisticsFunctions/max/i8columnmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/i8columnmaxa.c~ deleted file mode 100644 index 9c214dbb..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/i8columnmaxa.c~ +++ /dev/null @@ -1,26 +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 "statMax.h" -//#include "max.h" - -void i8columnmaxa(int8 *in, int rows, int columns, int8* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=(int8)in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]>out[i]) - out[i] = (int8)in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/i8maxa.c~ b/2.3-1/src/c/statisticsFunctions/max/i8maxa.c~ deleted file mode 100644 index 67fd3358..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/i8maxa.c~ +++ /dev/null @@ -1,26 +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 "statMax.h" -//#include "max.h" - -int8 i8maxa(int8 *in, int size) { - int8 out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]>out) - out = (int8)in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/i8rowmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/i8rowmaxa.c~ deleted file mode 100644 index a6d15aa3..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/i8rowmaxa.c~ +++ /dev/null @@ -1,25 +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 "statMax.h" -//#include "max.h" - -void i8rowmaxa(int8 *in, int rows, int columns, int8* out) { - int i = 0, j = 0; - - for (i = 0; i < columns; i++) { - out[i]=(int8)in[i*rows]; - for (j = 1 ; j < rows ; j++) - if (in[i*rows+j]>out[i]) - out[i] = (int8)in[i*rows+j]; - } -} diff --git a/2.3-1/src/c/statisticsFunctions/max/scolumnmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/scolumnmaxa.c~ deleted file mode 100644 index 4014f88a..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/scolumnmaxa.c~ +++ /dev/null @@ -1,25 +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 "statMax.h" -//#include "max.h" - -void scolumnmaxa(float *in, int rows, int columns, float* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]>out[i]) out[i] = in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/smaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/smaxa.c~ deleted file mode 100644 index 03b4cf18..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/smaxa.c~ +++ /dev/null @@ -1,25 +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 "statMax.h" -//#include "max.h" - -float smaxa(float *in, int size) { - float out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]>out) out = in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/srowmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/srowmaxa.c~ deleted file mode 100644 index ea6c33d6..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/srowmaxa.c~ +++ /dev/null @@ -1,23 +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 "statMax.h" -//#include "max.h" - -void srowmaxa(float *in, int rows, int columns, float* out) { - int i = 0, j = 0; - - for (i = 0; i < columns; i++) { - out[i]=in[i*rows]; - for (j = 1 ; j < rows ; j++) - if (in[i*rows+j]>out[i]) out[i] = in[i*rows+j]; - } -} diff --git a/2.3-1/src/c/statisticsFunctions/max/testDoubleMax.c~ b/2.3-1/src/c/statisticsFunctions/max/testDoubleMax.c~ deleted file mode 100644 index 883b427f..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/testDoubleMax.c~ +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud Torset - * - * 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 "statMax.h" -//#include "max.h" -#include "assert.h" -#include "stdio.h" - - -static void dmaxaTest(void){ - double in[12]={4,5,7,1,2,6,4,1,2,5,4,3}; - double out; - - out = dmaxa(in,12); - assert(out-7==0); - -} - - -static void drowmaxaTest(void){ - double in[12]={4,5,7,1,2,6,4,1,2,5,4,3}; - double result2[2]={7,5}; - double result3[3]={7,6,5}; - double result4[4]={7,6,4,5}; - double result6[6]={5,7,6,4,5,4}; - double out1[1],out2[2],out3[3],out4[4],out6[6],out12[12]; - int i; - - - drowmaxa(in,12,1,out1); - drowmaxa(in,6,2,out2); - drowmaxa(in,4,3,out3); - drowmaxa(in,3,4,out4); - drowmaxa(in,2,6,out6); - drowmaxa(in,1,12,out12); - - assert(out1[0]-7==0); - for (i=0;i<2;i++) assert(out2[i]-result2[i]==0); - for (i=0;i<3;i++) assert(out3[i]-result3[i]==0); - for (i=0;i<4;i++) assert(out4[i]-result4[i]==0); - for (i=0;i<6;i++) assert(out6[i]-result6[i]==0); - for (i=0;i<12;i++) assert(out12[i]-in[i]==0); -} - - -static void dcolumnmaxaTest(void){ - double in[12]={4,5,7,1,2,6,4,1,2,5,4,3}; - double out1[1],out2[2],out3[3],out4[4],out6[6],out12[12]; - double result2[2]={7,6}; - double result3[3]={5,5,7}; - double result4[4]={4,6,7,3}; - double result6[6]={4,5,7,5,4,6}; - int i; - - - - dcolumnmaxa(in,12,1,out12); - dcolumnmaxa(in,6,2,out6); - dcolumnmaxa(in,4,3,out4); - dcolumnmaxa(in,3,4,out3); - dcolumnmaxa(in,2,6,out2); - dcolumnmaxa(in,1,12,out1); - - assert(out1[0]-7==0); - for (i=0;i<2;i++) assert(out2[i]-result2[i]==0); - for (i=0;i<3;i++) assert(out3[i]-result3[i]==0); - for (i=0;i<4;i++) assert(out4[i]-result4[i]==0); - for (i=0;i<6;i++) assert(out6[i]-result6[i]==0); - for (i=0;i<12;i++) assert(out12[i]-in[i]==0); -} - -static int maxTest(void){ - dmaxaTest(); - drowmaxaTest(); - dcolumnmaxaTest(); - return 0; -} - - -int main(void){ - assert(maxTest()==0); - return 0; -} diff --git a/2.3-1/src/c/statisticsFunctions/max/testFloatMax.c~ b/2.3-1/src/c/statisticsFunctions/max/testFloatMax.c~ deleted file mode 100644 index cb572f7e..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/testFloatMax.c~ +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Arnaud Torset - * - * 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 "statMax.h" -//#include "max.h" -#include "assert.h" -#include "stdio.h" - -static void smaxaTest(void){ - float in[12]={4,5,7,1,2,6,4,1,2,5,4,3}; - float out; - - out = smaxa(in,12); - assert(out-7==0); - -} - - -static void srowmaxaTest(void){ - float in[12]={4,5,7,1,2,6,4,1,2,5,4,3}; - float out1[1],out2[2],out3[3],out4[4],out6[6],out12[12]; - float result2[2]={7,5}; - float result3[3]={7,6,5}; - float result4[4]={7,6,4,5}; - float result6[6]={5,7,6,4,5,4}; - int i; - - - srowmaxa(in,12,1,out1); - srowmaxa(in,6,2,out2); - srowmaxa(in,4,3,out3); - srowmaxa(in,3,4,out4); - srowmaxa(in,2,6,out6); - srowmaxa(in,1,12,out12); - - assert(out1[0]-7==0); - for (i=0;i<2;i++) assert(out2[i]-result2[i]==0); - for (i=0;i<3;i++) assert(out3[i]-result3[i]==0); - for (i=0;i<4;i++) assert(out4[i]-result4[i]==0); - for (i=0;i<6;i++) assert(out6[i]-result6[i]==0); - for (i=0;i<12;i++) assert(out12[i]-in[i]==0); -} - - -static void scolumnmaxaTest(void){ - float in[12]={4,5,7,1,2,6,4,1,2,5,4,3}; - float out1[1],out2[2],out3[3],out4[4],out6[6],out12[12]; - float result2[2]={7,6}; - float result3[3]={5,5,7}; - float result4[4]={4,6,7,3}; - float result6[6]={4,5,7,5,4,6}; - int i; - - - - scolumnmaxa(in,12,1,out12); - scolumnmaxa(in,6,2,out6); - scolumnmaxa(in,4,3,out4); - scolumnmaxa(in,3,4,out3); - scolumnmaxa(in,2,6,out2); - scolumnmaxa(in,1,12,out1); - - assert(out1[0]-7==0); - for (i=0;i<2;i++) assert(out2[i]-result2[i]==0); - for (i=0;i<3;i++) assert(out3[i]-result3[i]==0); - for (i=0;i<4;i++) assert(out4[i]-result4[i]==0); - for (i=0;i<6;i++) assert(out6[i]-result6[i]==0); - for (i=0;i<12;i++) assert(out12[i]-in[i]==0); -} - -static int maxTest(void){ - smaxaTest(); - srowmaxaTest(); - scolumnmaxaTest(); - return 0; -} - - -int main(void){ - assert(maxTest()==0); - return 0; -} diff --git a/2.3-1/src/c/statisticsFunctions/max/u16columnmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/u16columnmaxa.c~ deleted file mode 100644 index e0ccb3ae..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/u16columnmaxa.c~ +++ /dev/null @@ -1,28 +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 "statMax.h" - -//#include "max.h" - -void u16columnmaxa(uint16 *in, int rows, int columns, uint16* out) { - int i = 0, j = 0; - - - for (i = 0; i < rows; i++) { - out[i]=(uint16)in[i]; - for (j=0;j<columns;j++) - if (in[i+j*rows]>out[i]) - out[i] = (uint16)in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/u16maxa.c~ b/2.3-1/src/c/statisticsFunctions/max/u16maxa.c~ deleted file mode 100644 index c881d88a..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/u16maxa.c~ +++ /dev/null @@ -1,25 +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 "statMax.h" -//#include "max.h" - -uint16 u16maxa(uint16 *in, int size) { - uint16 out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]>out) out = (uint16)in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/u16rowmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/u16rowmaxa.c~ deleted file mode 100644 index 7c6b6801..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/u16rowmaxa.c~ +++ /dev/null @@ -1,28 +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 "statMax.h" -#include <stdlib.h> -//#include "max.h" - -void u16rowmaxa(uint16 *in, int rows, int columns, uint16* out) { - int i = 0, j = 0; - for (i = 0; i < columns; i++) - { - out[i]=(uint16)in[i]; - for (j = 1 ; j < rows ; j++) - { - if (in[j*columns+i]>out[i]) - out[i] = (uint16)in[j*columns+i]; - } - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/u8columnmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/u8columnmaxa.c~ deleted file mode 100644 index e7f8f0ef..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/u8columnmaxa.c~ +++ /dev/null @@ -1,26 +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 "statMax.h" -//#include "max.h" - -void u8columnmaxa(uint8 *in, int rows, int columns, uint8* out) { - int i = 0, j = 0; - - for (i = 0; i < columns; i++) - { - out[i]=(uint8)in[0]; - for (j=0;j<rows;j++) - if (in[j]>out[i]) - out[i] = (uint8)in[j]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/u8maxa.c~ b/2.3-1/src/c/statisticsFunctions/max/u8maxa.c~ deleted file mode 100644 index d9b6eca0..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/u8maxa.c~ +++ /dev/null @@ -1,27 +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 "statMax.h" -//#include "max.h" - -uint8 u8maxa(uint8 *in, int size) { - uint8 out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]>out) - out = (uint8)in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/max/u8rowmaxa.c~ b/2.3-1/src/c/statisticsFunctions/max/u8rowmaxa.c~ deleted file mode 100644 index fda293c7..00000000 --- a/2.3-1/src/c/statisticsFunctions/max/u8rowmaxa.c~ +++ /dev/null @@ -1,28 +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 "statMax.h" -//#include "max.h" - -void u8rowmaxa(uint8 *in, int rows, int columns, uint8* out) { - int i = 0, j = 0; - - - for (i = 0; i < columns; i++) - { - out[i]=(uint8)in[0]; - for (j = 0 ; j < rows ; j++) - { - if (in[j]>out[i]) - out[i] = (uint8)in[j]; - } - } -} diff --git a/2.3-1/src/c/statisticsFunctions/min/dcolumnmina.c~ b/2.3-1/src/c/statisticsFunctions/min/dcolumnmina.c~ deleted file mode 100644 index 6f0b3c1a..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/dcolumnmina.c~ +++ /dev/null @@ -1,24 +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 "statMin.h" - -void dcolumnmina(double *in, int rows, int columns, double* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]<out[i]) out[i] = in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/i16columnmina.c~ b/2.3-1/src/c/statisticsFunctions/min/i16columnmina.c~ deleted file mode 100644 index d38b7b5d..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/i16columnmina.c~ +++ /dev/null @@ -1,25 +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 "statMin.h" - -void i16columnmina(int16 *in, int rows, int columns, int16* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=(int16)in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]<out[i]) - out[i] = (int16)in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/i16mina.c~ b/2.3-1/src/c/statisticsFunctions/min/i16mina.c~ deleted file mode 100644 index 6afdd5de..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/i16mina.c~ +++ /dev/null @@ -1,26 +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 "statMin.h" - -int16 i16mina(int16 *in, int size) { - int16 out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]<out) - out = (int16)in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/i16rowmina.c~ b/2.3-1/src/c/statisticsFunctions/min/i16rowmina.c~ deleted file mode 100644 index adeeaaa4..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/i16rowmina.c~ +++ /dev/null @@ -1,24 +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 "statMin.h" - -void i16rowmina(int16 *in, int rows, int columns, int16* out) { - int i = 0, j = 0; - - for (i = 0; i < columns; i++) { - out[i]=(int16)in[i*rows]; - for (j = 1 ; j < rows ; j++) - if (in[i*rows+j]<out[i]) - out[i] = (int16)in[i*rows+j]; - } -} diff --git a/2.3-1/src/c/statisticsFunctions/min/i8columnmina.c~ b/2.3-1/src/c/statisticsFunctions/min/i8columnmina.c~ deleted file mode 100644 index 1e97d621..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/i8columnmina.c~ +++ /dev/null @@ -1,25 +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 "statMin.h" - -void i8columnmina(int8 *in, int rows, int columns, int8* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=(int8)in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]<out[i]) - out[i] = (int8)in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/i8mina.c~ b/2.3-1/src/c/statisticsFunctions/min/i8mina.c~ deleted file mode 100644 index 07e8a108..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/i8mina.c~ +++ /dev/null @@ -1,26 +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 "statMin.h" - -int8 i8mina(int8 *in, int size) { - int8 out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]<out) - out = (int8)in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/i8rowmina.c~ b/2.3-1/src/c/statisticsFunctions/min/i8rowmina.c~ deleted file mode 100644 index 4ce9edc5..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/i8rowmina.c~ +++ /dev/null @@ -1,24 +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 "statMin.h" - -void i8rowmina(int8 *in, int rows, int columns, int8* out) { - int i = 0, j = 0; - - for (i = 0; i < columns; i++) { - out[i]=(int8)in[i*rows]; - for (j = 1 ; j < rows ; j++) - if (in[i*rows+j]<out[i]) - out[i] = (int8)in[i*rows+j]; - } -} diff --git a/2.3-1/src/c/statisticsFunctions/min/scolumnmina.c~ b/2.3-1/src/c/statisticsFunctions/min/scolumnmina.c~ deleted file mode 100644 index 8e19b1de..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/scolumnmina.c~ +++ /dev/null @@ -1,24 +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 "statMin.h" - -void scolumnmina(float *in, int rows, int columns, float* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]<out[i]) out[i] = in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/u16columnmina.c~ b/2.3-1/src/c/statisticsFunctions/min/u16columnmina.c~ deleted file mode 100644 index 96c86a60..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/u16columnmina.c~ +++ /dev/null @@ -1,25 +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 "statMin.h" - -void u16columnmina(uint16 *in, int rows, int columns, uint16* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=(uint16)in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]<out[i]) - out[i] = (uint16)in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/u16mina.c~ b/2.3-1/src/c/statisticsFunctions/min/u16mina.c~ deleted file mode 100644 index 07c24eac..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/u16mina.c~ +++ /dev/null @@ -1,26 +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 "statMin.h" - -uint16 u16mina(uint16 *in, int size) { - uint16 out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]<out) - out = (uint16)in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/u16rowmina.c~ b/2.3-1/src/c/statisticsFunctions/min/u16rowmina.c~ deleted file mode 100644 index 5180977e..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/u16rowmina.c~ +++ /dev/null @@ -1,24 +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 "statMin.h" - -void u16rowmina(uint16 *in, int rows, int columns, uint16* out) { - int i = 0, j = 0; - - for (i = 0; i < columns; i++) { - out[i]=(uint16)in[i*rows]; - for (j = 1 ; j < rows ; j++) - if (in[i*rows+j]<out[i]) - out[i] = (uint16)in[i*rows+j]; - } -} diff --git a/2.3-1/src/c/statisticsFunctions/min/u8columnmina.c~ b/2.3-1/src/c/statisticsFunctions/min/u8columnmina.c~ deleted file mode 100644 index 4ced0968..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/u8columnmina.c~ +++ /dev/null @@ -1,25 +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 "statMin.h" - -void u8columnmina(uint8 *in, int rows, int columns, uint8* out) { - int i = 0, j = 0; - - for (i = 0; i < rows; i++) { - out[i]=(uint8)in[i*columns]; - for (j=0;j<columns;j++) - if (in[i+j*rows]<out[i]) - out[i] = (uint8)in[i+j*rows]; - } - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/u8mina.c~ b/2.3-1/src/c/statisticsFunctions/min/u8mina.c~ deleted file mode 100644 index 16a7bb4c..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/u8mina.c~ +++ /dev/null @@ -1,26 +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 "statMin.h" - -uint8 u8mina(uint8 *in, int size) { - uint8 out = in[0]; - int i = 0; - - for (i = 1; i < size; ++i) - { - if (in[i]<out) - out = (uint8)in[i]; - } - return out; - -} diff --git a/2.3-1/src/c/statisticsFunctions/min/u8rowmina.c~ b/2.3-1/src/c/statisticsFunctions/min/u8rowmina.c~ deleted file mode 100644 index ddbe274c..00000000 --- a/2.3-1/src/c/statisticsFunctions/min/u8rowmina.c~ +++ /dev/null @@ -1,24 +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 "statMin.h" - -void u8rowmina(uint8 *in, int rows, int columns, uint8* out) { - int i = 0, j = 0; - - for (i = 0; i < columns; i++) { - out[i]=(uint8)in[i*rows]; - for (j = 1 ; j < rows ; j++) - if (in[i*rows+j]<out[i]) - out[i] = (uint8)in[i*rows+j]; - } -} |