From 6e42461ffe6be123c317df22208920bb42e0149b Mon Sep 17 00:00:00 2001
From: jofret
Date: Fri, 5 Jun 2009 09:58:16 +0000
Subject: OpLogEq management

---
 includes/sci2clib.h                       | 10 +++-
 macros/CFiles/sci2cincludes/OpLogEq.h     | 94 -------------------------------
 macros/findDeps/getAllInterfaces.sci      |  1 +
 src/c/operations/interfaces/int_OpLogEq.h | 94 +++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 96 deletions(-)
 delete mode 100644 macros/CFiles/sci2cincludes/OpLogEq.h
 create mode 100644 src/c/operations/interfaces/int_OpLogEq.h

diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index f12afe47..6ff407c4 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -1,9 +1,11 @@
+#ifndef __SCI2CLIB_H__
+#define __SCI2CLIB_H__
+
 #define SCI2Cint int
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 /* #include "SCI2CMacroInterface.h"
 */
-/* #include "constant.h"
 */
 /* #include "notFound.h"
 */
 /* #include "doubleComplex.h"
 */
 /* #include "floatComplex.h"
 */
@@ -23,6 +25,8 @@
 /* #include "OpLogNot.h"
 */
 /* #include "ConvertPrecision.h" */
 
+/* CONSTANT */
+#include "constant.h"
 
 /* LIB */
 /* interfacing lapack */
@@ -178,7 +182,8 @@
 #include "int_OpDotSlash.h"
 #include "int_OpBackSlash.h"
 #include "int_OpDotBackSlash.h"
-
+/* interfacing comparison */
+#include "int_OpLogEq.h"
 
 
 /* MATRIX OPERATIONS */
@@ -268,3 +273,4 @@
 /* interfacing imag */
 #include "int_imag.h"
 
+#endif /* !__SCI2CLIB_H__ */
diff --git a/macros/CFiles/sci2cincludes/OpLogEq.h b/macros/CFiles/sci2cincludes/OpLogEq.h
deleted file mode 100644
index b15a8b6a..00000000
--- a/macros/CFiles/sci2cincludes/OpLogEq.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-**  -*- C -*-
-**
-** 
-** Made by  Raffaele.Nutricato@tiscali.it
-**
-** Copyright Raffaele Nutricato
-*/
-/* Modified by Arnaud Torset */
-
-
-#ifndef __OPLOGEQ_H__
-#define __OPLOGEQ_H__
-
-#include "floatComplex.h"
-#include "doubleComplex.h"
-
-#define s0s0OpLogEqs0(in1,in2)	 (float)  (in1 == in2)
-#define d0d0OpLogEqd0(in1,in2)	 (double)  (in1 == in2)
-#define c0c0OpLogEqs0(in1,in2) 	 (float)  ((creals(in1) == creals(in2)) && (cimags(in1) == cimags(in2)))
-#define z0z0OpLogEqd0(in1,in2) 	 (double)  ((zreals(in1) == zreals(in2)) && (zimags(in1) == zimags(in2)))
-
-#define s0c0OpLogEqs0(in1,in2)	(float) ((in1==creals(in2)) && (0==cimags(in2)))
-#define d0z0OpLogEqd0(in1,in2)	(double) ((in1==zreals(in2)) && (0==zimags(in2)))
-#define c0s0OpLogEqs0(in1,in2)	s0c0OpLogEqs0(in2,in1)
-#define z0d0OpLogEqd0(in1,in2)	d0z0OpLogEqd0(in2,in1)
-
-
-
-#define s2s0OpLogEqs2(in1,size,in2,out) 	{int i;\
-							for (i=0;i<size[0]*size[1];i++) out[i]=(float)(in1[i]==in2);\
-							}
-#define d2d0OpLogEqd2(in1,size,in2,out) 	{int i;\
-							for (i=0;i<size[0]*size[1];i++) out[i]=(double)(in1[i]==in2);\
-							}								
-#define c2c0OpLogEqs2(in1,size,in2,out) 	{int i;\
-							for (i=0;i<size[0]*size[1];i++) out[i]=(float)((creals(in1[i])==creals(in2))&&(cimags(in1[i])==cimags(in2)));\
-							}		
-#define z2z0OpLogEqd2(in1,size,in2,out) 	{int i;\
-							for (i=0;i<size[0]*size[1];i++) out[i]=(double)((zreals(in1[i])==zreals(in2))&&(zimags(in1[i])==zimags(in2)));\
-							}
-
-		
-#define c2s0OpLogEqs2(in1,size,in2,out)		c2c0OpLogEqs2(in1,size,FloatComplex(in2,0),out)		
-#define z2d0OpLogEqd2(in1,size,in2,out)		z2z0OpLogEqd2(in1,size,DoubleComplex(in2,0),out)
-
-#define s2c0OpLogEqs2(in1,size,in2,out) 		{int i;\
-								for (i=0;i<size[0]*size[1];i++) out[i]=(float)((in1[i]==creals(in2))&&(cimags(in2)==0));\
-								}
-	
-#define d2z0OpLogEqd2(in1,size,in2,out) 		{int i;\
-								for (i=0;i<size[0]*size[1];i++) out[i]=(double)((in1[i]==zreals(in2))&&(zimags(in2)==0));\
-								}
-
-
-
-#define  s0s2OpLogEqs2(in1,in2,inSize,out) 	s2s0OpLogEqs2(in2,inSize,in1,out)
-#define  c0s2OpLogEqs2(in1,in2,inSize,out)  	s2c0OpLogEqs2(in2,inSize,in1,out)
-#define  d0d2OpLogEqd2(in1,in2,inSize,out)  	d2d0OpLogEqd2(in2,inSize,in1,out)
-#define  z0d2OpLogEqd2(in1,in2,inSize,out)  	d2z0OpLogEqd2(in2,inSize,in1,out)
-#define  s0c2OpLogEqs2(in1,in2,inSize,out)  	c2s0OpLogEqs2(in2,inSize,in1,out)
-#define  c0c2OpLogEqs2(in1,in2,inSize,out)  	c2c0OpLogEqs2(in2,inSize,in1,out)
-#define  d0z2OpLogEqd2(in1,in2,inSize,out)  	z2d0OpLogEqd2(in2,inSize,in1,out)
-#define  z0z2OpLogEqd2(in1,in2,inSize,out) 	z2z0OpLogEqd2(in2,inSize,in1,out)
-
-/* we must have size1=size2 */
-
-#define s2s2OpLogEqs2(in1,size1,in2,size2,out)	{int i;\
-								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(float)(in1[i]==in2[i]);\
-								}
-#define d2d2OpLogEqd2(in1,size1,in2,size2,out)	{int i;\
-								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(double)(in1[i]==in2[i]);\
-								}
-#define c2c2OpLogEqs2(in1,size1,in2,size2,out) 	{int i;\
-								for (i=0;i<size1[0]*size2[1];i++) \
-									out[i]=(float)((creals(in1[i])==creals(in2[i]))&&(cimags(in1[i])==cimags(in2[i])));\
-								}
-#define z2z2OpLogEqd2(in1,size1,in2,size2,out) 	{int i;\
-								for (i=0;i<size1[0]*size2[1];i++) \
-									out[i]=(double)((zreals(in1[i])==zreals(in2[i]))&&(zimags(in1[i])==zimags(in2[i])));\
-								}
-					
-#define s2c2OpLogEqs2(in1,size1,in2,size2,out) 	{int i;\
-								for (i=0;i<size1[0]*size2[1];i++) \
-									out[i]=(float)((in1[i]==creals(in2[i]))&&(0==cimags(in2[i])));\
-								}
-#define d2z2OpLogEqd2(in1,size1,in2,size2,out) 	{int i;\
-								for (i=0;i<size1[0]*size2[1];i++) \
-									out[i]=(double)((in1[i]==zreals(in2[i]))&&(0==zimags(in2[i])));\
-								}
-					
-#define  c2s2OpLogEqs2(in1,size1,in2,size2,out)		s2c2OpLogEqs2(in2,size2,in1,size1,out)	
-#define  z2d2OpLogEqd2(in1,size1,in2,size2,out)		d2z2OpLogEqd2(in2,size2,in1,size1,out)
-#endif /* !__OPLOGGT_H__ */
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index e1cce77b..7fc5afd0 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -81,6 +81,7 @@ function allInterfaces = getAllInterfaces()
       "src/c/statisticsFunctions/interfaces/int_variance.h"
       "src/c/statisticsFunctions/interfaces/int_sum.h"
       "src/c/operations/interfaces/int_OpEqual.h"
+      "src/c/operations/interfaces/int_OpLogEq.h"
       "src/c/operations/interfaces/int_OpDotStar.h"
       "src/c/operations/interfaces/int_OpDotSlash.h"
       "src/c/operations/interfaces/int_OpBackSlash.h"
diff --git a/src/c/operations/interfaces/int_OpLogEq.h b/src/c/operations/interfaces/int_OpLogEq.h
new file mode 100644
index 00000000..b15a8b6a
--- /dev/null
+++ b/src/c/operations/interfaces/int_OpLogEq.h
@@ -0,0 +1,94 @@
+/*
+**  -*- C -*-
+**
+** 
+** Made by  Raffaele.Nutricato@tiscali.it
+**
+** Copyright Raffaele Nutricato
+*/
+/* Modified by Arnaud Torset */
+
+
+#ifndef __OPLOGEQ_H__
+#define __OPLOGEQ_H__
+
+#include "floatComplex.h"
+#include "doubleComplex.h"
+
+#define s0s0OpLogEqs0(in1,in2)	 (float)  (in1 == in2)
+#define d0d0OpLogEqd0(in1,in2)	 (double)  (in1 == in2)
+#define c0c0OpLogEqs0(in1,in2) 	 (float)  ((creals(in1) == creals(in2)) && (cimags(in1) == cimags(in2)))
+#define z0z0OpLogEqd0(in1,in2) 	 (double)  ((zreals(in1) == zreals(in2)) && (zimags(in1) == zimags(in2)))
+
+#define s0c0OpLogEqs0(in1,in2)	(float) ((in1==creals(in2)) && (0==cimags(in2)))
+#define d0z0OpLogEqd0(in1,in2)	(double) ((in1==zreals(in2)) && (0==zimags(in2)))
+#define c0s0OpLogEqs0(in1,in2)	s0c0OpLogEqs0(in2,in1)
+#define z0d0OpLogEqd0(in1,in2)	d0z0OpLogEqd0(in2,in1)
+
+
+
+#define s2s0OpLogEqs2(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(float)(in1[i]==in2);\
+							}
+#define d2d0OpLogEqd2(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(double)(in1[i]==in2);\
+							}								
+#define c2c0OpLogEqs2(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(float)((creals(in1[i])==creals(in2))&&(cimags(in1[i])==cimags(in2)));\
+							}		
+#define z2z0OpLogEqd2(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(double)((zreals(in1[i])==zreals(in2))&&(zimags(in1[i])==zimags(in2)));\
+							}
+
+		
+#define c2s0OpLogEqs2(in1,size,in2,out)		c2c0OpLogEqs2(in1,size,FloatComplex(in2,0),out)		
+#define z2d0OpLogEqd2(in1,size,in2,out)		z2z0OpLogEqd2(in1,size,DoubleComplex(in2,0),out)
+
+#define s2c0OpLogEqs2(in1,size,in2,out) 		{int i;\
+								for (i=0;i<size[0]*size[1];i++) out[i]=(float)((in1[i]==creals(in2))&&(cimags(in2)==0));\
+								}
+	
+#define d2z0OpLogEqd2(in1,size,in2,out) 		{int i;\
+								for (i=0;i<size[0]*size[1];i++) out[i]=(double)((in1[i]==zreals(in2))&&(zimags(in2)==0));\
+								}
+
+
+
+#define  s0s2OpLogEqs2(in1,in2,inSize,out) 	s2s0OpLogEqs2(in2,inSize,in1,out)
+#define  c0s2OpLogEqs2(in1,in2,inSize,out)  	s2c0OpLogEqs2(in2,inSize,in1,out)
+#define  d0d2OpLogEqd2(in1,in2,inSize,out)  	d2d0OpLogEqd2(in2,inSize,in1,out)
+#define  z0d2OpLogEqd2(in1,in2,inSize,out)  	d2z0OpLogEqd2(in2,inSize,in1,out)
+#define  s0c2OpLogEqs2(in1,in2,inSize,out)  	c2s0OpLogEqs2(in2,inSize,in1,out)
+#define  c0c2OpLogEqs2(in1,in2,inSize,out)  	c2c0OpLogEqs2(in2,inSize,in1,out)
+#define  d0z2OpLogEqd2(in1,in2,inSize,out)  	z2d0OpLogEqd2(in2,inSize,in1,out)
+#define  z0z2OpLogEqd2(in1,in2,inSize,out) 	z2z0OpLogEqd2(in2,inSize,in1,out)
+
+/* we must have size1=size2 */
+
+#define s2s2OpLogEqs2(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(float)(in1[i]==in2[i]);\
+								}
+#define d2d2OpLogEqd2(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(double)(in1[i]==in2[i]);\
+								}
+#define c2c2OpLogEqs2(in1,size1,in2,size2,out) 	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++) \
+									out[i]=(float)((creals(in1[i])==creals(in2[i]))&&(cimags(in1[i])==cimags(in2[i])));\
+								}
+#define z2z2OpLogEqd2(in1,size1,in2,size2,out) 	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++) \
+									out[i]=(double)((zreals(in1[i])==zreals(in2[i]))&&(zimags(in1[i])==zimags(in2[i])));\
+								}
+					
+#define s2c2OpLogEqs2(in1,size1,in2,size2,out) 	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++) \
+									out[i]=(float)((in1[i]==creals(in2[i]))&&(0==cimags(in2[i])));\
+								}
+#define d2z2OpLogEqd2(in1,size1,in2,size2,out) 	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++) \
+									out[i]=(double)((in1[i]==zreals(in2[i]))&&(0==zimags(in2[i])));\
+								}
+					
+#define  c2s2OpLogEqs2(in1,size1,in2,size2,out)		s2c2OpLogEqs2(in2,size2,in1,size1,out)	
+#define  z2d2OpLogEqd2(in1,size1,in2,size2,out)		d2z2OpLogEqd2(in2,size2,in1,size1,out)
+#endif /* !__OPLOGGT_H__ */
-- 
cgit