From 28917732a0c500c5db111ed49dbd7755758f5f72 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Sat, 28 Nov 2015 11:55:38 +0530 Subject: Merged 'master' with Mushir's work' --- src/c/auxiliaryFunctions/find/i16finda.c~ | 40 ------------------------------- src/c/auxiliaryFunctions/find/i8finda.c~ | 40 ------------------------------- src/c/auxiliaryFunctions/find/u16finda.c~ | 40 ------------------------------- src/c/auxiliaryFunctions/find/u8finda.c~ | 40 ------------------------------- 4 files changed, 160 deletions(-) delete mode 100644 src/c/auxiliaryFunctions/find/i16finda.c~ delete mode 100644 src/c/auxiliaryFunctions/find/i8finda.c~ delete mode 100644 src/c/auxiliaryFunctions/find/u16finda.c~ delete mode 100644 src/c/auxiliaryFunctions/find/u8finda.c~ (limited to 'src/c/auxiliaryFunctions') diff --git a/src/c/auxiliaryFunctions/find/i16finda.c~ b/src/c/auxiliaryFunctions/find/i16finda.c~ deleted file mode 100644 index f7bde00..0000000 --- a/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/src/c/auxiliaryFunctions/find/i8finda.c~ b/src/c/auxiliaryFunctions/find/i8finda.c~ deleted file mode 100644 index ac223ae..0000000 --- a/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/src/c/auxiliaryFunctions/find/u16finda.c~ b/src/c/auxiliaryFunctions/find/u16finda.c~ deleted file mode 100644 index 3096d61..0000000 --- a/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/src/c/auxiliaryFunctions/find/u8finda.c~ b/src/c/auxiliaryFunctions/find/u8finda.c~ deleted file mode 100644 index d571c7c..0000000 --- a/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; - } - } -} - -- cgit