update interface for statisticFunctions

7 files changed, 180 insertions, 28 deletions

diff --git a/src/statisticsFunctions/includes/mean.h b/src/statisticsFunctions/includes/mean.h
index 275d2ddb..049fc522 100644
--- a/src/statisticsFunctions/includes/mean.h
+++ b/src/statisticsFunctions/includes/mean.h
@@ -21,7 +21,7 @@
 */
 #define		smeans(in)			in
 #define		srowmeans(in)			in
-#define		scolumnsmeans(in)		in
+#define		scolumnmeans(in)		in
 #define		smatlabmeans(in)		in
 
 /*
@@ -29,7 +29,7 @@
 */
 #define		dmeans(in)			in
 #define		drowmeans(in)			in
-#define		dcolumnsmeans(in)		in
+#define		dcolumnmeans(in)		in
 #define		dmatlabmeans(in)		in
 
 /*
@@ -37,7 +37,7 @@
 */
 #define		cmeans(in)			in
 #define		crowmeans(in)			in
-#define		ccolumnsmeans(in)		in
+#define		ccolumnmeans(in)		in
 #define		cmatlabmeans(in)		in
 
 /*
@@ -45,7 +45,7 @@
 */
 #define		zmeans(in)			in
 #define		zrowmeans(in)			in
-#define		zcolumnsmeans(in)		in
+#define		zcolumnmeans(in)		in
 #define		zmatlabmeans(in)		in
 
 /*
diff --git a/src/statisticsFunctions/includes/prod.h b/src/statisticsFunctions/includes/prod.h
index b0410ae9..425dd970 100644
--- a/src/statisticsFunctions/includes/prod.h
+++ b/src/statisticsFunctions/includes/prod.h
@@ -21,7 +21,7 @@
 */
 #define		sprods(in)			in
 #define		srowprods(in)			in
-#define		scolumnsprods(in)		in
+#define		scolumnprods(in)		in
 #define		smatlabprods(in)			in
 
 /*
@@ -29,7 +29,7 @@
 */
 #define		dprods(in)			in
 #define		drowprods(in)			in
-#define		dcolumnsprods(in)		in
+#define		dcolumnprods(in)		in
 #define		dmatlabprods(in)			in
 
 /*
@@ -37,7 +37,7 @@
 */
 #define		cprods(in)			in
 #define		crowprods(in)			in
-#define		ccolumnsprods(in)		in
+#define		ccolumnprods(in)		in
 #define		cmatlabprods(in)			in
 
 /*
@@ -45,7 +45,7 @@
 */
 #define		zprods(in)			in
 #define		zrowprods(in)			in
-#define		zcolumnsprods(in)		in
+#define		zcolumnprods(in)		in
 #define		zmatlabprods(in)			in
 
 /*
diff --git a/src/statisticsFunctions/includes/sum.h b/src/statisticsFunctions/includes/sum.h
index 8df782cc..0e5876a3 100644
--- a/src/statisticsFunctions/includes/sum.h
+++ b/src/statisticsFunctions/includes/sum.h
@@ -22,7 +22,7 @@
 */
 #define		ssums(in)			in
 #define		srowsums(in)			in
-#define		scolumnssums(in)		in
+#define		scolumnsums(in)		in
 #define		smatlabsums(in)			in
 
 /*
@@ -30,7 +30,7 @@
 */
 #define		dsums(in)			in
 #define		drowsums(in)			in
-#define		dcolumnssums(in)		in
+#define		dcolumnsums(in)		in
 #define		dmatlabsums(in)			in
 
 /*
@@ -38,7 +38,7 @@
 */
 #define		csums(in)			in
 #define		crowsums(in)			in
-#define		ccolumnssums(in)		in
+#define		ccolumnsums(in)		in
 #define		cmatlabsums(in)			in
 
 /*
@@ -46,7 +46,7 @@
 */
 #define		zsums(in)			in
 #define		zrowsums(in)			in
-#define		zcolumnssums(in)		in
+#define		zcolumnsums(in)		in
 #define		zmatlabsums(in)			in
 
 /*
diff --git a/src/statisticsFunctions/interfaces/int_mean.h b/src/statisticsFunctions/interfaces/int_mean.h
index b4652ce6..bf196539 100644
--- a/src/statisticsFunctions/interfaces/int_mean.h
+++ b/src/statisticsFunctions/interfaces/int_mean.h
@@ -15,20 +15,41 @@
 #ifndef __INT_MEAN_H__
 #define __INT_MEAN_H__
 
-#define s0means0(in)			smeans(in)
+#define s0means0(in)					smeans(in)
 
-#define d0meand0(in)			dmeans(in)
+#define d0meand0(in)					dmeans(in)
 
-#define c0meanc0(in)			cmeans(in)
+#define c0meanc0(in)					cmeans(in)
 
-#define z0meanz0(in)			zmeans(in)
+#define z0meanz0(in)					zmeans(in)
 
-#define s2means0(in,size)		smeana(in, size[0]*size[1])
+#define s2means0(in,size)				smeana(in, size[0]*size[1])
 
-#define d2meand0(in,size)		dmeana(in, size[0]*size[1])
+#define d2meand0(in,size)				dmeana(in, size[0]*size[1])
 
-#define c2meanc0(in,size)		cmeana(in, size[0]*size[1])
+#define c2meanc0(in,size)				cmeana(in, size[0]*size[1])
 
-#define z2meanz0(in,size)		zmeana(in, size[0]*size[1])
+#define z2meanz0(in,size)				zmeana(in, size[0]*size[1])
+
+
+#define s0s0means0(in1,in2)				(in2==1) ? srowmeans(in1) : scolumnmeans(in1)	
+
+#define d0d0meand0(in1,in2)				(in2==1) ? drowmeans(in1) : dcolumnmeans(in1)	
+
+#define c0s0meanc0(in1,in2)				(in2==1) ? crowmeans(in1) : ccolumnmeans(in1)	
+
+#define z0d0meanz0(in1,in2)				(in2==1) ? zrowmeans(in1) : zcolumnmeans(in1)	
+
+#define s2s0means2(in1,size,in2,out)		(in2==1) ? srowmeana(in1,size[0],size[1],out) : scolumnmeana(in1,size[0],size[1],out)	
+
+#define d2d0meand2(in1,size,in2,out)		(in2==1) ? drowmeana(in1,size[0],size[1],out) : dcolumnmeana(in1,size[0],size[1],out)
+
+#define c2s0meanc2(in1,size,in2,out)		(in2==1) ? crowmeana(in1,size[0],size[1],out) : ccolumnmeana(in1,size[0],size[1],out)
+
+#define z2d0meanz2(in1,size,in2,out)		(in2==1) ? zrowmeana(in1,size[0],size[1],out) : zcolumnmeana(in1,size[0],size[1],out)	
+		
+		
+	
+	
 
 #endif /* !__INT_MEAN_H__ */
diff --git a/src/statisticsFunctions/interfaces/int_prod.h b/src/statisticsFunctions/interfaces/int_prod.h
new file mode 100644
index 00000000..cad1a740
--- /dev/null
+++ b/src/statisticsFunctions/interfaces/int_prod.h
@@ -0,0 +1,55 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
+ * 
+ * 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
+ *
+ */
+
+/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */
+
+#ifndef __INT_PROD_H__
+#define __INT_PROD_H__
+
+#define s0prods0(in)					sprods(in)
+
+#define d0prodd0(in)					dprods(in)
+
+#define c0prodc0(in)					cprods(in)
+	
+#define z0prodz0(in)					zprods(in)
+
+#define s2prods0(in,size)				sproda(in, size[0]*size[1])
+
+#define d2prodd0(in,size)				dproda(in, size[0]*size[1])
+
+#define c2prodc0(in,size)				cproda(in, size[0]*size[1])
+
+#define z2prodz0(in,size)				zproda(in, size[0]*size[1])
+
+	
+#define s0s0prods0(in1,in2)				(in2==1) ? srowprods(in1) : scolumnprods(in1)	
+
+#define d0d0prodd0(in1,in2)				(in2==1) ? drowprods(in1) : dcolumnprods(in1)	
+
+#define c0s0prodc0(in1,in2)				(in2==1) ? crowprods(in1) : ccolumnprods(in1)	
+
+#define z0d0prodz0(in1,in2)				(in2==1) ? zrowprods(in1) : zcolumnprods(in1)	
+
+#define s2s0prods2(in1,size,in2,out)		(in2==1) ? srowproda(in1,size[0],size[1],out) : scolumnproda(in1,size[0],size[1],out)	
+
+#define d2d0prodd2(in1,size,in2,out)		(in2==1) ? drowproda(in1,size[0],size[1],out) : dcolumnproda(in1,size[0],size[1],out)
+
+#define c2s0prodc2(in1,size,in2,out)		(in2==1) ? crowproda(in1,size[0],size[1],out) : ccolumnproda(in1,size[0],size[1],out)
+
+#define z2d0prodz2(in1,size,in2,out)		(in2==1) ? zrowproda(in1,size[0],size[1],out) : zcolumnproda(in1,size[0],size[1],out)	
+		
+		
+	
+	
+
+#endif /* !__INT_PROD_H__ */
diff --git a/src/statisticsFunctions/interfaces/int_sum.h b/src/statisticsFunctions/interfaces/int_sum.h
index b124245d..4a6240ea 100644
--- a/src/statisticsFunctions/interfaces/int_sum.h
+++ b/src/statisticsFunctions/interfaces/int_sum.h
@@ -15,20 +15,41 @@
 #ifndef __INT_SUM_H__
 #define __INT_SUM_H__
 
-#define s0sums0(in)			ssums(in)
+#define s0sums0(in)				ssums(in)
 
-#define d0sumd0(in)			dsums(in)
+#define d0sumd0(in)				dsums(in)
 
-#define c0sumc0(in)			csums(in)
+#define c0sumc0(in)				csums(in)
 
-#define z0sumz0(in)			zsums(in)
+#define z0sumz0(in)				zsums(in)
 
-#define s2sums0(in,size)		ssuma(in, size[0]*size[1])
+#define s2sums0(in,size)			ssuma(in, size[0]*size[1])
 
-#define d2sumd0(in,size)		dsuma(in, size[0]*size[1])
+#define d2sumd0(in,size)			dsuma(in, size[0]*size[1])
 
-#define c2sumc0(in,size)		csuma(in, size[0]*size[1])
+#define c2sumc0(in,size)			csuma(in, size[0]*size[1])
 
-#define z2sumz0(in,size)		zsuma(in, size[0]*size[1])
+#define z2sumz0(in,size)			zsuma(in, size[0]*size[1])
+
+
+#define s0s0sums0(in1,in2)			(in2==1) ? srowsums(in1) : scolumnsums(in1)	
+
+#define d0d0sumd0(in1,in2)			(in2==1) ? drowsums(in1) : dcolumnsums(in1)	
+
+#define c0s0sumc0(in1,in2)			(in2==1) ? crowsums(in1) : ccolumnsums(in1)	
+
+#define z0d0sumz0(in1,in2)			(in2==1) ? zrowsums(in1) : zcolumnsums(in1)	
+
+#define s2s0sums2(in1,size,in2,out)		(in2==1) ? srowsuma(in1,size[0],size[1],out) : scolumnsuma(in1,size[0],size[1],out)	
+
+#define d2d0sumd2(in1,size,in2,out)		(in2==1) ? drowsuma(in1,size[0],size[1],out) : dcolumnsuma(in1,size[0],size[1],out)
+
+#define c2s0sumc2(in1,size,in2,out)		(in2==1) ? crowsuma(in1,size[0],size[1],out) : ccolumnsuma(in1,size[0],size[1],out)
+
+#define z2d0sumz2(in1,size,in2,out)		(in2==1) ? zrowsuma(in1,size[0],size[1],out) : zcolumnsuma(in1,size[0],size[1],out)	
+		
+		
+	
+	
 
 #endif /* !__INT_SUM_H__ */
diff --git a/src/statisticsFunctions/interfaces/int_variance.h b/src/statisticsFunctions/interfaces/int_variance.h
new file mode 100644
index 00000000..5b30d5bb
--- /dev/null
+++ b/src/statisticsFunctions/interfaces/int_variance.h
@@ -0,0 +1,55 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
+ * 
+ * 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
+ *
+ */
+
+/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */
+
+#ifndef __INT_VARIANCE_H__
+#define __INT_VARIANCE_H__
+
+#define s0variances0(in)				svariances(in)
+
+#define d0varianced0(in)				dvariances(in)
+
+#define c0variancec0(in)				cvariances(in)
+	
+#define z0variancez0(in)				zvariances(in)
+
+#define s2variances0(in,size)				svariancea(in, size[0]*size[1])
+
+#define d2varianced0(in,size)				dvariancea(in, size[0]*size[1])
+
+#define c2variancec0(in,size)				cvariancea(in, size[0]*size[1])
+
+#define z2variancez0(in,size)				zvariancea(in, size[0]*size[1])
+
+	
+#define s0s0variances0(in1,in2)			(in2==1) ? srowvariances(in1) : scolumnvariances(in1)	
+
+#define d0d0varianced0(in1,in2)			(in2==1) ? drowvariances(in1) : dcolumnvariances(in1)	
+
+#define c0s0variancec0(in1,in2)			(in2==1) ? crowvariances(in1) : ccolumnvariances(in1)	
+
+#define z0d0variancez0(in1,in2)			(in2==1) ? zrowvariances(in1) : zcolumnvariances(in1)	
+
+#define s2s0variances2(in1,size,in2,out)		(in2==1) ? srowvariancea(in1,size[0],size[1],out) : scolumnvariancea(in1,size[0],size[1],out)	
+
+#define d2d0varianced2(in1,size,in2,out)		(in2==1) ? drowvariancea(in1,size[0],size[1],out) : dcolumnvariancea(in1,size[0],size[1],out)
+
+#define c2s0variancec2(in1,size,in2,out)		(in2==1) ? crowvariancea(in1,size[0],size[1],out) : ccolumnvariancea(in1,size[0],size[1],out)
+
+#define z2d0variancez2(in1,size,in2,out)		(in2==1) ? zrowvariancea(in1,size[0],size[1],out) : zcolumnvariancea(in1,size[0],size[1],out)	
+		
+		
+	
+	
+
+#endif /* !__INT_VARIANCE_H__ */