Solved error of nnz

37 files changed, 53 insertions, 15 deletions

diff --git a/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar
index 0bffe90e..5693d3f9 100644
--- a/2.3-1/jar/scilab_en_US_help.jar
+++ b/2.3-1/jar/scilab_en_US_help.jar
diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib
deleted file mode 100644
index dee4362f..00000000
--- a/2.3-1/macros/ASTManagement/lib
+++ /dev/null
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
deleted file mode 100644
index 3d4fed1d..00000000
--- a/2.3-1/macros/CCodeGeneration/lib
+++ /dev/null
diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib
deleted file mode 100644
index ba3b9a5a..00000000
--- a/2.3-1/macros/ErrorMessages/lib
+++ /dev/null
diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
deleted file mode 100644
index 239105c8..00000000
--- a/2.3-1/macros/FunctionAnnotation/lib
+++ /dev/null
diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib
deleted file mode 100644
index 1c722dd0..00000000
--- a/2.3-1/macros/FunctionList/lib
+++ /dev/null
diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib
deleted file mode 100644
index 7586a91b..00000000
--- a/2.3-1/macros/GeneralFunctions/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib
deleted file mode 100644
index ed4c52b8..00000000
--- a/2.3-1/macros/Hardware/AVR/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Digital/lib b/2.3-1/macros/Hardware/RasberryPi/Digital/lib
deleted file mode 100644
index ba42ba7c..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Digital/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/I2C/lib b/2.3-1/macros/Hardware/RasberryPi/I2C/lib
deleted file mode 100644
index 561476c1..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/I2C/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib b/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib
deleted file mode 100644
index 97a61acb..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Misc/lib b/2.3-1/macros/Hardware/RasberryPi/Misc/lib
deleted file mode 100644
index c718615f..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Misc/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/SPI/lib b/2.3-1/macros/Hardware/RasberryPi/SPI/lib
deleted file mode 100644
index a16d474e..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/SPI/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Serial/lib b/2.3-1/macros/Hardware/RasberryPi/Serial/lib
deleted file mode 100644
index a007f001..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Serial/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Setup/lib b/2.3-1/macros/Hardware/RasberryPi/Setup/lib
deleted file mode 100644
index 83655c94..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Setup/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Shift/lib b/2.3-1/macros/Hardware/RasberryPi/Shift/lib
deleted file mode 100644
index 2b12025f..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Shift/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Soft/lib b/2.3-1/macros/Hardware/RasberryPi/Soft/lib
deleted file mode 100644
index 09ecede9..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Soft/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Timing/lib b/2.3-1/macros/Hardware/RasberryPi/Timing/lib
deleted file mode 100644
index d271c900..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Timing/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib b/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib
deleted file mode 100644
index e8db080c..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/lcd/lib b/2.3-1/macros/Hardware/RasberryPi/lcd/lib
deleted file mode 100644
index c2b693fa..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/lcd/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib b/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib
deleted file mode 100644
index 94dfda86..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib
deleted file mode 100644
index 49ed8116..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/mcp/lib b/2.3-1/macros/Hardware/RasberryPi/mcp/lib
deleted file mode 100644
index d411aad8..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/mcp/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/pcf/lib b/2.3-1/macros/Hardware/RasberryPi/pcf/lib
deleted file mode 100644
index da6a8dad..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/pcf/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/piGlow/lib b/2.3-1/macros/Hardware/RasberryPi/piGlow/lib
deleted file mode 100644
index 3f30f859..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/piGlow/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/pinMap/lib b/2.3-1/macros/Hardware/RasberryPi/pinMap/lib
deleted file mode 100644
index 133363e6..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/pinMap/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/pwm/lib b/2.3-1/macros/Hardware/RasberryPi/pwm/lib
deleted file mode 100644
index 8711baf0..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/pwm/lib
+++ /dev/null
diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib
deleted file mode 100644
index 40b7b0a1..00000000
--- a/2.3-1/macros/ImageProcessing/core/lib
+++ /dev/null
diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib
deleted file mode 100644
index 0d7f88a9..00000000
--- a/2.3-1/macros/ImageProcessing/highgui/lib
+++ /dev/null
diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib
deleted file mode 100644
index 63b5e7e9..00000000
--- a/2.3-1/macros/ImageProcessing/imgproc/lib
+++ /dev/null
diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib
deleted file mode 100644
index a62fd4e4..00000000
--- a/2.3-1/macros/Scilab-Arduino/lib
+++ /dev/null
diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib
deleted file mode 100644
index 4379c83d..00000000
--- a/2.3-1/macros/SymbolTable/lib
+++ /dev/null
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index e0e63d4e..aa80514e 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -7364,6 +7364,38 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 

 

 //------------------------------------

+//---- 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('d0'+ArgSeparator+'u160',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'u160',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'u160',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'u160',ClassFileName,'file','y');

+PrintStringInfo('z0'+ArgSeparator+'u160',ClassFileName,'file','y');

+PrintStringInfo('z2'+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 ---------------------

 //------------------------------------

 ClassName = 'TRIU';

diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
deleted file mode 100644
index 670a52e0..00000000
--- a/2.3-1/macros/ToolInitialization/lib
+++ /dev/null
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index fde9eb7c..cbb0a1ec 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"
@@ -804,12 +810,12 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/pmodulo/spmoduloa.c"
       "src/c/elementaryFunctions/pmodulo/i16pmodulos.c"
       "src/c/elementaryFunctions/pmodulo/i16pmoduloa.c"
-"src/c/elementaryFunctions/nanmax/dnanmaxa.c"
-"src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
-"src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
-"src/c/elementaryFunctions/nanmax/snanmaxa.c"
-"src/c/elementaryFunctions/nanmax/snanmaxcola.c"
-"src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
+      "src/c/elementaryFunctions/nanmax/dnanmaxa.c"
+      "src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
+      "src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
+      "src/c/elementaryFunctions/nanmax/snanmaxa.c"
+      "src/c/elementaryFunctions/nanmax/snanmaxcola.c"
+      "src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
       "src/c/elementaryFunctions/isscalar/disscalara.c"
       "src/c/elementaryFunctions/isscalar/disscalars.c"
       "src/c/elementaryFunctions/isscalar/gisscalars.c"
@@ -948,15 +954,15 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/statisticsFunctions/median/zmediana.c"
       "src/c/statisticsFunctions/median/zmediancola.c"
       "src/c/statisticsFunctions/median/zmedianrowa.c"
-"src/c/statisticsFunctions/mad/dmada.c"
-"src/c/statisticsFunctions/mad/dmadrowa.c"
-"src/c/statisticsFunctions/mad/dmadcola.c"
-"src/c/statisticsFunctions/mad/smada.c"
-"src/c/statisticsFunctions/mad/smadrowa.c"
-"src/c/statisticsFunctions/mad/smadcola.c"
-"src/c/statisticsFunctions/mad/zmada.c"
-"src/c/statisticsFunctions/mad/zmadrowa.c"
-"src/c/statisticsFunctions/mad/zmadcola.c"
+      "src/c/statisticsFunctions/mad/dmada.c"
+      "src/c/statisticsFunctions/mad/dmadrowa.c"
+      "src/c/statisticsFunctions/mad/dmadcola.c"
+      "src/c/statisticsFunctions/mad/smada.c"
+      "src/c/statisticsFunctions/mad/smadrowa.c"
+      "src/c/statisticsFunctions/mad/smadcola.c"
+      "src/c/statisticsFunctions/mad/zmada.c"
+      "src/c/statisticsFunctions/mad/zmadrowa.c"
+      "src/c/statisticsFunctions/mad/zmadcola.c"
       "src/c/statisticsFunctions/prod/srowproda.c"
       "src/c/statisticsFunctions/prod/drowproda.c"
       "src/c/statisticsFunctions/prod/dproda.c"
diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
deleted file mode 100644
index afcd3cab..00000000
--- a/2.3-1/macros/findDeps/lib
+++ /dev/null
diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib
deleted file mode 100644
index 551263ea..00000000
--- a/2.3-1/macros/lib
+++ /dev/null