From 462563271edd528e1785ed30beff1683f1859ac2 Mon Sep 17 00:00:00 2001
From: jofret
Date: Fri, 5 Jun 2009 10:01:32 +0000
Subject: OpLogNe management

---
 includes/sci2clib.h                       |  1 +
 macros/CFiles/sci2cincludes/OpLogNe.h     | 98 -------------------------------
 macros/findDeps/getAllInterfaces.sci      |  1 +
 src/c/operations/interfaces/int_OpLogNe.h | 98 +++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 98 deletions(-)
 delete mode 100644 macros/CFiles/sci2cincludes/OpLogNe.h
 create mode 100644 src/c/operations/interfaces/int_OpLogNe.h

diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index 6ff407c4..b6ac037a 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -184,6 +184,7 @@
 #include "int_OpDotBackSlash.h"
 /* interfacing comparison */
 #include "int_OpLogEq.h"
+#include "int_OpLogNe.h"
 
 
 /* MATRIX OPERATIONS */
diff --git a/macros/CFiles/sci2cincludes/OpLogNe.h b/macros/CFiles/sci2cincludes/OpLogNe.h
deleted file mode 100644
index 238ef483..00000000
--- a/macros/CFiles/sci2cincludes/OpLogNe.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Aranud Torset
- *
- * 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
- *
- */
-
-/* Idem that OpLogEq with a !(negation) behind*/
-
-#ifndef __OPLOGNE_H__
-#define __OPLOGNE_H__
-
-#include "floatComplex.h"
-#include "doubleComplex.h"
-
-#define s0s0OpLogNes0(in1,in2)	 (float)  !(in1 == in2)
-#define d0d0OpLogNed0(in1,in2)	 (double)  !(in1 == in2)
-#define c0c0OpLogNes0(in1,in2) 	 (float)  !((creals(in1) == creals(in2)) && (cimags(in1) == cimags(in2)))
-#define z0z0OpLogNed0(in1,in2) 	 (double)  !((zreals(in1) == zreals(in2)) && (zimags(in1) == zimags(in2)))
-
-#define s0c0OpLogNes0(in1,in2)	(float) !((in1==creals(in2)) && (0==cimags(in2)))
-#define d0z0OpLogNed0(in1,in2)	(double) !((in1==zreals(in2)) && (0==zimags(in2)))
-#define c0s0OpLogNes0(in1,in2)	s0c0OpLogNes0(in2,in1)
-#define z0d0OpLogNed0(in1,in2)	d0z0OpLogNed0(in2,in1)
-
-
-
-#define s2s0OpLogNes2(in1,size,in2,out) 	{int i;\
-							for (i=0;i<size[0]*size[1];i++) out[i]=(float)!(in1[i]==in2);\
-							}
-#define d2d0OpLogNed2(in1,size,in2,out) 	{int i;\
-							for (i=0;i<size[0]*size[1];i++) out[i]=(double)!(in1[i]==in2);\
-							}								
-#define c2c0OpLogNes2(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 z2z0OpLogNed2(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 c2s0OpLogNes2(in1,size,in2,out)		c2c0OpLogNes2(in1,size,FloatComplex(in2,0),out)		
-#define z2d0OpLogNed2(in1,size,in2,out)		z2z0OpLogNed2(in1,size,DoubleComplex(in2,0),out)
-
-#define s2c0OpLogNes2(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 d2z0OpLogNed2(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  s0s2OpLogNes2(in1,in2,inSize,out) 	s2s0OpLogNes2(in2,inSize,in1,out)
-#define  c0s2OpLogNes2(in1,in2,inSize,out)  	s2c0OpLogNes2(in2,inSize,in1,out)
-#define  d0d2OpLogNed2(in1,in2,inSize,out)  	d2d0OpLogNed2(in2,inSize,in1,out)
-#define  z0d2OpLogNed2(in1,in2,inSize,out)  	d2z0OpLogNed2(in2,inSize,in1,out)
-#define  s0c2OpLogNes2(in1,in2,inSize,out)  	c2s0OpLogNes2(in2,inSize,in1,out)
-#define  c0c2OpLogNes2(in1,in2,inSize,out)  	c2c0OpLogNes2(in2,inSize,in1,out)
-#define  d0z2OpLogNed2(in1,in2,inSize,out)  	z2d0OpLogNed2(in2,inSize,in1,out)
-#define  z0z2OpLogNed2(in1,in2,inSize,out) 	z2z0OpLogNed2(in2,inSize,in1,out)
-
-/* we must have size1=size2 */
-
-#define s2s2OpLogNes2(in1,size1,in2,size2,out)	{int i;\
-								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(float)!(in1[i]==in2[i]);\
-								}
-#define d2d2OpLogNed2(in1,size1,in2,size2,out)	{int i;\
-								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(double)!(in1[i]==in2[i]);\
-								}
-#define c2c2OpLogNes2(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 z2z2OpLogNed2(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 s2c2OpLogNes2(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 d2z2OpLogNed2(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  c2s2OpLogNes2(in1,size1,in2,size2,out)		s2c2OpLogNes2(in2,size2,in1,size1,out)	
-#define  z2d2OpLogNed2(in1,size1,in2,size2,out)		d2z2OpLogNed2(in2,size2,in1,size1,out)
-
-#endif /* !__OPLOGNE_H__ */
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index 7fc5afd0..96d9a960 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -82,6 +82,7 @@ function allInterfaces = getAllInterfaces()
       "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_OpLogNe.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_OpLogNe.h b/src/c/operations/interfaces/int_OpLogNe.h
new file mode 100644
index 00000000..238ef483
--- /dev/null
+++ b/src/c/operations/interfaces/int_OpLogNe.h
@@ -0,0 +1,98 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Aranud Torset
+ *
+ * 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
+ *
+ */
+
+/* Idem that OpLogEq with a !(negation) behind*/
+
+#ifndef __OPLOGNE_H__
+#define __OPLOGNE_H__
+
+#include "floatComplex.h"
+#include "doubleComplex.h"
+
+#define s0s0OpLogNes0(in1,in2)	 (float)  !(in1 == in2)
+#define d0d0OpLogNed0(in1,in2)	 (double)  !(in1 == in2)
+#define c0c0OpLogNes0(in1,in2) 	 (float)  !((creals(in1) == creals(in2)) && (cimags(in1) == cimags(in2)))
+#define z0z0OpLogNed0(in1,in2) 	 (double)  !((zreals(in1) == zreals(in2)) && (zimags(in1) == zimags(in2)))
+
+#define s0c0OpLogNes0(in1,in2)	(float) !((in1==creals(in2)) && (0==cimags(in2)))
+#define d0z0OpLogNed0(in1,in2)	(double) !((in1==zreals(in2)) && (0==zimags(in2)))
+#define c0s0OpLogNes0(in1,in2)	s0c0OpLogNes0(in2,in1)
+#define z0d0OpLogNed0(in1,in2)	d0z0OpLogNed0(in2,in1)
+
+
+
+#define s2s0OpLogNes2(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(float)!(in1[i]==in2);\
+							}
+#define d2d0OpLogNed2(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(double)!(in1[i]==in2);\
+							}								
+#define c2c0OpLogNes2(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 z2z0OpLogNed2(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 c2s0OpLogNes2(in1,size,in2,out)		c2c0OpLogNes2(in1,size,FloatComplex(in2,0),out)		
+#define z2d0OpLogNed2(in1,size,in2,out)		z2z0OpLogNed2(in1,size,DoubleComplex(in2,0),out)
+
+#define s2c0OpLogNes2(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 d2z0OpLogNed2(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  s0s2OpLogNes2(in1,in2,inSize,out) 	s2s0OpLogNes2(in2,inSize,in1,out)
+#define  c0s2OpLogNes2(in1,in2,inSize,out)  	s2c0OpLogNes2(in2,inSize,in1,out)
+#define  d0d2OpLogNed2(in1,in2,inSize,out)  	d2d0OpLogNed2(in2,inSize,in1,out)
+#define  z0d2OpLogNed2(in1,in2,inSize,out)  	d2z0OpLogNed2(in2,inSize,in1,out)
+#define  s0c2OpLogNes2(in1,in2,inSize,out)  	c2s0OpLogNes2(in2,inSize,in1,out)
+#define  c0c2OpLogNes2(in1,in2,inSize,out)  	c2c0OpLogNes2(in2,inSize,in1,out)
+#define  d0z2OpLogNed2(in1,in2,inSize,out)  	z2d0OpLogNed2(in2,inSize,in1,out)
+#define  z0z2OpLogNed2(in1,in2,inSize,out) 	z2z0OpLogNed2(in2,inSize,in1,out)
+
+/* we must have size1=size2 */
+
+#define s2s2OpLogNes2(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(float)!(in1[i]==in2[i]);\
+								}
+#define d2d2OpLogNed2(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(double)!(in1[i]==in2[i]);\
+								}
+#define c2c2OpLogNes2(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 z2z2OpLogNed2(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 s2c2OpLogNes2(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 d2z2OpLogNed2(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  c2s2OpLogNes2(in1,size1,in2,size2,out)		s2c2OpLogNes2(in2,size2,in1,size1,out)	
+#define  z2d2OpLogNed2(in1,size1,in2,size2,out)		d2z2OpLogNed2(in2,size2,in1,size1,out)
+
+#endif /* !__OPLOGNE_H__ */
-- 
cgit