From 92b9e0a1244d075ee22be7f72c37d702f004ac40 Mon Sep 17 00:00:00 2001
From: torset
Date: Wed, 14 Jan 2009 10:25:55 +0000
Subject: update interface for statisticFunctions

---
 src/statisticsFunctions/interfaces/int_mean.h | 37 +++++++++++++++++++++------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'src/statisticsFunctions/interfaces/int_mean.h')

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__ */
-- 
cgit