Intermediate commit. Not to be used

8 files changed, 412 insertions, 3 deletions

diff --git a/src/c/operations/interfaces/int_OpLogAnd.h b/src/c/operations/interfaces/int_OpLogAnd.h
index 460c81c..50a3189 100644
--- a/src/c/operations/interfaces/int_OpLogAnd.h
+++ b/src/c/operations/interfaces/int_OpLogAnd.h
@@ -19,6 +19,14 @@
 
 #define Bool2Double(in)				((in) ? 1.0 : 0.0)
 
+#define Bool2Uint8(in)				((in) ? (uint8)1 : (uint8)0)
+
+#define Bool2Int8(in)				((in) ? (int8)1 : (int8)0)
+
+#define Bool2Uint16(in)				((in) ? (uint16)1 : (uint16)0)
+
+#define Bool2Int16(in)				((in) ? (int16)1 : (int16)0)
+
 /*scalar and scalar*/
 
 #define s0s0OpLogAnds0(in1, in2)		Bool2Float(in1 != 0.0 && in2 != 0.0)
@@ -38,6 +46,15 @@
 
 #define z0d0OpLogAndd0(in1, in2)		Bool2Double((zreals(in1) != 0.0 || zimags(in1) != 0.0) && in2 != 0.0)
 
+#define u80u80OpLogAndu80(in1, in2)		Bool2Uint8(in1 != 0 && in2 != 0)
+
+#define i80i80OpLogAndi80(in1, in2)		Bool2Int8(in1 != 0 && in2 != 0)
+
+#define u160u160OpLogAndu160(in1, in2)		Bool2Uint16(in1 != 0 && in2 != 0)
+
+#define i160i160OpLogAndi160(in1, in2)		Bool2Int16(in1 != 0 && in2 != 0)
+
+
 /*matrix and scalar*/
 
 #define s2s0OpLogAnds2(in1, size1, in2, out)	{int i  = 0 ;\
@@ -65,6 +82,21 @@
 #define z2d0OpLogAndd2(in1, size1, in2, out)	{int i  = 0 ;\
                                                   for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] = Bool2Double((zreals(in1[i]) != 0.0 || zimags(in1[i]) != 0.0) && in2 != 0.0);}
 
+#define u82u80OpLogAndu82(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Uint8(in1[i] != 0 && in2 != 0);}
+
+#define i82i80OpLogAndi82(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Int8(in1[i] != 0 && in2 != 0);}
+
+#define u82u80OpLogAndu82(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Uint8(in1[i] != 0 && in2 != 0);}
+
+#define u162u160OpLogAndu162(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Uint16(in1[i] != 0 && in2 != 0);}
+
+#define i162i160OpLogAndi162(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Int16(in1[i] != 0 && in2 != 0);}
+
 /*scalar and matrix*/
 
 #define s0s2OpLogAnds2(in1, in2, size2, out)	{int i  = 0 ;\
@@ -92,6 +124,18 @@
 #define z0d2OpLogAndd2(in1, in2, size2, out)	{int i  = 0 ;\
                                                   for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Double((zreals(in1) != 0.0 || zimags(in1) != 0.0) && in2[i] != 0.0);}
 
+#define u80u82OpLogAndu82(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint8(in1 != 0 && in2[i] != 0);}
+
+#define i80i82OpLogAndi82(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int8(in1 != 0 && in2[i] != 0);}
+
+#define u160u162OpLogAndu162(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint16(in1 != 0 && in2[i] != 0);}
+
+#define i160i162OpLogAndi162(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int16(in1 != 0 && in2[i] != 0);}
+
 /*TODO matrix and matrix*/
 
 #define s2s2OpLogAnds2(in1, size1, in2, size2, out)	{int i  = 0 ;\
@@ -119,4 +163,17 @@
 #define z2d2OpLogAndd2(in1, size1, in2, size2, out)	{int i  = 0 ;\
                                                   for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Double((zreals(in1[i]) != 0.0 || zimags(in1[i]) != 0.0) && in2[i] != 0.0;)}
 
+
+#define u82u82OpLogAndu82(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint8(in1[i] != 0 && in2[i] != 0);}
+
+#define i82i82OpLogAndi82(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int8(in1[i] != 0 && in2[i] != 0);}
+
+#define u162u162OpLogAndu162(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint16(in1[i] != 0 && in2[i] != 0);}
+
+#define i162i162OpLogAndi162(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int16(in1[i] != 0 && in2[i] != 0);}
+
 #endif /* !__INT_OPLOGAND_H__ */
diff --git a/src/c/operations/interfaces/int_OpLogEq.h b/src/c/operations/interfaces/int_OpLogEq.h
index b15a8b6..446b11c 100644
--- a/src/c/operations/interfaces/int_OpLogEq.h
+++ b/src/c/operations/interfaces/int_OpLogEq.h
@@ -14,11 +14,17 @@
 
 #include "floatComplex.h"
 #include "doubleComplex.h"
+#include "types.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 u80u80OpLogEqu80(in1,in2)	 (uint8)  (in1 == in2)
+#define i80i80OpLogEqi80(in1,in2)	 (int8)  (in1 == in2)
+#define u160u160OpLogEqu160(in1,in2)	 (uint16)  (in1 == in2)
+#define i160i160OpLogEqi160(in1,in2)	 (int16)  (in1 == in2)
+
 
 #define s0c0OpLogEqs0(in1,in2)	(float) ((in1==creals(in2)) && (0==cimags(in2)))
 #define d0z0OpLogEqd0(in1,in2)	(double) ((in1==zreals(in2)) && (0==zimags(in2)))
@@ -51,8 +57,21 @@
 #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 u82u80OpLogEqu82(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(uint8)(in1[i]==in2);\
+							}
 
+#define i82i80OpLogEqi82(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(int8)(in1[i]==in2);\
+							}
 
+#define u162u160OpLogEqu162(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(uint16)(in1[i]==in2);\
+							}
+
+#define i162i160OpLogEqi162(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(int16)(in1[i]==in2);\
+							}
 
 #define  s0s2OpLogEqs2(in1,in2,inSize,out) 	s2s0OpLogEqs2(in2,inSize,in1,out)
 #define  c0s2OpLogEqs2(in1,in2,inSize,out)  	s2c0OpLogEqs2(in2,inSize,in1,out)
@@ -62,6 +81,11 @@
 #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)
+#define  u80u82OpLogEqu82(in1,in2,inSize,out) 	u82u80OpLogEqu82(in2,inSize,in1,out)
+#define  i80i82OpLogEqi82(in1,in2,inSize,out) 	i82i80OpLogEqi82(in2,inSize,in1,out)
+#define  u160u162OpLogEqu162(in1,in2,inSize,out) 	u162u160OpLogEq162(in2,inSize,in1,out)
+#define  i160i162OpLogEqi162(in1,in2,inSize,out) 	i162i160OpLogEqi162(in2,inSize,in1,out)
+
 
 /* we must have size1=size2 */
 
@@ -91,4 +115,22 @@
 					
 #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__ */
+
+#define u82u82OpLogEqu82(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(uint8)(in1[i]==in2[i]);\
+								}
+
+#define i82i82OpLogEqi82(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(int8)(in1[i]==in2[i]);\
+								}
+
+#define u162u162OpLogEqu162(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(uint16)(in1[i]==in2[i]);\
+								}
+
+#define i162i162OpLogEqi162(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(int16)(in1[i]==in2[i]);\
+								}
+
+
+#endif /* !__OPLOGEQ_H__ */
diff --git a/src/c/operations/interfaces/int_OpLogGe.h b/src/c/operations/interfaces/int_OpLogGe.h
index 0ce1ad8..edbdc07 100644
--- a/src/c/operations/interfaces/int_OpLogGe.h
+++ b/src/c/operations/interfaces/int_OpLogGe.h
@@ -21,15 +21,57 @@
 #define s0s0OpLogGes0(in1,in2)				(float)  (in1 >= in2)
 #define d0d0OpLogGed0(in1,in2)				(double)  (in1 >= in2)
 
+#define u80u80OpLogGeu80(in1,in2)			(uint8)  (in1 >= in2)
+
+#define i80i80OpLogGei80(in1,in2)			(int8)  (in1 >= in2)
+
+#define u160u160OpLogGeu160(in1,in2)			(uint16)  (in1 >= in2)
+
+#define i160i160OpLogGei160(in1,in2)			(int16)  (in1 >= in2)
+
 
 #define s2s0OpLogGes2(in1, size1, in2, out)		{int i;\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = s0s0OpLogGes0(in1[i],in2);\
   }
 
+
+#define u82u80OpLogGeu82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogGeu80(in1[i],in2);\
+  }
+
+#define i82i80OpLogGei82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i80i80OpLogGei80(in1[i],in2);\
+  }
+
+#define u82u80OpLogGeu82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogGeu80(in1[i],in2);\
+  }
+
+#define u162u160OpLogGeu162(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u160u160OpLogGeu160(in1[i],in2);\
+  }
+
+#define i162i160OpLogGei162(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i160i160OpLogGei160(in1[i],in2);\
+  }
+
 #define s0s2OpLogGes2(in1, in2, size2, out)		{int i;		\
   for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = s0s0OpLogGes0(in1,in2[i]);\
   }
 
+#define u80u82OpLogGeu82(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = u80u80OpLogGeu80(in1,in2[i]);\
+  }
+
+#define u160u162OpLogGeu162(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = u160u160OpLogGeu160(in1,in2[i]);\
+  }
+
+
+#define i160i162OpLogGei162(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = i160i160OpLogGei160(in1,in2[i]);\
+  }
+
 /* we must have size1=size2 */
 #define s2s2OpLogGes2(in1, size1, in2, size2, out)		{int i;	\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = s0s0OpLogGes0(in1[i],in2[i]);\
@@ -47,4 +89,22 @@
 #define d2d2OpLogGed2(in1, size1, in2, size2, out)		{int i;	\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = d0d0OpLogGed0(in1[i],in2[i]);\
   }
+
+#define u82u82OpLogGeu82(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogGeu80(in1[i],in2[i]);\
+  }
+
+#define i82i82OpLogGei82(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i80i80OpLogGei80(in1[i],in2[i]);\
+  }
+
+#define u162u162OpLogGeu162(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u160u160OpLogGeu160(in1[i],in2[i]);\
+  }
+
+#define i162i162OpLogGei162(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i160i160OpLogGei160(in1[i],in2[i]);\
+  }
+
+
 #endif /* !__OPLOGGE_H__ */
diff --git a/src/c/operations/interfaces/int_OpLogGt.h b/src/c/operations/interfaces/int_OpLogGt.h
index 161b654..38c76cf 100644
--- a/src/c/operations/interfaces/int_OpLogGt.h
+++ b/src/c/operations/interfaces/int_OpLogGt.h
@@ -21,15 +21,51 @@
 #define s0s0OpLogGts0(in1,in2)				(float)  (in1 > in2)
 #define d0d0OpLogGtd0(in1,in2)				(double)  (in1 > in2)
 
+#define u80u80OpLogGtu80(in1,in2)			(uint8)  (in1 > in2)
+#define i80i80OpLogGti80(in1,in2)			(int8)  (in1 > in2)
+#define u160u160OpLogGtu160(in1,in2)			(uint16)  (in1 > in2)
+#define i160i160OpLogGti160(in1,in2)			(int16)  (in1 > in2)
 
 #define s2s0OpLogGts2(in1, size1, in2, out)		{int i;\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = s0s0OpLogGts0(in1[i],in2);\
   }
 
+#define u82u80OpLogGtu82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogGtu80(in1[i],in2);\
+  }
+
+#define i82i80OpLogGti82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i80i80OpLogGti80(in1[i],in2);\
+  }
+
+#define u162u160OpLogGtu162(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u160u160OpLogGtu160(in1[i],in2);\
+  }
+
+#define i162i160OpLogGti162(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i160i160OpLogGti160(in1[i],in2);\
+  }
+
 #define s0s2OpLogGts2(in1, in2, size2, out)		{int i;		\
   for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = s0s0OpLogGts0(in1,in2[i]);\
   }
 
+#define u80u82OpLogGtu82(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = u80u80OpLogGtu80(in1,in2[i]);\
+  }
+
+#define i80i82OpLogGti82(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = i80i80OpLogGti80(in1,in2[i]);\
+  }
+
+#define u160u162OpLogGtu162(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = u160u160OpLogGtu160(in1,in2[i]);\
+  }
+
+#define i160i162OpLogGti162(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = i160i160OpLogGti160(in1,in2[i]);\
+  }
+
 /* we must have size1=size2 */
 #define s2s2OpLogGts2(in1, size1, in2, size2, out)		{int i;	\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = s0s0OpLogGts0(in1[i],in2[i]);\
@@ -47,4 +83,21 @@
 #define d2d2OpLogGtd2(in1, size1, in2, size2, out)		{int i;	\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = d0d0OpLogGtd0(in1[i],in2[i]);\
   }
+
+#define u82u82OpLogGtu82(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogGtu80(in1[i],in2[i]);\
+  }
+
+#define i82i82OpLogGti82(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i80i80OpLogGti80(in1[i],in2[i]);\
+  }
+
+#define u162u162OpLogGtu162(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u160u160OpLogGt160(in1[i],in2[i]);\
+  }
+
+#define i162i162OpLogGti162(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i160i160OpLogGti160(in1[i],in2[i]);\
+  }
+
 #endif /* !__OPLOGGT_H__ */
diff --git a/src/c/operations/interfaces/int_OpLogLe.h b/src/c/operations/interfaces/int_OpLogLe.h
index ebb09c7..8dbd1aa 100644
--- a/src/c/operations/interfaces/int_OpLogLe.h
+++ b/src/c/operations/interfaces/int_OpLogLe.h
@@ -20,16 +20,51 @@
 
 #define s0s0OpLogLes0(in1,in2)				(float)  (in1 <= in2)
 #define d0d0OpLogLed0(in1,in2)				(double)  (in1 <= in2)
-
+#define u80u80OpLogLeu80(in1,in2)			(uint8)  (in1 <= in2)
+#define i80i80OpLogLei80(in1,in2)			(int8)  (in1 <= in2)
+#define u160u160OpLogLeu160(in1,in2)			(uint16)  (in1 <= in2)
+#define i160i160OpLogLei160(in1,in2)			(int16)  (in1 <= in2)
 
 #define s2s0OpLogLes2(in1, size1, in2, out)		{int i;\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = s0s0OpLogLes0(in1[i],in2);\
   }
 
+#define u82u80OpLogLeu82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogLeu80(in1[i],in2);\
+  }
+
+#define i82i80OpLogLei82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i80i80OpLogLei80(in1[i],in2);\
+  }
+
+#define u162u160OpLogLeu162(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u160u160OpLogLeu160(in1[i],in2);\
+  }
+
+#define i162i160OpLogLei162(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i160i160OpLogLei160(in1[i],in2);\
+  }
+
 #define s0s2OpLogLes2(in1, in2, size2, out)		{int i;		\
   for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = s0s0OpLogLes0(in1,in2[i]);\
   }
 
+#define u80u82OpLogLeu82(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = u80u80OpLogLeu80(in1,in2[i]);\
+  }
+
+#define i80i82OpLogLei82(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = i80i80OpLogLei80(in1,in2[i]);\
+  }
+
+#define u160u162OpLogLeu162(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = u160u160OpLogLeu160(in1,in2[i]);\
+  }
+
+#define i160i162OpLogLei162(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = i160i160OpLogLei160(in1,in2[i]);\
+  }
+
 /* we must have size1=size2 */
 #define s2s2OpLogLes2(in1, size1, in2, size2, out)		{int i;	\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = s0s0OpLogLes0(in1[i],in2[i]);\
@@ -47,4 +82,21 @@
 #define d2d2OpLogLed2(in1, size1, in2, size2, out)		{int i;	\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = d0d0OpLogLed0(in1[i],in2[i]);\
   }
+
+#define u82u82OpLogLeu82(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogLeu80(in1[i],in2[i]);\
+  }
+
+#define i82i82OpLogLei82(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i80i80OpLogLei80(in1[i],in2[i]);\
+  }
+
+#define u162u162OpLogLeu162(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u160u160OpLogLeu160(in1[i],in2[i]);\
+  }
+
+#define i162i162OpLogLei162(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i160i160OpLogLei160(in1[i],in2[i]);\
+  }
+
 #endif /* !__OPLOGLE_H__ */
diff --git a/src/c/operations/interfaces/int_OpLogLt.h b/src/c/operations/interfaces/int_OpLogLt.h
index 2c5d863..8974b15 100644
--- a/src/c/operations/interfaces/int_OpLogLt.h
+++ b/src/c/operations/interfaces/int_OpLogLt.h
@@ -20,16 +20,51 @@
 
 #define s0s0OpLogLts0(in1,in2)				(float)  (in1 < in2)
 #define d0d0OpLogLtd0(in1,in2)				(double)  (in1 < in2)
-
+#define u80u80OpLogLtu80(in1,in2)			(uint8)  (in1 < in2)
+#define i80i80OpLogLti80(in1,in2)			(int8)  (in1 < in2)
+#define u160u160OpLogLtu160(in1,in2)			(uint16)  (in1 < in2)
+#define i160i160OpLogLti160(in1,in2)			(int16)  (in1 < in2)
 
 #define s2s0OpLogLts2(in1, size1, in2, out)		{int i;\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = s0s0OpLogLts0(in1[i],in2);\
   }
 
+#define u82u80OpLogLtu82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogLtu80(in1[i],in2);\
+  }
+
+#define i82i80OpLogLti82(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i80i80OpLogLti80(in1[i],in2);\
+  }
+
+#define u162u160OpLogLtu162(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u160u160OpLogLtu160(in1[i],in2);\
+  }
+
+#define i162i160OpLogLti162(in1, size1, in2, out)		{int i;\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i160i160OpLogLti160(in1[i],in2);\
+  }
+
 #define s0s2OpLogLts2(in1, in2, size2, out)		{int i;		\
   for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = s0s0OpLogLts0(in1,in2[i]);\
   }
 
+#define u80u82OpLogLtu82(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = u80u80OpLogLtu80(in1,in2[i]);\
+  }
+
+#define i80i82OpLogLti82(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = i80i80OpLogLti80(in1,in2[i]);\
+  }
+
+#define u160u162OpLogLtu162(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = u160u160OpLogLtu160(in1,in2[i]);\
+  }
+
+#define i160i162OpLogLti162(in1, in2, size2, out)		{int i;		\
+  for(i = 0 ; i < size2[0] * size2[1] ; ++i) out[i] = i160i160OpLogLti160(in1,in2[i]);\
+  }
+
 /* we must have size1=size2 */
 #define s2s2OpLogLts2(in1, size1, in2, size2, out)		{int i;	\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = s0s0OpLogLts0(in1[i],in2[i]);\
@@ -47,4 +82,21 @@
 #define d2d2OpLogLtd2(in1, size1, in2, size2, out)		{int i;	\
   for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = d0d0OpLogLtd0(in1[i],in2[i]);\
   }
+
+#define u82u82OpLogLtu82(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u80u80OpLogLtu80(in1[i],in2[i]);\
+  }
+
+#define i82i82OpLogLti82(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i80i80OpLogLti80(in1[i],in2[i]);\
+  }
+
+#define u162u162OpLogLtu162(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = u160u160OpLogLtu160(in1[i],in2[i]);\
+  }
+
+#define i162i162OpLogLti162(in1, size1, in2, size2, out)		{int i;	\
+  for(i = 0 ; i < size1[0] * size1[1] ; ++i) out[i] = i160i160OpLogLti160(in1[i],in2[i]);\
+  }
+
 #endif /* !__OPLOGLT_H__ */
diff --git a/src/c/operations/interfaces/int_OpLogNe.h b/src/c/operations/interfaces/int_OpLogNe.h
index 238ef48..56cafef 100644
--- a/src/c/operations/interfaces/int_OpLogNe.h
+++ b/src/c/operations/interfaces/int_OpLogNe.h
@@ -22,6 +22,10 @@
 #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 u80u80OpLogNeu80(in1,in2)	 (uint8)  !(in1 == in2)
+#define i80i80OpLogNei80(in1,in2)	 (int8)  !(in1 == in2)
+#define u160u160OpLogNeu160(in1,in2)	 (uint16)  !(in1 == in2)
+#define i160i160OpLogNei160(in1,in2)	 (int16)  !(in1 == in2)
 
 #define s0c0OpLogNes0(in1,in2)	(float) !((in1==creals(in2)) && (0==cimags(in2)))
 #define d0z0OpLogNed0(in1,in2)	(double) !((in1==zreals(in2)) && (0==zimags(in2)))
@@ -55,7 +59,21 @@
 								for (i=0;i<size[0]*size[1];i++) out[i]=(double)!((in1[i]==zreals(in2))&&(zimags(in2)==0));\
 								}
 
+#define u82u80OpLogNeu82(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(uint8)!(in1[i]==in2);\
+							}
+
+#define i82i80OpLogNei82(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(int8)!(in1[i]==in2);\
+							}
 
+#define u162u160OpLogNeu162(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(uint16)!(in1[i]==in2);\
+							}
+
+#define i162i160OpLogNei162(in1,size,in2,out) 	{int i;\
+							for (i=0;i<size[0]*size[1];i++) out[i]=(int16)!(in1[i]==in2);\
+							}
 
 #define  s0s2OpLogNes2(in1,in2,inSize,out) 	s2s0OpLogNes2(in2,inSize,in1,out)
 #define  c0s2OpLogNes2(in1,in2,inSize,out)  	s2c0OpLogNes2(in2,inSize,in1,out)
@@ -65,6 +83,10 @@
 #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)
+#define  u80u82OpLogNeu82(in1,in2,inSize,out) 	u82u80OpLogNeu82(in2,inSize,in1,out)
+#define  i80i82OpLogNei82(in1,in2,inSize,out) 	i82i80OpLogNei82(in2,inSize,in1,out)
+#define  u160u162OpLogNeu162(in1,in2,inSize,out) 	u162u160OpLogNeu162(in2,inSize,in1,out)
+#define  i160i162OpLogNei162(in1,in2,inSize,out) 	i162i160OpLogNei162(in2,inSize,in1,out)
 
 /* we must have size1=size2 */
 
@@ -95,4 +117,20 @@
 #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)
 
+#define  u82u82OpLogNeu82(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(uint8)!(in1[i]==in2[i]);\
+								}
+
+#define  i82i82OpLogNei82(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(int8)!(in1[i]==in2[i]);\
+								}
+
+#define  u162u162OpLogNeu162(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(uint16)!(in1[i]==in2[i]);\
+								}
+
+#define  i162i162OpLogNei162(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size1[0]*size2[1];i++)	out[i]=(int16)!(in1[i]==in2[i]);\
+								}
+
 #endif /* !__OPLOGNE_H__ */
diff --git a/src/c/operations/interfaces/int_OpLogOr.h b/src/c/operations/interfaces/int_OpLogOr.h
index b5d55fb..07039d1 100644
--- a/src/c/operations/interfaces/int_OpLogOr.h
+++ b/src/c/operations/interfaces/int_OpLogOr.h
@@ -19,6 +19,14 @@
 
 #define Bool2Double(in)			((in) ? 1.0 : 0.0)
 
+#define Bool2Uint8(in)				((in) ? (uint8)1 : (uint8)0)
+
+#define Bool2Int8(in)				((in) ? (int8)1 : (int8)0)
+
+#define Bool2Uint16(in)				((in) ? (uint16)1 : (uint16)0)
+
+#define Bool2Int16(in)				((in) ? (int16)1 : (int16)0)
+
 /*scalar or scalar */
 
 #define s0s0OpLogOrs0(in1, in2)		Bool2Float(in1 != 0.0f || in2 != 0.0f)
@@ -37,6 +45,14 @@
 
 #define z0d0OpLogOrd0(in1, in2)		Bool2Double((zreals(in1) != 0.0 || zimags(in1) != 0.0) && in2 != 0.0)
 
+#define u80u80OpLogAndu80(in1, in2)		Bool2Uint8(in1 != 0 || in2 != 0)
+
+#define i80i80OpLogAndi80(in1, in2)		Bool2Int8(in1 != 0 || in2 != 0)
+
+#define u160u160OpLogAndu160(in1, in2)		Bool2Uint16(in1 != 0 || in2 != 0)
+
+#define i160i160OpLogAndi160(in1, in2)		Bool2Int16(in1 != 0 || in2 != 0)
+
 /*matrix or scalar */
 
 #define s2s0OpLogOrs2(in1, size1, in2, out)	{int i  = 0 ;\
@@ -63,6 +79,19 @@
 #define z2d0OpLogOrd2(in1, size1, in2, out)	{int i  = 0 ;\
                                          for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Double((zreals(in1[i]) != 0.0 || zimags(in1[i]) != 0.0) && in2 != 0.0);}
 
+#define i82i80OpLogAndi82(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Int8(in1[i] != 0 || in2 != 0);}
+
+#define u82u80OpLogAndu82(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Uint8(in1[i] != 0 || in2 != 0);}
+
+#define u162u160OpLogAndu162(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Uint16(in1[i] != 0 || in2 != 0);}
+
+#define i162i160OpLogAndi162(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Int16(in1[i] != 0 || in2 != 0);}
+
+
 /*scalar or matrix */
 
 #define s0s2OpLogOrs2(in1, in2, size2, out)	{int i  = 0 ;\
@@ -88,6 +117,19 @@
 
 #define z0d2OpLogOrd2(in1, in2, size2, out)	{int i  = 0 ;\
                                          for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Double((zreals(in1) != 0.2 || zimags(in1) != 0.2) && in2[i] != 0.2);}
+
+#define u80u82OpLogAndu82(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint8(in1 != 0 || in2[i] != 0);}
+
+#define i80i82OpLogAndi82(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int8(in1 != 0 || in2[i] != 0);}
+
+#define u160u162OpLogAndu162(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint16(in1 != 0 || in2[i] != 0);}
+
+#define i160i162OpLogAndi162(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int16(in1 != 0 || in2[i] != 0);}
+
 /*matrix or matrix */
 
 #define s2s2OpLogOrs2(in1, size1, in2, size2, out)	{int i  = 0 ;\
@@ -113,4 +155,17 @@
 
 #define z2d2OpLogOrd2(in1, size1, in2, size2, out)	{int i  = 0 ;\
                                          for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Double((zreals(in1[i]) != 0.2 || zimags(in1[i]) != 0.2) && in2[i] != 0.2);}
+
+#define u82u82OpLogAndu82(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint8(in1[i] != 0 || in2[i] != 0);}
+
+#define i82i82OpLogAndi82(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int8(in1[i] != 0 || in2[i] != 0);}
+
+#define u162u162OpLogAndu162(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint16(in1[i] != 0 || in2[i] != 0);}
+
+#define i162i162OpLogAndi162(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int16(in1[i] != 0 || in2[i] != 0);}
+
 #endif /* !__INT_OPLOGOR_H__ */