summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--2.3-1/demos/Brijesh_Demos/test_nanmin.sci12
-rw-r--r--2.3-1/jar/scilab_en_US_help.jarbin11210 -> 11210 bytes
-rw-r--r--2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci12
-rw-r--r--2.3-1/macros/findDeps/getAllSources.sci2
-rw-r--r--2.3-1/src/c/elementaryFunctions/includes/nanmin.h4
-rw-r--r--2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h2
-rw-r--r--2.3-1/src/c/elementaryFunctions/nanmin/dnanmincola.c36
-rw-r--r--2.3-1/src/c/elementaryFunctions/nanmin/dnanmincolnpa.c36
-rw-r--r--2.3-1/src/c/elementaryFunctions/nanmin/dnanminrowa.c36
-rw-r--r--2.3-1/src/c/elementaryFunctions/nanmin/dnanminrownpa.c36
10 files changed, 162 insertions, 14 deletions
diff --git a/2.3-1/demos/Brijesh_Demos/test_nanmin.sci b/2.3-1/demos/Brijesh_Demos/test_nanmin.sci
index 86517436..a77f0c90 100644
--- a/2.3-1/demos/Brijesh_Demos/test_nanmin.sci
+++ b/2.3-1/demos/Brijesh_Demos/test_nanmin.sci
@@ -1,16 +1,12 @@
function test_nanmin
disp('Datatype: Double');
- i1 = [%nan %nan; %nan %nan; %nan %nan];
- [o1, p1] = nanmin(i1);
- //o1 = nanmin(i1);
+ i1 = [ 1 2 %nan; 3 %nan -4; %nan 5 6];
+ //[o1, p1] = nanmin(i1,'c');
+ o1 = nanmin(i1);
disp(o1);
- disp(p1);
+ //disp(p1);
//disp('Datatype: Float');
//i2 = float([1 %nan;3 4;5 %nan]);
//o2 = nanmean(i2,'r');
//disp(o2);
- //disp('Datatype: Double complex');
- //i3 = [1 %nan %i;3 4+1*%i %nan;5 %nan %i];
- //o3 = nanmean(i3,'c');
- //disp(o3);
endfunction
diff --git a/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar
index ad09fc53..40bdb4a7 100644
--- a/2.3-1/jar/scilab_en_US_help.jar
+++ b/2.3-1/jar/scilab_en_US_help.jar
Binary files differ
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 9e31b31f..ae50deba 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1038,11 +1038,11 @@ 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= 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');
@@ -1059,7 +1059,7 @@ 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+'d2',ClassFileName,'file','y');
//PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index ce73f5e5..72ce0720 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -828,6 +828,8 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"src/c/elementaryFunctions/nanmin/dnanmina.c"
"src/c/elementaryFunctions/nanmin/dnanmins.c"
"src/c/elementaryFunctions/nanmin/dnanminnpa.c"
+ "src/c/elementaryFunctions/nanmin/dnanmincolnpa.c"
+ "src/c/elementaryFunctions/nanmin/dnanminrownpa.c"
"src/c/elementaryFunctions/nanmin/dnanminnps.c"
"src/c/elementaryFunctions/isscalar/disscalara.c"
"src/c/elementaryFunctions/isscalar/disscalars.c"
diff --git a/2.3-1/src/c/elementaryFunctions/includes/nanmin.h b/2.3-1/src/c/elementaryFunctions/includes/nanmin.h
index ba71bb0b..adeff6b5 100644
--- a/2.3-1/src/c/elementaryFunctions/includes/nanmin.h
+++ b/2.3-1/src/c/elementaryFunctions/includes/nanmin.h
@@ -28,6 +28,10 @@ double dnanminnpa(double* in, int row, int col);
double dnanmins(double in, double* pos);
double dnanminnps(double in);
+void dnanminrownpa(double *in, int row, int col, double* out);
+void dnanmincolnpa(double *in, int row, int col, double* out);
+
+
#ifdef __cplusplus
diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h
index 4e8018a9..408dac65 100644
--- a/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h
+++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h
@@ -21,6 +21,8 @@ extern "C" {
#define d0nanmind0d2(in1, pos) dnanmins(in1, pos)
#define d0nanmind0(in1) dnanminnps(in1)
+#define d2g2nanmind2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanminrownpa(in1, size1[0], size1[1], out) : dnanmincolnpa(in1, size1[0] , size1[1], out)
+//#define d2g2nanmind2d2(in1, size1, in2, size2, p, out) (in2[0]=='r') ? dnanminrowa(in1, size1[0], size1[1], p, out) : dnanmincola(in1, size1[0] , size1[1], p, out)
#ifdef __cplusplus
} /* extern "C" */
diff --git a/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincola.c b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincola.c
new file mode 100644
index 00000000..0c4d202f
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincola.c
@@ -0,0 +1,36 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution. The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Brijesh Gupta C R
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "nanmin.h"
+
+void dnanmincola(double *in, int row, int col, double *p, double *out)
+{
+ double inter[col];
+
+
+for(int i=0; i< row; i++)
+ {
+ for(int j=0 ; j< col; j++)
+ {
+ inter[j]= in[i+ (j*row)];
+
+ }
+ out[i]= dnanmina( inter, 1, col, p);
+
+ }
+
+
+}
+
diff --git a/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincolnpa.c b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincolnpa.c
new file mode 100644
index 00000000..3d1623c2
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincolnpa.c
@@ -0,0 +1,36 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution. The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Brijesh Gupta C R
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "nanmin.h"
+
+void dnanmincolnpa(double *in, int row, int col, double* out)
+{
+ double inter[col];
+
+
+for(int i=0; i< row; i++)
+ {
+ for(int j=0 ; j< col; j++)
+ {
+ inter[j]= in[i+ (j*row)];
+
+ }
+ out[i]= dnanminnpa( inter, 1, col);
+
+ }
+
+
+}
+
diff --git a/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrowa.c b/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrowa.c
new file mode 100644
index 00000000..d255ef14
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrowa.c
@@ -0,0 +1,36 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution. The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Brijesh Gupta C R
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "nanmin.h"
+
+void dnanminrowa(double *in, int row, int col, double *p, double *out)
+{
+ double inter[row];
+
+
+
+for(int i=0; i< col; i++)
+ {
+ for(int j=0 ; j< row; j++)
+ {
+ inter[j]= in[j+ (i*row)];
+
+ }
+ out[i]= dnanmina( inter, row, 1, p);
+
+ }
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrownpa.c b/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrownpa.c
new file mode 100644
index 00000000..fc46a0a4
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrownpa.c
@@ -0,0 +1,36 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution. The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Brijesh Gupta C R
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "nanmin.h"
+
+void dnanminrownpa(double *in, int row, int col, double* out)
+{
+ double inter[row];
+
+
+
+for(int i=0; i< col; i++)
+ {
+ for(int j=0 ; j< row; j++)
+ {
+ inter[j]= in[j+ (i*row)];
+
+ }
+ out[i]= dnanminnpa( inter, row, 1);
+
+ }
+
+
+}
generated by cgit (git 2.34.1) at 2024-12-20 07:50:21 +0000