From 52563febd5b3700de00369d85cb32a031bdc1617 Mon Sep 17 00:00:00 2001
From: simon
Date: Mon, 24 Aug 2009 10:02:42 +0000
Subject: corrected the interfaces of somes of the operations functions

---
 src/c/operations/interfaces/int_OpBackSlash.h | 45 +++++++++++++--------------
 1 file changed, 21 insertions(+), 24 deletions(-)

(limited to 'src/c/operations/interfaces/int_OpBackSlash.h')

diff --git a/src/c/operations/interfaces/int_OpBackSlash.h b/src/c/operations/interfaces/int_OpBackSlash.h
index 217aaa34..8a733f28 100644
--- a/src/c/operations/interfaces/int_OpBackSlash.h
+++ b/src/c/operations/interfaces/int_OpBackSlash.h
@@ -37,47 +37,47 @@
 /* Scalar \ Matrix */
 
 #define s0s2OpBackSlashs2(in1,in2,size,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= sldivs(in1,in2[i]);}
+										for( i=0;i<size[0]*size[1];i++) out[i]= sldivs(in1,in2[i]);}
 
 #define d0d2OpBackSlashd2(in1,in2,size,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= dldivs(in1,in2[i]);}
+										for( i=0;i<size[0]*size[1];i++) out[i]= dldivs(in1,in2[i]);}
 									
 #define c0c2OpBackSlashc2(in1,in2,size,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= cldivs(in1,in2[i]);}
+										for( i=0;i<size[0]*size[1];i++) out[i]= cldivs(in1,in2[i]);}
 
 #define z0z2OpBackSlashz2(in1,in2,size,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= zldivs(in1,in2[i]);}
+										for( i=0;i<size[0]*size[1];i++) out[i]= zldivs(in1,in2[i]);}
 
 #define s0c2OpBackSlashc2(in1,in2,size,out)			c0c2OpBackSlashc2(FloatComplex(in1,0),in2,size,out)
 
-#define d0z2OpBackSlashz2(in1,in2,size,out)			z0z2OpBackSlashz2(DoubleCompelex(in1,0),in2,size,out)
+#define d0z2OpBackSlashz2(in1,in2,size,out)			z0z2OpBackSlashz2(DoubleComplex(in1,0),in2,size,out)
 
 #define c0s2OpBackSlashc2(in1,in2,size,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= cldivs(in1,FloatComplex(in2[i],0));}
+										for ( i=0;i<size[0]*size[1];i++) out[i]= cldivs(in1,FloatComplex(in2[i],0));}
 
 #define z0d2OpBackSlashz2(in1,in2,size,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= zldivs(in1,DoubleComplex(in2[i],0));}
+										for ( i=0;i<size[0]*size[1];i++) out[i]= zldivs(in1,DoubleComplex(in2[i],0));}
 
 
 /* Matrix \ Scalar */
 
-#define s2s0OpBackSlashs2(in1,size,in2,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= sldivs(in1[i],in2);}
+#define s2s0OpBackSlashs2(in1,size,in2,out)			{float temp[1] = {in2};\
+								sldivma(in1,size[0],size[1],temp,1,1,out);}
 
-#define d2d0OpBackSlashd2(in1,size,in2,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= dldivs(in1[i],in2);}
+#define d2d0OpBackSlashd2(in1,size,in2,out)			{double temp[1] = {in2};\
+								dldivma(in1,size[0],size[1],temp,1,1,out);}
 
 #define c2c0OpBackSlashc2(in1,size,in2,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= cldivs(in1[i],in2);}
+										for ( i=0;i<size[0]*size[1];i++) out[i]= cldivs(in1[i],in2);}
 
 #define z2z0OpBackSlashz2(in1,size,in2,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= zldivs(in1[i],in2);}
+										for ( i=0;i<size[0]*size[1];i++) out[i]= zldivs(in1[i],in2);}
 
 #define s2c0OpBackSlashc2(in1,size,in2,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= cldivs(FloatComplex(in1[i],0),in2);}
+										for ( i=0;i<size[0]*size[1];i++) out[i]= cldivs(FloatComplex(in1[i],0),in2);}
 
 #define d2z0OpBackSlashz2(in1,size,in2,out)			{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= zldivs(DoubleComplex(in1[i],0),in2);}
+										for ( i=0;i<size[0]*size[1];i++) out[i]= zldivs(DoubleComplex(in1[i],0),in2);}
 
 #define c2s0OpBackSlashc2(in1,size,in2,out)			c2c0OpBackSlashc2(in1,size,FloatComplex(in2,0),out)
 
@@ -93,19 +93,16 @@
 
 #define c2c2OpBackSlashc2(in1,size1,in2,size2,out)		cldivma(in1,size1[0],size1[1],in2,size2[0],size2[1],out)
 
-#define z2z2OpBackSlashz2(in1,size1,in2,size2,out)		zldivma(in1,size1[0],size1[1],in2,size2[0],size2[1],out)
+#define c2s2OpBackSlashc2(in1,size1,in2,size2,out)		cldivma(in1,size1[0],size1[1],FloatComplexMatrix(in2,0,size2[0]*size2[1]),size2[0],size2[1],out)
+
+#define s2c2OpBackSlashc2(in1,size1,in2,size2,out)		cldivma(FloatComplexMatrix(in1,0,size1[0]*size1[1]),size1[0],size1[1],in2,size2[0],size2[1],out)
 
-#define c2s2OpBackSlashc2(in1,size1,in2,size2,out)		{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= cldivs(in1[i],FloatComplex(in2[i],0));}
+#define z2z2OpBackSlashz2(in1,size1,in2,size2,out)		zldivma(in1,size1[0],size1[1],in2,size2[0],size2[1],out)
 
-#define s2c2OpBackSlashc2(in1,size1,in2,size2,out)		{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= cldivs(FloatComplex(in1[i],0),in2[i]);}
+#define z2d2OpBackSlashc2(in1,size1,in2,size2,out)		cldivma(in1,size1[0],size1[1],DoubleComplexMatrix(in2,0,size2[0]*size2[1]),size2[0],size2[1],out)
 
-#define z2d2OpBackSlashc2(in1,size1,in2,size2,out)		{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= zldivs(in1[i],DoubleComplex(in2[i],0));}
+#define d2z2OpBackSlashc2(in1,size1,in2,size2,out)		cldivma(DoubleComplexMatrix(in1,0,size1[0]*size1[1]),size1[0],size1[1],in2,size2[0],size2[1],out)
 
-#define d2z2OpBackSlashc2(in1,size1,in2,size2,out)		{int i;\
-										for(int i=0;i<size[0]*size[1];i++) out[i]= zldivs(DoubleComplex(in1[i],0),in2[i]);}
 
 
 
-- 
cgit