From 441f3e61481c1de99bbc408292224eb28a62bea7 Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Fri, 7 Jul 2017 17:08:57 +0530 Subject: Isscalar added --- 2.3-1/macros/runsci2c.sci | 1 + .../elementaryFunctions/interfaces/int_isiscalar.h | 26 ---------------------- .../elementaryFunctions/interfaces/int_isscalar.h | 26 ++++++++++++++++++++++ .../c/elementaryFunctions/isscalar/disiscalars.c | 24 -------------------- .../c/elementaryFunctions/isscalar/disscalara.c | 2 +- .../c/elementaryFunctions/isscalar/disscalars.c | 24 ++++++++++++++++++++ 6 files changed, 52 insertions(+), 51 deletions(-) delete mode 100644 2.3-1/src/c/elementaryFunctions/interfaces/int_isiscalar.h create mode 100644 2.3-1/src/c/elementaryFunctions/interfaces/int_isscalar.h delete mode 100644 2.3-1/src/c/elementaryFunctions/isscalar/disiscalars.c create mode 100644 2.3-1/src/c/elementaryFunctions/isscalar/disscalars.c (limited to '2.3-1') diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci index 2fc66be8..14e5a527 100644 --- a/2.3-1/macros/runsci2c.sci +++ b/2.3-1/macros/runsci2c.sci @@ -138,6 +138,7 @@ PrintStepInfo('Copying interfaces', FileInfo.GeneralReport,'both'); for i = 1:size(allInterfaces, "*") // DEBUG only //disp("Copying "+allInterfaces(i)+" in "+SCI2COutputPath+"/interfaces/"); + copyfile(allInterfaces(i), SCI2COutputPath+"/interfaces/"); end diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_isiscalar.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_isiscalar.h deleted file mode 100644 index 9d139712..00000000 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_isiscalar.h +++ /dev/null @@ -1,26 +0,0 @@ - /*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 - Author: Abhinav Dronamraju - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - - -#ifndef __INT_ISROW_H__ -#define __INT_ISROW_H__ - -#define d2isscalarg0(in, size ) disscalara(in, size[0]) -#define d0isscalarg0(in) disscalars(in) -#define s2isscalarg0(in , size) sisscalara(in, size[0]) -#define s0isscalarg0(in) sisscalars(in) -#define g2isscalarg0(in, size) gisscalara(in, size[0]) -#define g0isscalarg0(in) gisscalars(in) -#define z2isscalarg0(in, size) zisscalara(in , size[0]) -#define z0isscalarg0(in) zisscalars(in) - - -#endif diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_isscalar.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_isscalar.h new file mode 100644 index 00000000..0b25be12 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_isscalar.h @@ -0,0 +1,26 @@ + /*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 + Author: Abhinav Dronamraju + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + + +#ifndef __INT_ISSCALAR_H__ +#define __INT_ISSCALAR_H__ + +#define d2isscalarg0(in, size ) disscalara(in, size[0]) +#define d0isscalarg0(in) disscalars(in) +#define s2isscalarg0(in , size) sisscalara(in, size[0]) +#define s0isscalarg0(in) sisscalars(in) +#define g2isscalarg0(in, size) gisscalara(in, size[0]) +#define g0isscalarg0(in) gisscalars(in) +#define z2isscalarg0(in, size) zisscalara(in , size[0]) +#define z0isscalarg0(in) zisscalars(in) + + +#endif diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/disiscalars.c b/2.3-1/src/c/elementaryFunctions/isscalar/disiscalars.c deleted file mode 100644 index fe7ce3e3..00000000 --- a/2.3-1/src/c/elementaryFunctions/isscalar/disiscalars.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - 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 - Author: Abhinav Dronamraju - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include -#include -#include -#include "isscalar.h" -#include "types.h" - -char disscalars(double inp) -{ - double out='T'; - - return out; -} diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/disscalara.c b/2.3-1/src/c/elementaryFunctions/isscalar/disscalara.c index 7f440197..eb70cf6a 100644 --- a/2.3-1/src/c/elementaryFunctions/isscalar/disscalara.c +++ b/2.3-1/src/c/elementaryFunctions/isscalar/disscalara.c @@ -15,7 +15,7 @@ #include #include "isscalar.h" #include "types.h" -char discalara(double* inp, int size1) +char disscalara(double* inp, int size1) { char out= 'F' ; diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/disscalars.c b/2.3-1/src/c/elementaryFunctions/isscalar/disscalars.c new file mode 100644 index 00000000..fe7ce3e3 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/isscalar/disscalars.c @@ -0,0 +1,24 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + 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 + Author: Abhinav Dronamraju + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "isscalar.h" +#include "types.h" + +char disscalars(double inp) +{ + double out='T'; + + return out; +} -- cgit