Merged

21 files changed, 333 insertions, 0 deletions

diff --git a/2.3-1/demos/Brijesh_Demos/test_moment.sci b/2.3-1/demos/Brijesh_Demos/test_moment.sci
new file mode 100644
index 00000000..35e0d7aa
--- /dev/null
+++ b/2.3-1/demos/Brijesh_Demos/test_moment.sci
@@ -0,0 +1,14 @@
+function test_moment
+	disp('Datatype: Double');
+	i1 = [1 2 3; 4 5 6];
+	o1 = moment(i1,1,'r');
+	disp(o1);
+	disp('Datatype: float');
+	i2 = float([1 2 3; 4 5 6]);
+	o2 = moment(i2,1,'r');
+	disp(o2);
+	disp('Datatype: Double Complex');
+	i3 = [0 %i 3+4*%i;%i 5+%i 6+%i];
+	o3 = moment(i3,1,'r');
+	disp(o3);
+endfunction
diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index aa810b42..4b038ad4 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/includes/sci2clib.h
@@ -635,6 +635,9 @@ extern "C" {
 /* interfacing median */
 #include "median.h"
 #include "int_median.h"
+/* interfacing moment */
+#include "moment.h"
+#include "int_moment.h"
 /* interfacing nanmedian */
 #include "nanmedian.h"
 #include "int_nanmedian.h"
diff --git a/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar
index 86e1c60f..0217990c 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/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 71d918c2..5539ddae 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1015,6 +1015,46 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 

 

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

+// --- Class MOMENT. ---

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

+ClassName = 'moment';

+

+// --- Class Annotation. ---

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

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+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)= ''1''',ClassFileName,'file','y');

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

+

+PrintStringInfo('NIN=          3',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(3).VAL)',ClassFileName,'file','y');

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

+

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

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

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

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

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

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

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

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

+

+

+

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

+FunctionName = 'moment';

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

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

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

+

+

+

+

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

 // --- Class Nanmin. ---

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

 ClassName = 'Nanmin';

diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 5869aba1..83a86b7e 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -160,6 +160,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/statisticsFunctions/includes/dynlib_statisticsfunctions.h"
       "src/c/statisticsFunctions/includes/statMax.h"
       "src/c/statisticsFunctions/includes/statMin.h"
+      "src/c/statisticsFunctions/includes/moment.h"
       "src/c/operations/includes/subtraction.h"
       "src/c/operations/includes/addition.h"
       "src/c/operations/includes/dynlib_operations.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index b31fb92e..d0bc1ca1 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -148,6 +148,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/statisticsFunctions/interfaces/int_prod.h"
       "src/c/statisticsFunctions/interfaces/int_variance.h"
       "src/c/statisticsFunctions/interfaces/int_sum.h"
+      "src/c/statisticsFunctions/interfaces/int_moment.h"
       "src/c/operations/interfaces/int_OpEqual.h"
       "src/c/operations/interfaces/int_OpLogNot.h"
       "src/c/operations/interfaces/int_OpLogEq.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index fbc71eb6..5cdcd94b 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -1067,6 +1067,15 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/statisticsFunctions/stdevf/zrowstdevfa.c"
       "src/c/statisticsFunctions/stdevf/ccolumnstdevfa.c"
       "src/c/statisticsFunctions/stdevf/scolumnstdevfa.c"
+      "src/c/statisticsFunctions/moment/dmoments.c"
+      "src/c/statisticsFunctions/moment/dmomentrowa.c"
+      "src/c/statisticsFunctions/moment/dmomentcola.c"
+      "src/c/statisticsFunctions/moment/smoments.c"
+      "src/c/statisticsFunctions/moment/smomentrowa.c"
+      "src/c/statisticsFunctions/moment/smomentcola.c"
+      "src/c/statisticsFunctions/moment/zmoments.c"
+      "src/c/statisticsFunctions/moment/zmomentrowa.c"
+      "src/c/statisticsFunctions/moment/zmomentcola.c"
       "src/c/operations/multiplication/cmula.c"
       "src/c/operations/multiplication/cmuls.c"
       "src/c/operations/multiplication/cmulv.c"
diff --git a/2.3-1/src/c/statisticsFunctions/includes/moment.h b/2.3-1/src/c/statisticsFunctions/includes/moment.h
new file mode 100644
index 00000000..3f419d06
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/includes/moment.h
@@ -0,0 +1,42 @@
+ /* Copyright (C) 2017 - 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
+ */
+
+#ifndef __MOMENT_H__
+#define __MOMENT_H__
+#include "types.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+#include "pow.h"
+#include "addition.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+double dmoments (double* inp, int size, double ord);
+void dmomentrowa (double* inp, int row, int col, double ord, double* out);
+void dmomentcola (double* inp, int row, int col, double ord, double* out);
+
+float smoments (float* inp, int size, double ord);
+void smomentrowa (float* inp, int row, int col, double ord, float* out);
+void smomentcola (float* inp, int row, int col, double ord, float* out);
+
+doubleComplex zmoments (doubleComplex* inp, int size, double ord);
+void zmomentrowa (doubleComplex* inp, int row, int col, double ord, doubleComplex* out);
+void zmomentcola (doubleComplex* inp, int row, int col, double ord, doubleComplex* out);
+
+
+#ifdef  __cplusplus 
+} /* extern "C" */
+#endif
+
+#endif /*__MOMENT_H__*/
diff --git a/2.3-1/src/c/statisticsFunctions/interfaces/int_moment.h b/2.3-1/src/c/statisticsFunctions/interfaces/int_moment.h
new file mode 100644
index 00000000..5e9a0362
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/interfaces/int_moment.h
@@ -0,0 +1,33 @@
+ /* Copyright (C) 2017 - 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
+ */
+#ifndef __INT_MOMENT_H__
+#define __INT_MOMENT_H__
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define d2d0momentd0(in1,size,in2) 				dmoments(in1,size[0]*size[1], in2)
+#define d2d0g2momentd2(in1, size, in2, in3, size2 ,out)		(in3[0] == 'r') ? dmomentrowa(in1, size[0], size[1], in2, out) :  dmomentcola(in1, size[0], size[1], in2, out)	
+
+#define s2d0moments0(in1,size,in2) 				smoments(in1,size[0]*size[1], in2)
+#define s2d0g2moments2(in1, size, in2, in3, size2 ,out)		(in3[0] == 'r') ? smomentrowa(in1, size[0], size[1], in2, out) :  smomentcola(in1, size[0], size[1], in2, out)	
+
+#define z2d0momentz0(in1,size,in2) 				zmoments(in1,size[0]*size[1], in2)
+#define z2d0g2momentz2(in1, size, in2, in3, size2 ,out)		(in3[0] == 'r') ? zmomentrowa(in1, size[0], size[1], in2, out) :  zmomentcola(in1, size[0], size[1], in2, out)	
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*__INT_MOMENT_H__*/
diff --git a/2.3-1/src/c/statisticsFunctions/moment/dmomentcola.c b/2.3-1/src/c/statisticsFunctions/moment/dmomentcola.c
new file mode 100644
index 00000000..538328e3
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/dmomentcola.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+
+void dmomentcola (double* inp, int row, int col, double ord, double* out)
+{
+    double vect[col];
+    for(int i = 0; i < row ; i++)
+    {
+	for(int j = 0; j < col ; j++)
+	{
+	    vect[j] = inp[i + j*row];
+	}
+	out[i] = dmoments(vect, col, ord);
+    }
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/moment/dmomentrowa.c b/2.3-1/src/c/statisticsFunctions/moment/dmomentrowa.c
new file mode 100644
index 00000000..811aac39
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/dmomentrowa.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+
+void dmomentrowa (double* inp, int row, int col, double ord, double* out)
+{
+    double vect[row];
+    for(int i = 0; i < col ; i++)
+    {
+	for(int j = 0; j < row ; j++)
+	{
+	    vect[j] = inp[j + i*row];
+	}
+	out[i] = dmoments(vect, row, ord);
+    }
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/moment/dmoments.c b/2.3-1/src/c/statisticsFunctions/moment/dmoments.c
new file mode 100644
index 00000000..b9d8564a
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/dmoments.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+
+
+double dmoments (double* inp, int size, double ord)
+{
+    double sum = 0;
+
+    for(int i = 0; i < size; i++)
+    {
+        sum = sum + pow(inp[i], ord);
+    }
+
+    return sum/size;
+}
diff --git a/2.3-1/src/c/statisticsFunctions/moment/smomentcola.c b/2.3-1/src/c/statisticsFunctions/moment/smomentcola.c
new file mode 100644
index 00000000..4255782c
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/smomentcola.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+
+void smomentcola (float* inp, int row, int col, double ord, float* out)
+{
+    float vect[col];
+    for(int i = 0; i < row ; i++)
+    {
+	for(int j = 0; j < col ; j++)
+	{
+	    vect[j] = inp[i + j*row];
+	}
+	out[i] = smoments(vect, col, ord);
+    }
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/moment/smomentrowa.c b/2.3-1/src/c/statisticsFunctions/moment/smomentrowa.c
new file mode 100644
index 00000000..574ebe76
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/smomentrowa.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+
+void smomentrowa (float* inp, int row, int col, double ord, float* out)
+{
+    float vect[row];
+    for(int i = 0; i < col ; i++)
+    {
+	for(int j = 0; j < row ; j++)
+	{
+	    vect[j] = inp[j + i*row];
+	}
+	out[i] = smoments(vect, row, ord);
+    }
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/moment/smoments.c b/2.3-1/src/c/statisticsFunctions/moment/smoments.c
new file mode 100644
index 00000000..aee9dc9e
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/smoments.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+
+
+float smoments (float* inp, int size, double ord)
+{
+    float sum = 0;
+
+    for(int i = 0; i < size; i++)
+    {
+        sum = sum + pow(inp[i], ord);
+    }
+
+    return sum/size;
+}
diff --git a/2.3-1/src/c/statisticsFunctions/moment/zmomentcola.c b/2.3-1/src/c/statisticsFunctions/moment/zmomentcola.c
new file mode 100644
index 00000000..2b3cebb1
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/zmomentcola.c
@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+
+void zmomentcola (doubleComplex* inp, int row, int col, double ord, doubleComplex* out)
+{
+    double vect[col];
+    for(int i = 0; i < row ; i++)
+    {
+	for(int j = 0; j < col ; j++)
+	{
+	    vect[j] = inp[i + j*row];
+	}
+	out[i] = zmoments(vect, col, ord);
+    }
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/moment/zmomentrowa.c b/2.3-1/src/c/statisticsFunctions/moment/zmomentrowa.c
new file mode 100644
index 00000000..e1e1b47d
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/zmomentrowa.c
@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+
+void zmomentrowa (doubleComplex* inp, int row, int col, double ord, doubleComplex* out)
+{
+    doubleComplex vect[row];
+    for(int i = 0; i < col ; i++)
+    {
+	for(int j = 0; j < row ; j++)
+	{
+	    vect[j] = inp[j + i*row];
+	}
+	out[i] = zmoments(vect, row, ord);
+    }
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/moment/zmoments.c b/2.3-1/src/c/statisticsFunctions/moment/zmoments.c
new file mode 100644
index 00000000..1b847376
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/moment/zmoments.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "moment.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+#include "pow.h"
+#include "addition.h"
+#include "division.h"
+
+
+doubleComplex zmoments (doubleComplex* inp, int size, double ord)
+{
+    doubleComplex sum = DoubleComplex(0,0);
+
+    for(int i = 0; i < size; i++)
+    {
+        sum = zadds(sum,zpows(inp[i], ord));
+    }
+
+    return zrdivs(sum,size);
+}
diff --git a/2.3-1/tests/unit_tests/inter.sce b/2.3-1/tests/unit_tests/inter.sce
new file mode 100644
index 00000000..b5a797d9
--- /dev/null
+++ b/2.3-1/tests/unit_tests/inter.sce
@@ -0,0 +1,11 @@
+//test for interp1
+function inter()
+    x=linspace(1,3,3)  //declaring a 1-D array 
+    disp(x)
+    y=x.^2            //values for y at equivalent value for x
+    disp(y)
+    xx=linspace(1,2,4)  // new points for that we have too find values using interpolation
+    disp(xx)
+    yy1=interp1(x,y,xx)  //calling interp1
+    disp(yy1)
+endfunction
diff --git a/2.3-1/tests/unit_tests/power.sce b/2.3-1/tests/unit_tests/power.sce
new file mode 100644
index 00000000..b83b2c91
--- /dev/null
+++ b/2.3-1/tests/unit_tests/power.sce
@@ -0,0 +1,5 @@
+//test for scilab function nextpow2
+function power()
+    x = nextpow2([127 5])    		//calling nextpow2
+    disp(x)
+endfunction
diff --git a/2.3-1/tests/unit_tests/test_isreal.sce b/2.3-1/tests/unit_tests/test_isreal.sce
new file mode 100644
index 00000000..2d76f36a
--- /dev/null
+++ b/2.3-1/tests/unit_tests/test_isreal.sce
@@ -0,0 +1,6 @@
+//test file for isreal function
+function test_isreal()
+    a=10			// declare a varible and check it real or imaginary
+    y=isreal(a)			// call for isreal
+    disp(y)			// display output
+endfunction