Nanmin and Nanmean added

38 files changed, 112 insertions, 2 deletions

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

 

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

-// --- Class Nanmax. ---

+// --- Class Nanmin. ---

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

-ClassName = 'Nanmax';

+ClassName = 'Nanmin';

+

+// --- 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');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         2',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y');

+

+

+//PrintStringInfo('NIN=          2',ClassFileName,'file','y');

+//PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');

+

+//PrintStringInfo('NIN=          2',ClassFileName,'file','y');

+//PrintStringInfo('NOUT=         2',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');

+//PrintStringInfo('OUT(2).TP=    IN(1).TP',ClassFileName,'file','y');

+//PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');

+//PrintStringInfo('OUT(2).SZ(2)= ''2''',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('d2'+ArgSeparator+'d0d2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0d2',ClassFileName,'file','y');

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

+//PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'nanmin';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// -------------------

+// --- Class Nanmean. ---

+// -------------------

+ClassName = 'Nanmean';

 

 // --- Class Annotation. ---

 PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

@@ -1039,6 +1095,40 @@ PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
 PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');

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

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

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

+PrintStringInfo('z2g2'+ArgSeparator+'z2',ClassFileName,'file','y');

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'nanmean';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// -------------------

+// --- Class Nanmax. ---

+// -------------------

+ClassName = 'Nanmax';

+

+// --- 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');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=          2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');

+//---Function list class. ----

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

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

+

 

 

 // --- Annotation Function And Function List Function. ---

@@ -1046,6 +1136,9 @@ FunctionName = 'nanmax';
 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

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

 // --- Class Issquare. ---

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

diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
new file mode 100644
index 00000000..670a52e0
--- /dev/null
+++ b/2.3-1/macros/ToolInitialization/lib
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 90b80dfc..79c471db 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -134,6 +134,8 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/elementaryFunctions/includes/nthroot.h"
       "src/c/elementaryFunctions/includes/pmodulo.h"
       "src/c/elementaryFunctions/includes/nanmax.h"
+      "src/c/elementaryFunctions/includes/nanmean.h"
+      "src/c/elementaryFunctions/includes/nanmin.h"
       "src/c/elementaryFunctions/includes/issquare.h"
       "src/c/elementaryFunctions/includes/isscalar.h"
       "src/c/elementaryFunctions/includes/isvector.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 49829000..cd441478 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -105,6 +105,8 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_nthroot.h"
       "src/c/elementaryFunctions/interfaces/int_pmodulo.h"
       "src/c/elementaryFunctions/interfaces/int_nanmax.h"
+      "src/c/elementaryFunctions/interfaces/int_nanmean.h"
+      "src/c/elementaryFunctions/interfaces/int_nanmin.h"
       "src/c/elementaryFunctions/interfaces/int_issquare.h"
       "src/c/elementaryFunctions/interfaces/int_isscalar.h"
       "src/c/elementaryFunctions/interfaces/int_isvector.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index cbb0a1ec..ce73f5e5 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -816,6 +816,19 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/nanmax/snanmaxa.c"
       "src/c/elementaryFunctions/nanmax/snanmaxcola.c"
       "src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
+      "src/c/elementaryFunctions/nanmean/dnanmeana.c"
+      "src/c/elementaryFunctions/nanmean/dnanmeanrowa.c"
+      "src/c/elementaryFunctions/nanmean/dnanmeancola.c"
+      "src/c/elementaryFunctions/nanmean/snanmeana.c"
+      "src/c/elementaryFunctions/nanmean/snanmeanrowa.c"
+      "src/c/elementaryFunctions/nanmean/snanmeancola.c"
+      "src/c/elementaryFunctions/nanmean/znanmeana.c"
+      "src/c/elementaryFunctions/nanmean/znanmeanrowa.c"
+      "src/c/elementaryFunctions/nanmean/znanmeancola.c"
+      "src/c/elementaryFunctions/nanmin/dnanmina.c"
+      "src/c/elementaryFunctions/nanmin/dnanmins.c"
+      "src/c/elementaryFunctions/nanmin/dnanminnpa.c"
+      "src/c/elementaryFunctions/nanmin/dnanminnps.c"
       "src/c/elementaryFunctions/isscalar/disscalara.c"
       "src/c/elementaryFunctions/isscalar/disscalars.c"
       "src/c/elementaryFunctions/isscalar/gisscalars.c"
diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
new file mode 100644
index 00000000..afcd3cab
--- /dev/null
+++ b/2.3-1/macros/findDeps/lib
diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib
new file mode 100644
index 00000000..551263ea
--- /dev/null
+++ b/2.3-1/macros/lib