diff options
-rw-r--r-- | jar/scilab_en_US_help.jar | bin | 90817 -> 90817 bytes | |||
-rw-r--r-- | macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci | 16 | ||||
-rw-r--r-- | macros/findDeps/getAllSources.sci | 5 | ||||
-rw-r--r-- | src/c/elementaryFunctions/includes/isrow.h | 14 | ||||
-rw-r--r-- | src/c/elementaryFunctions/interfaces/int_isrow.h | 12 | ||||
-rw-r--r-- | src/c/elementaryFunctions/isrow/disrowa.c | 6 | ||||
-rw-r--r-- | src/c/elementaryFunctions/isrow/disrows.c | 4 | ||||
-rw-r--r-- | src/c/elementaryFunctions/isrow/gisrowa.c | 6 | ||||
-rw-r--r-- | src/c/elementaryFunctions/isrow/gisrows.c | 24 | ||||
-rw-r--r-- | src/c/elementaryFunctions/isrow/sisrowa.c | 6 | ||||
-rw-r--r-- | src/c/elementaryFunctions/isrow/sisrows.c | 4 | ||||
-rw-r--r-- | src/c/elementaryFunctions/isrow/zisrowa.c | 28 | ||||
-rw-r--r-- | src/c/string/disp/gdisps.c | 0 | ||||
-rw-r--r-- | src/c/string/interfaces/int_disp.h | 2 |
14 files changed, 97 insertions, 30 deletions
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar Binary files differindex c2aac10..096f8a3 100644 --- a/jar/scilab_en_US_help.jar +++ b/jar/scilab_en_US_help.jar diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index b53aa13..14d8988 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -931,17 +931,19 @@ PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
//Was FA_TP_USER
//Cause some trouble if user specify some precision and if input(and also output) is complex.
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
//---Function list class. ----
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('g0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('s0'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('g2'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('g0'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('g0'+ArgSeparator+'g0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'isrow';
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index b6c979b..338e337 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -766,6 +766,11 @@ function allSources = getAllSources(SharedInfo) "src/c/elementaryFunctions/acsc/zacsca.c" "src/c/elementaryFunctions/isrow/disrowa.c" "src/c/elementaryFunctions/isrow/disrows.c" + "src/c/elementaryFunctions/isrow/gisrows.c" + "src/c/elementaryFunctions/isrow/gisrowa.c" + "src/c/elementaryFunctions/isrow/sisrows.c" + "src/c/elementaryFunctions/isrow/sisrowa.c" + "src/c/elementaryFunctions/isrow/zisrowa.c" "src/c/elementaryFunctions/acscd/dacscda.c" "src/c/elementaryFunctions/acscd/dacscds.c" "src/c/elementaryFunctions/acscd/sacscda.c" diff --git a/src/c/elementaryFunctions/includes/isrow.h b/src/c/elementaryFunctions/includes/isrow.h index 0b867b0..5c01063 100644 --- a/src/c/elementaryFunctions/includes/isrow.h +++ b/src/c/elementaryFunctions/includes/isrow.h @@ -15,16 +15,20 @@ #include "types.h" +#include "doubleComplex.h" +#include "floatComplex.h" #ifdef __cplusplus extern "C" { #endif -double disrowa(double* , int); -double disrows(double); -double sisrowa( float* , int); -double sisrows( float); -double gisrowa(char* , int); +char disrowa(double* , int); +char disrows(double); +char sisrowa( float* , int); +char sisrows( float); +char gisrowa(char* , int); +char gisrows(char); +char zisrowa(doubleComplex *inp, int); #ifdef __cplusplus } /* extern "C" */ diff --git a/src/c/elementaryFunctions/interfaces/int_isrow.h b/src/c/elementaryFunctions/interfaces/int_isrow.h index 22cd89a..af718b4 100644 --- a/src/c/elementaryFunctions/interfaces/int_isrow.h +++ b/src/c/elementaryFunctions/interfaces/int_isrow.h @@ -13,11 +13,13 @@ #ifndef __INT_ISROW_H__ #define __INT_ISROW_H__ -#define d2isrowd0(in, size ) disrowa(in, size[0]) -#define d0isrowd0(in) disrows(in) -#define s2isrowd0(in , size) siswora(in, size[0]) -#define s0isrowd0(in) sisrows(in) -#define g2isrowd0(in, size) gisrowa(in, size[0]) +#define d2isrowg0(in, size ) disrowa(in, size[0]) +#define d0isrowg0(in) disrows(in) +#define s2isrowg0(in , size) siswora(in, size[0]) +#define s0isrowg0(in) sisrows(in) +#define g2isrowg0(in, size) gisrowa(in, size[0]) +#define g0isrowg0(in) gisrows(in) +#define z2isrowg0(in, size) zisrowa(in , size[0]) #endif diff --git a/src/c/elementaryFunctions/isrow/disrowa.c b/src/c/elementaryFunctions/isrow/disrowa.c index 8bb7e5f..826afca 100644 --- a/src/c/elementaryFunctions/isrow/disrowa.c +++ b/src/c/elementaryFunctions/isrow/disrowa.c @@ -15,12 +15,12 @@ #include <math.h> #include "isrow.h" #include "types.h" -double disrowa(double* inp, int size1) +char disrowa(double* inp, int size1) { - double out=0; + char out= 'F' ; if(size1==1) { - out = 1; + out = 'T'; } return out; } diff --git a/src/c/elementaryFunctions/isrow/disrows.c b/src/c/elementaryFunctions/isrow/disrows.c index 35756c1..e3bdadb 100644 --- a/src/c/elementaryFunctions/isrow/disrows.c +++ b/src/c/elementaryFunctions/isrow/disrows.c @@ -16,9 +16,9 @@ #include "isrow.h" #include "types.h" -double disrows(double inp) +char disrows(double inp) { - double out=1; + double out='T'; return out; } diff --git a/src/c/elementaryFunctions/isrow/gisrowa.c b/src/c/elementaryFunctions/isrow/gisrowa.c index dd16a9f..c62350f 100644 --- a/src/c/elementaryFunctions/isrow/gisrowa.c +++ b/src/c/elementaryFunctions/isrow/gisrowa.c @@ -16,12 +16,12 @@ #include "isrow.h" #include "types.h" #include "string.h" -double gisrowa(char *inp, int size1) +char gisrowa(char *inp, int size1) { - double out=0; + char out='F'; if(size1==1) { - out = 1; + out = 'T'; } return out; } diff --git a/src/c/elementaryFunctions/isrow/gisrows.c b/src/c/elementaryFunctions/isrow/gisrows.c new file mode 100644 index 0000000..a4393bd --- /dev/null +++ b/src/c/elementaryFunctions/isrow/gisrows.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 <stdio.h> +#include <stdlib.h> +#include <math.h> +#include "isrow.h" +#include "types.h" + +char gisrows(char inp) +{ + char out='T'; + + return out; +} diff --git a/src/c/elementaryFunctions/isrow/sisrowa.c b/src/c/elementaryFunctions/isrow/sisrowa.c index cfbc218..bf9d4c3 100644 --- a/src/c/elementaryFunctions/isrow/sisrowa.c +++ b/src/c/elementaryFunctions/isrow/sisrowa.c @@ -15,12 +15,12 @@ #include <math.h> #include "isrow.h" #include "types.h" -double sisrowa(float* inp, int size1) +char sisrowa(float* inp, int size1) { - double out=0; + char out='F'; if(size1==1) { - out = 1; + out = 'T'; } return out; } diff --git a/src/c/elementaryFunctions/isrow/sisrows.c b/src/c/elementaryFunctions/isrow/sisrows.c index 34694c9..331e0a9 100644 --- a/src/c/elementaryFunctions/isrow/sisrows.c +++ b/src/c/elementaryFunctions/isrow/sisrows.c @@ -16,9 +16,9 @@ #include "isrow.h" #include "types.h" -double disrows(float inp) +char sisrows(float inp) { - double out=1; + char out='T'; return out; } diff --git a/src/c/elementaryFunctions/isrow/zisrowa.c b/src/c/elementaryFunctions/isrow/zisrowa.c new file mode 100644 index 0000000..312ddf5 --- /dev/null +++ b/src/c/elementaryFunctions/isrow/zisrowa.c @@ -0,0 +1,28 @@ +/* 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 <stdio.h> +#include <stdlib.h> +#include <math.h> +#include "doubleComplex.h" +#include "isrow.h" +#include "types.h" + +char zisrowa(doubleComplex *inp, int size1) +{ + char out='F'; + if(size1==1) + { + out = 'T'; + } + return out; +} diff --git a/src/c/string/disp/gdisps.c b/src/c/string/disp/gdisps.c new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/c/string/disp/gdisps.c diff --git a/src/c/string/interfaces/int_disp.h b/src/c/string/interfaces/int_disp.h index 3bb7852..b7ec2ee 100644 --- a/src/c/string/interfaces/int_disp.h +++ b/src/c/string/interfaces/int_disp.h @@ -53,6 +53,8 @@ #define g2disp(in, size) printf("%s\n",in) +#define g0disp(in) printf("%c\n", in) + #endif /* __INT_DISP_H__ */ |