summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--2.3-1/includes/sci2clib.h3
-rw-r--r--2.3-1/jar/scilab_en_US_help.jarbin11210 -> 0 bytes
-rw-r--r--2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci32
-rw-r--r--2.3-1/macros/findDeps/getAllHeaders.sci1
-rw-r--r--2.3-1/macros/findDeps/getAllInterfaces.sci1
-rw-r--r--2.3-1/macros/findDeps/getAllSources.sci8
-rw-r--r--2.3-1/src/c/elementaryFunctions/includes/isscalar.h38
-rw-r--r--2.3-1/src/c/elementaryFunctions/interfaces/int_isiscalar.h26
-rw-r--r--2.3-1/src/c/elementaryFunctions/isscalar/disiscalars.c24
-rw-r--r--2.3-1/src/c/elementaryFunctions/isscalar/disscalara.c23
-rw-r--r--2.3-1/src/c/elementaryFunctions/isscalar/gisscalara.c24
-rw-r--r--2.3-1/src/c/elementaryFunctions/isscalar/gisscalars.c24
-rw-r--r--2.3-1/src/c/elementaryFunctions/isscalar/sisscalara.c22
-rw-r--r--2.3-1/src/c/elementaryFunctions/isscalar/sisscalars.c24
-rw-r--r--2.3-1/src/c/elementaryFunctions/isscalar/zisscalara.c25
-rw-r--r--2.3-1/src/c/elementaryFunctions/isscalar/zisscalars.c25
16 files changed, 300 insertions, 0 deletions
diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index 8dc15ec9..7e3b21fa 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/includes/sci2clib.h
@@ -163,6 +163,9 @@ extern "C" {
/*interfacing isrow*/
#include "isrow.h"
#include "int_isrow.h"
+/*interfacing isscalar*/
+#include "isscalar.h"
+#include "int_isscalar.h"
/*interfacing iscolumn*/
#include "iscolumn.h"
#include "int_iscolumn.h"
diff --git a/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar
deleted file mode 100644
index c39272b8..00000000
--- a/2.3-1/jar/scilab_en_US_help.jar
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index c203ba70..b890c6fe 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -952,6 +952,38 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
// -------------------
+// --- Class Isscalar. ---
+// -------------------
+ClassName = 'Isscalar';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+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= ''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+'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('z0'+ArgSeparator+'g0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'isscalar';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+// -------------------
// --- Class Iscolumn. ---
// -------------------
ClassName = 'Iscolumn';
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 5dd7d820..e1ba7f6f 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -129,6 +129,7 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/elementaryFunctions/includes/asecd.h"
"src/c/elementaryFunctions/includes/asech.h"
"src/c/elementaryFunctions/includes/isrow.h"
+ "src/c/elementaryFunctions/includes/isscalar.h"
"src/c/elementaryFunctions/includes/iscolumn.h"
"src/c/elementaryFunctions/includes/ismatrix.h"
"src/c/elementaryFunctions/includes/asind.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 84f3cddb..5f1ee025 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -100,6 +100,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/elementaryFunctions/interfaces/int_bitget.h"
"src/c/elementaryFunctions/interfaces/int_linspace.h"
"src/c/elementaryFunctions/interfaces/int_isrow.h"
+ "src/c/elementaryFunctions/interfaces/int_isscalar.h"
"src/c/elementaryFunctions/interfaces/int_iscolumn.h"
"src/c/elementaryFunctions/interfaces/int_ismatrix.h"
"src/c/elementaryFunctions/interfaces/int_logspace.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 2124da9e..f08311b5 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -776,6 +776,14 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/isrow/sisrowa.c"
"src/c/elementaryFunctions/isrow/zisrowa.c"
"src/c/elementaryFunctions/isrow/zisrows.c"
+ "src/c/elementaryFunctions/isscalar/disscalara.c"
+ "src/c/elementaryFunctions/isscalar/disscalars.c"
+ "src/c/elementaryFunctions/isscalar/gisscalars.c"
+ "src/c/elementaryFunctions/isscalar/gisscalara.c"
+ "src/c/elementaryFunctions/isscalar/sisscalars.c"
+ "src/c/elementaryFunctions/isscalar/sisscalara.c"
+ "src/c/elementaryFunctions/isscalar/zisscalara.c"
+ "src/c/elementaryFunctions/isscalar/zisscalars.c"
"src/c/elementaryFunctions/iscolumn/discolumna.c"
"src/c/elementaryFunctions/iscolumn/discolumns.c"
"src/c/elementaryFunctions/iscolumn/giscolumns.c"
diff --git a/2.3-1/src/c/elementaryFunctions/includes/isscalar.h b/2.3-1/src/c/elementaryFunctions/includes/isscalar.h
new file mode 100644
index 00000000..f4880437
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/includes/isscalar.h
@@ -0,0 +1,38 @@
+/* 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
+*/
+
+#ifndef __ISSCALAR_H__
+#define __ISSCALAR_H__
+
+
+#include "types.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char disscalara(double* , int);
+char disscalars(double);
+char sisscalara( float* , int);
+char sisscalars( float);
+char gisscalara(char* , int);
+char gisscalars(char);
+char zisscalara(doubleComplex*, int);
+char zisscalars(doubleComplex);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_isiscalar.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_isiscalar.h
new file mode 100644
index 00000000..9d139712
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_isiscalar.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_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/isscalar/disiscalars.c b/2.3-1/src/c/elementaryFunctions/isscalar/disiscalars.c
new file mode 100644
index 00000000..fe7ce3e3
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/isscalar/disiscalars.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 "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
new file mode 100644
index 00000000..7f440197
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/isscalar/disscalara.c
@@ -0,0 +1,23 @@
+/* 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 "isscalar.h"
+#include "types.h"
+char discalara(double* inp, int size1)
+{
+ char out= 'F' ;
+
+ return out;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/gisscalara.c b/2.3-1/src/c/elementaryFunctions/isscalar/gisscalara.c
new file mode 100644
index 00000000..fdfac778
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/isscalar/gisscalara.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 "isscalar.h"
+#include "types.h"
+#include "string.h"
+char gisscalara(char *inp, int size1)
+{
+ char out='F';
+
+ return out;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/gisscalars.c b/2.3-1/src/c/elementaryFunctions/isscalar/gisscalars.c
new file mode 100644
index 00000000..5a208959
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/isscalar/gisscalars.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 "isscalar.h"
+#include "types.h"
+
+char giscalars(char inp)
+{
+ char out='T';
+
+ return out;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/sisscalara.c b/2.3-1/src/c/elementaryFunctions/isscalar/sisscalara.c
new file mode 100644
index 00000000..59a51653
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/isscalar/sisscalara.c
@@ -0,0 +1,22 @@
+/* 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 "isscalar.h"
+#include "types.h"
+char sisscalara(float* inp, int size1)
+{
+ char out='F';
+ return out;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/sisscalars.c b/2.3-1/src/c/elementaryFunctions/isscalar/sisscalars.c
new file mode 100644
index 00000000..6ca7c4b4
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/isscalar/sisscalars.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 "isscalar.h"
+#include "types.h"
+
+char sisscalars(float inp)
+{
+ char out='T';
+
+ return out;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/zisscalara.c b/2.3-1/src/c/elementaryFunctions/isscalar/zisscalara.c
new file mode 100644
index 00000000..942bbb54
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/isscalar/zisscalara.c
@@ -0,0 +1,25 @@
+/* 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 "isscalar.h"
+#include "types.h"
+
+char zisscalara(doubleComplex *inp, int size1)
+{
+ char out='F';
+
+ return out;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/isscalar/zisscalars.c b/2.3-1/src/c/elementaryFunctions/isscalar/zisscalars.c
new file mode 100644
index 00000000..2bf8e949
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/isscalar/zisscalars.c
@@ -0,0 +1,25 @@
+/* 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 "isscalar.h"
+#include "types.h"
+#include "doubleComplex.h"
+
+char zisscalars(doubleComplex inp)
+{
+ char out='T';
+
+ return out;
+}