From 9a70aa3ff473b7bc72d849c2cc2ecece57d4c388 Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Fri, 14 Jul 2017 16:30:11 +0530 Subject: Isvector and NNZ added --- macros/ASTManagement/lib | Bin 2008 -> 1956 bytes macros/CCodeGeneration/lib | Bin 1056 -> 1004 bytes macros/ErrorMessages/lib | Bin 520 -> 468 bytes macros/FunctionAnnotation/lib | Bin 2412 -> 2360 bytes macros/FunctionList/lib | Bin 588 -> 536 bytes macros/GeneralFunctions/lib | Bin 1132 -> 1080 bytes macros/Hardware/AVR/lib | Bin 972 -> 920 bytes macros/Hardware/RasberryPi/lib | Bin 976 -> 924 bytes macros/ImageProcessing/core/lib | Bin 524 -> 472 bytes macros/ImageProcessing/highgui/lib | Bin 584 -> 532 bytes macros/ImageProcessing/imgproc/lib | Bin 752 -> 700 bytes macros/Scilab-Arduino/lib | Bin 716 -> 664 bytes macros/SymbolTable/lib | Bin 752 -> 700 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 77 +++++++++++++++++---- macros/ToolInitialization/lib | Bin 804 -> 752 bytes macros/findDeps/getAllHeaders.sci | 2 + macros/findDeps/getAllInterfaces.sci | 2 + macros/findDeps/getAllSources.sci | 14 ++++ macros/findDeps/lib | Bin 620 -> 568 bytes macros/lib | Bin 536 -> 484 bytes 20 files changed, 83 insertions(+), 12 deletions(-) (limited to 'macros') diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib index 5978ea72..e9d351a5 100644 Binary files a/macros/ASTManagement/lib and b/macros/ASTManagement/lib differ diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib index 31819793..f2696fef 100644 Binary files a/macros/CCodeGeneration/lib and b/macros/CCodeGeneration/lib differ diff --git a/macros/ErrorMessages/lib b/macros/ErrorMessages/lib index 794d4c01..1500b1fa 100644 Binary files a/macros/ErrorMessages/lib and b/macros/ErrorMessages/lib differ diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib index bb1f47c6..5eb9bc2f 100644 Binary files a/macros/FunctionAnnotation/lib and b/macros/FunctionAnnotation/lib differ diff --git a/macros/FunctionList/lib b/macros/FunctionList/lib index c3274f18..e101853b 100644 Binary files a/macros/FunctionList/lib and b/macros/FunctionList/lib differ diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib index 1cf5c1f5..846ca1b2 100644 Binary files a/macros/GeneralFunctions/lib and b/macros/GeneralFunctions/lib differ diff --git a/macros/Hardware/AVR/lib b/macros/Hardware/AVR/lib index 069c520e..53e56599 100644 Binary files a/macros/Hardware/AVR/lib and b/macros/Hardware/AVR/lib differ diff --git a/macros/Hardware/RasberryPi/lib b/macros/Hardware/RasberryPi/lib index 4c85475b..dc759fe8 100644 Binary files a/macros/Hardware/RasberryPi/lib and b/macros/Hardware/RasberryPi/lib differ diff --git a/macros/ImageProcessing/core/lib b/macros/ImageProcessing/core/lib index d80305c4..7f003c8e 100644 Binary files a/macros/ImageProcessing/core/lib and b/macros/ImageProcessing/core/lib differ diff --git a/macros/ImageProcessing/highgui/lib b/macros/ImageProcessing/highgui/lib index 1e7f7507..787c25fa 100644 Binary files a/macros/ImageProcessing/highgui/lib and b/macros/ImageProcessing/highgui/lib differ diff --git a/macros/ImageProcessing/imgproc/lib b/macros/ImageProcessing/imgproc/lib index a83978b5..93c83909 100644 Binary files a/macros/ImageProcessing/imgproc/lib and b/macros/ImageProcessing/imgproc/lib differ diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib index f3d5b2fc..5b7beab0 100644 Binary files a/macros/Scilab-Arduino/lib and b/macros/Scilab-Arduino/lib differ diff --git a/macros/SymbolTable/lib b/macros/SymbolTable/lib index e66158d4..c42cf1a5 100644 Binary files a/macros/SymbolTable/lib and b/macros/SymbolTable/lib differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 7dcae8a8..2af61403 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/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/macros/ToolInitialization/lib b/macros/ToolInitialization/lib index 670a52e0..267c9c9f 100644 Binary files a/macros/ToolInitialization/lib and b/macros/ToolInitialization/lib differ diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index 67444f93..986829ea 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/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/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index da910a0e..02c671f2 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/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/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 3422a955..6b2495de 100644 --- a/macros/findDeps/getAllSources.sci +++ b/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/macros/findDeps/lib b/macros/findDeps/lib index afcd3cab..69c3c0e1 100644 Binary files a/macros/findDeps/lib and b/macros/findDeps/lib differ diff --git a/macros/lib b/macros/lib index 551263ea..f759663f 100644 Binary files a/macros/lib and b/macros/lib differ -- cgit