summaryrefslogtreecommitdiff
path: root/2.3-1/macros
diff options
context:
space:
mode:
authorAbhinav Dronamraju2017-07-14 16:30:11 +0530
committerAbhinav Dronamraju2017-07-14 16:30:11 +0530
commit3af005920a6bce61c99d26fa205794634f5ad405 (patch)
tree3cd9fdf42e364f34cf1ad20e5401664619083a5e /2.3-1/macros
parent8595e91e1c157f471cc359a7dd927b1e18561b2d (diff)
downloadScilab2C-3af005920a6bce61c99d26fa205794634f5ad405.tar.gz
Scilab2C-3af005920a6bce61c99d26fa205794634f5ad405.tar.bz2
Scilab2C-3af005920a6bce61c99d26fa205794634f5ad405.zip
Isvector and NNZ added
Diffstat (limited to '2.3-1/macros')
-rw-r--r--2.3-1/macros/ASTManagement/libbin2008 -> 1956 bytes
-rw-r--r--2.3-1/macros/CCodeGeneration/libbin1056 -> 1004 bytes
-rw-r--r--2.3-1/macros/ErrorMessages/libbin520 -> 468 bytes
-rw-r--r--2.3-1/macros/FunctionAnnotation/libbin2412 -> 2360 bytes
-rw-r--r--2.3-1/macros/FunctionList/libbin588 -> 536 bytes
-rw-r--r--2.3-1/macros/GeneralFunctions/libbin1132 -> 1080 bytes
-rw-r--r--2.3-1/macros/Hardware/AVR/libbin972 -> 920 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/libbin976 -> 924 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/core/libbin524 -> 472 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/highgui/libbin584 -> 532 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/imgproc/libbin752 -> 700 bytes
-rw-r--r--2.3-1/macros/Scilab-Arduino/libbin716 -> 664 bytes
-rw-r--r--2.3-1/macros/SymbolTable/libbin752 -> 700 bytes
-rw-r--r--2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci77
-rw-r--r--2.3-1/macros/ToolInitialization/libbin804 -> 752 bytes
-rw-r--r--2.3-1/macros/findDeps/getAllHeaders.sci2
-rw-r--r--2.3-1/macros/findDeps/getAllInterfaces.sci2
-rw-r--r--2.3-1/macros/findDeps/getAllSources.sci14
-rw-r--r--2.3-1/macros/findDeps/libbin620 -> 568 bytes
-rw-r--r--2.3-1/macros/libbin536 -> 484 bytes
20 files changed, 83 insertions, 12 deletions
diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib
index 5978ea72..e9d351a5 100644
--- a/2.3-1/macros/ASTManagement/lib
+++ b/2.3-1/macros/ASTManagement/lib
Binary files differ
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
index 31819793..f2696fef 100644
--- a/2.3-1/macros/CCodeGeneration/lib
+++ b/2.3-1/macros/CCodeGeneration/lib
Binary files differ
diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib
index 794d4c01..1500b1fa 100644
--- a/2.3-1/macros/ErrorMessages/lib
+++ b/2.3-1/macros/ErrorMessages/lib
Binary files differ
diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
index bb1f47c6..5eb9bc2f 100644
--- a/2.3-1/macros/FunctionAnnotation/lib
+++ b/2.3-1/macros/FunctionAnnotation/lib
Binary files differ
diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib
index c3274f18..e101853b 100644
--- a/2.3-1/macros/FunctionList/lib
+++ b/2.3-1/macros/FunctionList/lib
Binary files differ
diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib
index 1cf5c1f5..846ca1b2 100644
--- a/2.3-1/macros/GeneralFunctions/lib
+++ b/2.3-1/macros/GeneralFunctions/lib
Binary files differ
diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib
index 069c520e..53e56599 100644
--- a/2.3-1/macros/Hardware/AVR/lib
+++ b/2.3-1/macros/Hardware/AVR/lib
Binary files differ
diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib
index 4c85475b..dc759fe8 100644
--- a/2.3-1/macros/Hardware/RasberryPi/lib
+++ b/2.3-1/macros/Hardware/RasberryPi/lib
Binary files differ
diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib
index d80305c4..7f003c8e 100644
--- a/2.3-1/macros/ImageProcessing/core/lib
+++ b/2.3-1/macros/ImageProcessing/core/lib
Binary files differ
diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib
index 1e7f7507..787c25fa 100644
--- a/2.3-1/macros/ImageProcessing/highgui/lib
+++ b/2.3-1/macros/ImageProcessing/highgui/lib
Binary files differ
diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib
index a83978b5..93c83909 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/lib
+++ b/2.3-1/macros/ImageProcessing/imgproc/lib
Binary files differ
diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib
index f3d5b2fc..5b7beab0 100644
--- a/2.3-1/macros/Scilab-Arduino/lib
+++ b/2.3-1/macros/Scilab-Arduino/lib
Binary files differ
diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib
index e66158d4..c42cf1a5 100644
--- a/2.3-1/macros/SymbolTable/lib
+++ b/2.3-1/macros/SymbolTable/lib
Binary files differ
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 7dcae8a8..2af61403 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1047,6 +1047,39 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+// -------------------
+// --- Class Isvector. ---
+// -------------------
+ClassName = 'Isvector';
+
+// --- 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 = 'isvector';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
// -------------------
// --- Class Iscolumn. ---
// -------------------
@@ -7118,30 +7151,50 @@ PrintStringInfo('OUT(1).SZ(2)= IN(3).VAL',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('d2s0s0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d2u160u160'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d2u80u80'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('z2d0d0'+ArgSeparator+'z2',ClassFileName,'file','y');
PrintStringInfo('z2s0s0'+ArgSeparator+'z2',ClassFileName,'file','y');
-
PrintStringInfo('s2d0d0'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('s2s0s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s2u160u160'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s2u80u80'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
-
PrintStringInfo('u162d0d0'+ArgSeparator+'u162',ClassFileName,'file','y');
PrintStringInfo('u162s0s0'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('u82g2'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82g2'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162g2'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162g2'+ArgSeparator+'i162',ClassFileName,'file','y');
+
// --- Annotation Function And Function List Function. ---
FunctionName = 'matrix';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+//------------------------------------
+//---- Class NNZ---------------------
+//------------------------------------
+ClassName = 'NNZ';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+//Arguements specified: initial value, start time, time vector, ode function
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''u16''',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('d2'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('z0'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('s0'+ArgSeparator+'u160',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'nnz';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
//------------------------------------
//---- Class TRIU ---------------------
diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
index 670a52e0..267c9c9f 100644
--- a/2.3-1/macros/ToolInitialization/lib
+++ b/2.3-1/macros/ToolInitialization/lib
Binary files differ
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 67444f93..986829ea 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -66,6 +66,7 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/matrixOperations/includes/diag.h"
"src/c/matrixOperations/includes/cumsum.h"
"src/c/matrixOperations/includes/matrix.h"
+ "src/c/matrixOperations/includes/nnz.h"
"src/c/matrixOperations/includes/cumprod.h"
"src/c/matrixOperations/includes/triu.h"
"src/c/matrixOperations/includes/tril.h"
@@ -133,6 +134,7 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/elementaryFunctions/includes/nthroot.h"
"src/c/elementaryFunctions/includes/issquare.h"
"src/c/elementaryFunctions/includes/isscalar.h"
+ "src/c/elementaryFunctions/includes/isvector.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 da910a0e..02c671f2 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -54,6 +54,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/matrixOperations/interfaces/int_diag.h"
"src/c/matrixOperations/interfaces/int_cumsum.h"
"src/c/matrixOperations/interfaces/int_matrix.h"
+ "src/c/matrixOperations/interfaces/int_nnz.h"
"src/c/matrixOperations/interfaces/int_cumprod.h"
"src/c/matrixOperations/interfaces/int_triu.h"
"src/c/matrixOperations/interfaces/int_tril.h"
@@ -104,6 +105,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/elementaryFunctions/interfaces/int_nthroot.h"
"src/c/elementaryFunctions/interfaces/int_issquare.h"
"src/c/elementaryFunctions/interfaces/int_isscalar.h"
+ "src/c/elementaryFunctions/interfaces/int_isvector.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 3422a955..6b2495de 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -308,6 +308,12 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"src/c/matrixOperations/matrix/smatrixa.c"
"src/c/matrixOperations/matrix/u16matrixa.c"
"src/c/matrixOperations/matrix/zmatrixa.c"
+ "src/c/matrixOperations/nnz/dnnza.c"
+ "src/c/matrixOperations/nnz/dnnzs.c"
+ "src/c/matrixOperations/nnz/snnza.c"
+ "src/c/matrixOperations/nnz/snnzs.c"
+ "src/c/matrixOperations/nnz/znnza.c"
+ "src/c/matrixOperations/nnz/znnzs.c"
"src/c/matrixOperations/triu/dtriua.c"
"src/c/matrixOperations/triu/striua.c"
"src/c/matrixOperations/triu/u8triua.c"
@@ -816,6 +822,14 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"src/c/elementaryFunctions/iscolumn/ziscolumns.c"
"src/c/elementaryFunctions/iscolumn/u16iscolumna.c"
"src/c/elementaryFunctions/iscolumn/u16iscolumns.c"
+ "src/c/elementaryFunctions/isvector/disvectora.c"
+ "src/c/elementaryFunctions/isvector/disvectors.c"
+ "src/c/elementaryFunctions/isvector/gisvectors.c"
+ "src/c/elementaryFunctions/isvector/gisvectora.c"
+ "src/c/elementaryFunctions/isvector/sisvectors.c"
+ "src/c/elementaryFunctions/isvector/sisvectora.c"
+ "src/c/elementaryFunctions/isvector/zisvectora.c"
+ "src/c/elementaryFunctions/isvector/zisvectors.c"
"src/c/elementaryFunctions/ismatrix/dismatrixa.c"
"src/c/elementaryFunctions/ismatrix/dismatrixs.c"
//"src/c/elementaryFunctions/ismatrix/gismatrixs.c"
diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
index afcd3cab..69c3c0e1 100644
--- a/2.3-1/macros/findDeps/lib
+++ b/2.3-1/macros/findDeps/lib
Binary files differ
diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib
index 551263ea..f759663f 100644
--- a/2.3-1/macros/lib
+++ b/2.3-1/macros/lib
Binary files differ
generated by cgit (git 2.34.1) at 2024-12-20 04:00:56 +0000