summaryrefslogtreecommitdiff
path: root/2.3-1/macros
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros')
-rw-r--r--2.3-1/macros/ASTManagement/libbin2008 -> 0 bytes
-rw-r--r--2.3-1/macros/CCodeGeneration/libbin1056 -> 0 bytes
-rw-r--r--2.3-1/macros/ErrorMessages/libbin520 -> 0 bytes
-rw-r--r--2.3-1/macros/FunctionAnnotation/libbin2412 -> 0 bytes
-rw-r--r--2.3-1/macros/FunctionList/libbin588 -> 0 bytes
-rw-r--r--2.3-1/macros/GeneralFunctions/libbin1132 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/AVR/libbin972 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/Digital/libbin600 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/I2C/libbin704 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/Interrupt/libbin536 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/Misc/libbin564 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/SPI/libbin584 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/Serial/libbin692 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/Setup/libbin616 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/Shift/libbin568 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/Soft/libbin636 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/Timing/libbin596 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/gertBoard/libbin656 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/lcd/libbin776 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/lcd128x64/libbin800 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/libbin592 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/mcp/libbin608 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/pcf/libbin536 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/piGlow/libbin596 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/pinMap/libbin548 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/pwm/libbin608 -> 0 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/core/libbin524 -> 0 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/highgui/libbin584 -> 0 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/imgproc/libbin752 -> 0 bytes
-rw-r--r--2.3-1/macros/Scilab-Arduino/libbin716 -> 0 bytes
-rw-r--r--2.3-1/macros/SymbolTable/libbin752 -> 0 bytes
-rw-r--r--2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci86
-rw-r--r--2.3-1/macros/ToolInitialization/libbin804 -> 0 bytes
-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.sci17
-rw-r--r--2.3-1/macros/findDeps/libbin620 -> 0 bytes
-rw-r--r--2.3-1/macros/libbin536 -> 0 bytes
38 files changed, 87 insertions, 18 deletions
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index ae50deba..0a738960 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1044,14 +1044,14 @@ 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');
+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)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');
//---Function list class. ----
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
@@ -1060,6 +1060,7 @@ 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');
//PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
@@ -1070,10 +1071,11 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
// -------------------
-// --- Class Nanmean. ---
+// --- Class Nanmax. ---
// -------------------
-ClassName = 'Nanmean';
+ClassName = 'Nanmax';
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -1084,32 +1086,62 @@ 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)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',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');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+
+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s0s2',ClassFileName,'file','y');
+PrintStringInfo('s0'+ArgSeparator+'s0s2',ClassFileName,'file','y');
PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('z2'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('z2g2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('s2g2'+ArgSeparator+'s2s2',ClassFileName,'file','y');
+PrintStringInfo('s2g2'+ArgSeparator+'s2s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
-FunctionName = 'nanmean';
+FunctionName = 'nanmax';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
// -------------------
-// --- Class Nanmax. ---
+// --- Class Nanmean. ---
// -------------------
-ClassName = 'Nanmax';
+ClassName = 'Nanmean';
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -1120,6 +1152,15 @@ 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(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).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');
@@ -1128,17 +1169,21 @@ PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,
//---Function list class. ----
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
-
+PrintStringInfo('d2'+ArgSeparator+'d0d2',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 = 'nanmax';
+FunctionName = 'nanmean';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
// -------------------
// --- Class Issquare. ---
// -------------------
@@ -2075,6 +2120,11 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+FunctionName = 'nanmedian'; // BJ : Done AS : Float_Done
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
FunctionName = 'st_deviation'; // BJ : Not implemented
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
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
Binary files differ
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 79c471db..22daaade 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -148,6 +148,7 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/statisticsFunctions/includes/sum.h"
"src/c/statisticsFunctions/includes/mean.h"
"src/c/statisticsFunctions/includes/median.h"
+ "src/c/statisticsFunctions/includes/nanmedian.h"
"src/c/statisticsFunctions/includes/mad.h"
"src/c/statisticsFunctions/includes/meanf.h"
"src/c/statisticsFunctions/includes/stdevf.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index cd441478..fe181bc9 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -137,6 +137,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/elementaryFunctions/interfaces/int_isequal.h"
"src/c/statisticsFunctions/interfaces/int_mean.h"
"src/c/statisticsFunctions/interfaces/int_median.h"
+ "src/c/statisticsFunctions/interfaces/int_nanmedian.h"
"src/c/statisticsFunctions/interfaces/int_mad.h"
"src/c/statisticsFunctions/interfaces/int_meanf.h"
"src/c/statisticsFunctions/interfaces/int_stdevf.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 72ce0720..a71031c7 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -811,11 +811,19 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"src/c/elementaryFunctions/pmodulo/i16pmodulos.c"
"src/c/elementaryFunctions/pmodulo/i16pmoduloa.c"
"src/c/elementaryFunctions/nanmax/dnanmaxa.c"
+ "src/c/elementaryFunctions/nanmax/dnanmax1a.c"
+ "src/c/elementaryFunctions/nanmax/dnanmax2a.c"
"src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
"src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
+ "src/c/elementaryFunctions/nanmax/dnanmaxcol1a.c"
+ "src/c/elementaryFunctions/nanmax/dnanmaxrow1a.c"
"src/c/elementaryFunctions/nanmax/snanmaxa.c"
+ "src/c/elementaryFunctions/nanmax/snanmax1a.c"
+ "src/c/elementaryFunctions/nanmax/snanmax2a.c"
"src/c/elementaryFunctions/nanmax/snanmaxcola.c"
"src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
+ "src/c/elementaryFunctions/nanmax/snanmaxcol1a.c"
+ "src/c/elementaryFunctions/nanmax/snanmaxrow1a.c""
"src/c/elementaryFunctions/nanmean/dnanmeana.c"
"src/c/elementaryFunctions/nanmean/dnanmeanrowa.c"
"src/c/elementaryFunctions/nanmean/dnanmeancola.c"
@@ -969,6 +977,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/nanmedian/dnanmediana.c"
+ "src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c"
+ "src/c/statisticsFunctions/nanmedian/dnanmediancola.c"
+ "src/c/statisticsFunctions/nanmedian/snanmediana.c"
+ "src/c/statisticsFunctions/nanmedian/snanmedianrowa.c"
+ "src/c/statisticsFunctions/nanmedian/snanmediancola.c"
+ "src/c/statisticsFunctions/nanmedian/znanmediana.c"
+ "src/c/statisticsFunctions/nanmedian/znanmediancola.c"
+ "src/c/statisticsFunctions/nanmedian/znanmedianrowa.c"
"src/c/statisticsFunctions/mad/dmada.c"
"src/c/statisticsFunctions/mad/dmadrowa.c"
"src/c/statisticsFunctions/mad/dmadcola.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
Binary files differ
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
Binary files differ