Update few files

9 files changed, 628 insertions, 27 deletions

diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpExt.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpExt.h
index d30344cb..7d8a77f7 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpExt.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpExt.h
@@ -7,8 +7,102 @@
 ** Copyright Raffaele Nutricato
 */
 
+/*
+	Modify by Arnaud Torset : 20/02/09
+*/
+
 #ifndef __OPEXT_H__
 #define __OPEXT_H__
 
+#define s2s0OpExts0(in1,size,in2)	in1[in2-1];
+#define d2d0OpExtd0(in1,size,in2)	in1[in2-1];
+#define c2s0OpExtc0(in1,size,in2)	in1[in2-1];
+#define z2d0OpExtz0(in1,size,in2)	in1[in2-1];
+
+
+#define s2s0s0OpExts0(in1,size,row,col)		in1[(col-1)*size[0]+row-1];
+#define d2d0d0OpExtd0(in1,size,row,col)		in1[(col-1)*size[0]+row-1];
+#define c2s0s0OpExtc0(in1,size,row,col)		in1[(col-1)*size[0]+row-1];
+#define z2d0d0OpExtz0(in1,size,row,col)		in1[(col-1)*size[0]+row-1];
+
+
+#define s2s2OpExts2(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size2[0]*size2[1];i++) out[i]=in1[(int)in2[i]-1];\
+								}
+								
+#define d2d2OpExtd2(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size2[0]*size2[1];i++) out[i]=in1[(int)in2[i]-1];\
+								}
+								
+#define c2s2OpExtc2(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size2[0]*size2[1;i++]) out[i]=in1[(int)in2[i]-1];\
+								}
+								
+#define z2d2OpExtz2(in1,size1,in2,size2,out)	{int i;\
+								for (i=0;i<size2[0]*size2[1];i++) out[i]=in1[(int)in2[i]-1];\
+								}
+
+
+
+#define s2s2s0OpExts2(in1,size1,rows,size2,col,out)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) out[i]=s2s0s0OpExts0(in1,size1,(int)rows[i],col);\
+									}
+								
+#define d2d2d0OpExtd2(in1,size1,rows,size2,col,out)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) out[i]=d2d0d0OpExtd0(in1,size1,(int)rows[i],col);\
+									}
+								
+#define c2s2s0OpExtc2(in1,size1,rows,size2,col,out)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) out[i]=c2s0s0OpExtc0(in1,size1,(int)rows[i],col);\
+									}
+								
+#define z2d2d0OpExtz2(in1,size1,rows,size2,col,out)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) out[i]=z2d0d0OpExtz0(in1,size1,(int)rows[i],col);\
+									}
+									
+#define s2s0s2OpExts2(in1,size1,row,cols,size2,out)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) out[i]=s2s0s0OpExts0(in1,size1,row,(int)cols[i]);\
+									}
+								
+#define d2d0d2OpExtd2(in1,size1,row,cols,size2,out)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) out[i]=d2d0d0OpExtd0(in1,size1,row,(int)cols[i]);\
+									}
+								
+#define c2s0s2OpExtc2(in1,size1,row,cols,size2,out)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) out[i]=c2s0s0OpExtc0(in1,size1,row,(int)cols[i]);\
+									}
+								
+#define z2d0d2OpExtz2(in1,size1,row,cols,size2,out)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) out[i]=z2d0d0OpExtz0(in1,size1,row,(int)cols[i]);\
+									}
+								
+								
+#define s2s2s2OpExts2(in1,size1,rows,size2,cols,size3,out)	{int i,j;\
+										for (i=0;i<size2[0]*size2[1];i++) \
+											for (j=0;j<size3[0]*size3[1];j++) \
+												out[i+j*size2[0]*size2[1]] = in1[((int)(cols[j])-1)*size1[0]+(int)(rows[i])-1];\
+										}
+								
+#define d2d2d2OpExtd2(in1,size1,rows,size2,cols,size3,out)	{int i,j;\
+										for (i=0;i<size2[0]*size2[1];i++) \
+											for (j=0;j<size3[0]*size3[1];j++) \
+												out[i+j*size2[0]*size2[1]] = in1[((int)(cols[j])-1)*size1[0]+(int)(rows[i])-1];\
+										}
+								
+#define c2s2s2OpExtc2(in1,size1,rows,size2,cols,size3,out)	{int i,j;\
+										for (i=0;i<size2[0]*size2[1];i++) \
+											for (j=0;j<size3[0]*size3[1];j++) \
+												out[i+j*size2[0]*size2[1]] = in1[((int)(cols[j])-1)*size1[0]+(int)(rows[i])-1];\
+										}
+								
+#define z2d2d2OpExtz2(in1,size1,rows,size2,cols,size3,out)	{int i,j;\
+										for (i=0;i<size2[0]*size2[1];i++) \
+											for (j=0;j<size3[0]*size3[1];j++) \
+												out[i+j*size2[0]*size2[1]] = in1[((int)(cols[j])-1)*size1[0]+(int)(rows[i])-1];\
+										}							
+								
+								
+								
+
 
 #endif /* !__OPEXT_H__ */
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpIns.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpIns.h
index 29a5e98f..20fa8cb6 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpIns.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpIns.h
@@ -7,9 +7,346 @@
 ** Copyright Raffaele Nutricato
 */
 
+/*
+	Modify by Arnaud Torset : 20/02/09
+*/
+
 #ifndef __OPINS_H__
 #define __OPINS_H__
 
 
+/* a(3)=2 */
+#define s2s0s0OpIns(in,size,indice,newVal)	in[indice-1]=newVal;
+
+#define d2d0d0OpIns(in,size,indice,newVal)	in[indice-1]=newVal;
+
+#define c2s0c0OpIns(in,size,indice,newVal)	in[indice-1]=newVal;
+
+#define z2d0z0OpIns(in,size,indice,newVal)	in[indice-1]=newVal;
+
+/* a([1 2])=2 */
+#define s2s2s0OpIns(in,size1,indices,size2,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++)	in[(int)indices[i]-1]=newVal;\
+									}
+
+
+#define d2d2d0OpIns(in,size1,indices,size2,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++)	in[(int)indices[i]-1]=newVal;\
+									}
+
+#define c2s2c0OpIns(in,size1,indices,size2,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++)	in[(int)indices[i]-1]=newVal;\
+									}
+
+#define z2d2z0OpIns(in,size1,indices,size2,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++)	in[(int)indices[i]-1]=newVal;\
+									}
+/* a([1 2])=[3,1] */								
+#define s2s2s2OpIns(in,size1,indices,size2,newVals,size3)	{int i;\
+										for (i=0;i<size2[0]*size3[1];i++)	in[(int)indices[i]-1]=newVals[i];\
+										}
+
+
+#define d2d2d2OpIns(in,size1,indices,size2,newVals,size3)	{int i;\
+										for (i=0;i<size2[0]*size3[1];i++)	in[(int)indices[i]-1]=newVals[i];\
+										}
+
+#define c2s2c2OpIns(in,size1,indices,size2,newVals,size3)	{int i;\
+										for (i=0;i<size2[0]*size3[1];i++)	in[(int)indices[i]-1]=newVals[i];\
+										}
+
+#define z2d2z2OpIns(in,size1,indices,size2,newVals,size3)	{int i;\
+										for (i=0;i<size2[0]*size3[1];i++)	in[(int)indices[i]-1]=newVals[i];\
+										}
+									
+
+/* a(1,3)=2 */	
+#define s2s0s0s0OpIns(in,size,row,col,newVal)	in[(int)(col-1)*size[0]+(int)row-1]=newVal;
+
+#define d2d0d0d0OpIns(in,size,row,col,newVal)	in[(int)(col-1)*size[0]+(int)row-1]=newVal;
+
+#define c2s0s0c0OpIns(in,size,row,col,newVal)	in[(int)(col-1)*size[0]+(int)row-1]=newVal;
+
+#define z2d0d0z0OpIns(in,size,row,col,newVal)	in[(int)(col-1)*size[0]+(int)row-1]=newVal;
+
+	
+/* a(1,[3,1])=2 */	
+#define s2s0s2s0OpIns(in,size1,row,cols,size2,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=newVal;\
+									}
+
+#define d2d0d2d0OpIns(in,size1,row,cols,size2,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=newVal;\
+									}
+
+#define c2s0s2c0OpIns(in,size1,row,cols,size2,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=newVal;\
+									}
+
+#define z2d0d2z0OpIns(in,size1,row,cols,size2,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=newVal;\
+									}						
+
+	
+/* a([3,1],1)=2 */	
+#define s2s2s0s0OpIns(in,size1,rows,size2,col,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) 	in[(int)(col-1)*size1[0]+(int)rows[i]-1]=newVal;\
+									}
+
+#define d2d2d0d0OpIns(in,size1,rows,size2,col,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) 	in[(int)(col-1)*size1[0]+(int)rows[i]-1]=newVal;\
+									}
+
+#define c2s2s0c0OpIns(in,size1,rows,size2,col,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) 	in[(int)(col-1)*size1[0]+(int)rows[i]-1]=newVal;\
+									}
+
+#define z2d2d0z0OpIns(in,size1,rows,size2,col,newVal)	{int i;\
+									for (i=0;i<size2[0]*size2[1];i++) 	in[(int)(col-1)*size1[0]+(int)rows[i]-1]=newVal;\
+									}
+									
+/* a([3,1],[1 2])=2 */
+#define s2s2s2s0OpIns(in,size1,rows,size2,cols,size3,newVal)	{int i,j;\
+											for (i=0;i<size3[0]*size3[1];i++)\
+												for (j=0;j<size2[0]*size2[1];j++)\
+													in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=newVal;\
+											}
+
+#define d2d2d2d0OpIns(in,size1,rows,size2,cols,size3,newVal)	{int i,j;\
+											for (i=0;i<size3[0]*size3[1];i++)\
+												for (j=0;j<size2[0]*size2[1];j++)\
+													in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=newVal;\
+											}
+
+#define c2s2s2c0OpIns(in,size1,rows,size2,cols,size3,newVal)	{int i,j;\
+											for (i=0;i<size3[0]*size3[1];i++)\
+												for (j=0;j<size2[0]*size2[1];j++)\
+													in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=newVal;\
+											}
+
+#define z2d2d2z0OpIns(in,size1,rows,size2,cols,size3,newVal)	{int i,j;\
+											for (i=0;i<size3[0]*size3[1];i++)\
+												for (j=0;j<size2[0]*size2[1];j++)\
+													in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=newVal;\
+											}
+/* a(1,[3,1])=[2,5] */	
+#define s2s0s2s2OpIns(in,size1,row,cols,size2,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+											 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=newVals[i];\
+											}
+
+#define d2d0d2d2OpIns(in,size1,row,cols,size2,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+											 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=newVals[i];\
+											}
+
+#define c2s0s2c2OpIns(in,size1,row,cols,size2,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+											 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=newVals[i];\
+											}
+
+#define z2d0d2z2OpIns(in,size1,row,cols,size2,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+											 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=newVals[i];\
+											}	
+/* a([3,1],1)=[2,5] */	
+#define s2s2s0s2OpIns(in,size1,rows,size2,col,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+												in[(int)(col-1)*size1[0]+(int)rows[i]-1]=newVals[i];\
+											}
+
+#define d2d2d0d2OpIns(in,size1,rows,size2,col,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+												in[(int)(col-1)*size1[0]+(int)rows[i]-1]=newVals[i];\
+											}
+
+#define c2s2s0c2OpIns(in,size1,rows,size2,col,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+												in[(int)(col-1)*size1[0]+(int)rows[i]-1]=newVals[i];\
+											}
+
+#define z2d2d0z2OpIns(in,size1,rows,size2,col,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+												in[(int)(col-1)*size1[0]+(int)rows[i]-1]=newVals[i];\
+											}
+
+/* a([3,1],[1 2])=[2,1,3,5] */
+#define s2s2s2s2OpIns(in,size1,rows,size2,cols,size3,newVals,size4)	{int i,j;\
+												for (i=0;i<size3[0]*size3[1];i++)\
+													for (j=0;j<size2[0]*size2[1];j++)\
+														in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=newVals[i*size4[0]+j];\
+												}
+
+#define d2d2d2d2OpIns(in,size1,rows,size2,cols,size3,newVals,size4)	{int i,j;\
+												for (i=0;i<size3[0]*size3[1];i++)\
+													for (j=0;j<size2[0]*size2[1];j++)\
+														in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=newVals[i*size4[0]+j];\
+												}
+
+#define c2s2s2c2OpIns(in,size1,rows,size2,cols,size3,newVals,size4)	{int i,j;\
+												for (i=0;i<size3[0]*size3[1];i++)\
+													for (j=0;j<size2[0]*size2[1];j++)\
+														in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=newVals[i*size4[0]+j];\
+												}
+
+#define z2d2d2z2OpIns(in,size1,rows,size2,cols,size3,newVals,size4)	{int i,j;\
+												for (i=0;i<size3[0]*size3[1];i++)\
+													for (j=0;j<size2[0]*size2[1];j++)\
+														in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=newVals[i*size4[0]+j];\
+												}
+												
+												
+/* Mixed types 
+2 cases : we assign a real in a complex array => ok, we just have put the imaginary part to 0
+	    we assign a complex in a real array => ko, we can't enlarge the input matrix. So we just replace by the real part of the complex
+*/
+
+/* a(3)=2 */
+#define s2s0c0OpIns(in,size,indice,newVal)	s2s0s0OpIns(in,size,indice,creals(newVal))
+
+#define d2d0z0OpIns(in,size,indice,newVal)	d2d0d0OpIns(in,size,indice,zreals(newVal))
+
+#define c2s0s0OpIns(in,size,indice,newVal)	c2s0c0OpIns(in,size,indice,FloatComplex(newVal,0))
+
+#define z2d0d0OpIns(in,size,indice,newVal)	z2d0z0OpIns(in,size,indice,DoubleComplex(newVal,0))
+
+
+/* a([1 2])=2 */
+#define s2s2c0OpIns(in,size1,indices,size2,newVal)	s2s2s0OpIns(in,size1,indices,size2,creals(newVal))
+
+#define d2d2z0OpIns(in,size1,indices,size2,newVal)	d2d2d0OpIns(in,size1,indices,size2,zreals(newVal))
+
+#define c2s2s0OpIns(in,size1,indices,size2,newVal)	c2s2c0OpIns(in,size1,indices,size2,FloatComplex(newVal,0))
+
+#define z2d2d0OpIns(in,size1,indices,size2,newVal)	z2d2z0OpIns(in,size1,indices,size2,DoubleComplex(newVal,0))
+
+	
+/* a([1 2])=[3,1] */								
+#define s2s2c2OpIns(in,size1,indices,size2,newVals,size3)	{int i;\
+										for (i=0;i<size2[0]*size3[1];i++)	in[(int)indices[i]-1]=creals(newVals[i]);\
+										}
+
+
+#define d2d2z2OpIns(in,size1,indices,size2,newVals,size3)	{int i;\
+										for (i=0;i<size2[0]*size3[1];i++)	in[(int)indices[i]-1]=zreals(newVals[i]);\
+										}
+
+#define c2s2s2OpIns(in,size1,indices,size2,newVals,size3)	{int i;\
+										for (i=0;i<size2[0]*size3[1];i++)	in[(int)indices[i]-1]=FloatComplex(newVals[i],0);\
+										}
+
+#define z2d2d2OpIns(in,size1,indices,size2,newVals,size3)	{int i;\
+										for (i=0;i<size2[0]*size3[1];i++)	in[(int)indices[i]-1]=DoubleComplex(newVals[i],0);\
+										}
+									
+
+/* a(1,3)=2 */	
+#define s2s0s0c0OpIns(in,size,row,col,newVal)	s2s0s0s0OpIns(in,size,row,col,creals(newVal))
+
+#define d2d0d0z0OpIns(in,size,row,col,newVal)	d2d0d0d0OpIns(in,size,row,col,zreals(newVal))
+
+#define c2s0s0s0OpIns(in,size,row,col,newVal)	c2s0s0c0OpIns(in,size,row,col,FloatComplex(newVal,0))
+
+#define z2d0d0d0OpIns(in,size,row,col,newVal)	z2d0d0z0OpIns(in,size,row,col,DoubleComplex(newVal,0))
+
+	
+/* a(1,[3,1])=2 */	
+#define s2s0s2c0OpIns(in,size1,row,cols,size2,newVal)	s2s0s2s0OpIns(in,size1,row,cols,size2,creals(newVal))
+
+#define d2d0d2z0OpIns(in,size1,row,cols,size2,newVal)	d2d0d2d0OpIns(in,size1,row,cols,size2,zreals(newVal))
+
+#define c2s0s2s0OpIns(in,size1,row,cols,size2,newVal)	c2s0s2c0OpIns(in,size1,row,cols,size2,FloatComplex(newVal,0))
+
+#define z2d0d2d0OpIns(in,size1,row,cols,size2,newVal)	z2d0d2z0OpIns(in,size1,row,cols,size2,DoubleComplex(newVal,0))				
+
+	
+/* a([3,1],1)=2 */	
+#define s2s2s0c0OpIns(in,size1,rows,size2,col,newVal)	s2s2s0s0OpIns(in,size1,rows,size2,col,creals(newVal))
+
+#define d2d2d0z0OpIns(in,size1,rows,size2,col,newVal)	d2d2d0d0OpIns(in,size1,rows,size2,col,zreals(newVal))
+
+#define c2s2s0s0OpIns(in,size1,rows,size2,col,newVal)	c2s2s0c0OpIns(in,size1,rows,size2,col,FloatComplex(newVal,0))
+
+#define z2d2d0d0OpIns(in,size1,rows,size2,col,newVal)	z2d2d0z0OpIns(in,size1,rows,size2,col,DoubleComplex(newVal,0))	
+									
+/* a([3,1],[1 2])=2 */
+#define s2s2s2c0OpIns(in,size1,rows,size2,cols,size3,newVal)	s2s2s2s0OpIns(in,size1,rows,size2,cols,size3,creals(newVal))
+
+#define d2d2d2z0OpIns(in,size1,rows,size2,cols,size3,newVal)	d2d2d2d0OpIns(in,size1,rows,size2,cols,size3,zreals(newVal))
+
+#define c2s2s2s0OpIns(in,size1,rows,size2,cols,size3,newVal)	c2s2s2c0OpIns(in,size1,rows,size2,cols,size3,FloatComplex(newVal,0))
+
+#define z2d2d2d0OpIns(in,size1,rows,size2,cols,size3,newVal)	z2d2d2z0OpIns(in,size1,rows,size2,cols,size3,DoubleComplex(newVal,0))	
+
+
+/* a(1,[3,1])=[2,5] */	
+#define s2s0s2c2OpIns(in,size1,row,cols,size2,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+											 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=creals(newVals[i]);\
+											}
+
+#define d2d0d2z2OpIns(in,size1,row,cols,size2,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+											 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=zreals(newVals[i]);\
+											}
+
+#define c2s0s2s2OpIns(in,size1,row,cols,size2,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+											 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=FloatComplex(newVals[i],0);\
+											}
+
+#define z2d0d2d2OpIns(in,size1,row,cols,size2,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+											 	in[(int)(cols[i]-1)*size1[0]+(int)row-1]=DoubleComplex(newVals[i],0);\
+											}	
+/* a([3,1],1)=[2,5] */	
+#define s2s2s0c2OpIns(in,size1,rows,size2,col,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+												in[(int)(col-1)*size1[0]+(int)rows[i]-1]=creals(newVals[i]);\
+											}
+
+#define d2d2d0z2OpIns(in,size1,rows,size2,col,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+												in[(int)(col-1)*size1[0]+(int)rows[i]-1]=zreals(newVals[i]);\
+											}
+
+#define c2s2s0s2OpIns(in,size1,rows,size2,col,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+												in[(int)(col-1)*size1[0]+(int)rows[i]-1]=FloatComplex(newVals[i],0);\
+											}
+
+#define z2d2d0d2OpIns(in,size1,rows,size2,col,newVals,size3)	{int i;\
+											for (i=0;i<size2[0]*size2[1];i++)\
+												in[(int)(col-1)*size1[0]+(int)rows[i]-1]=DoubleComplex(newVals[i],0);\
+											}
+
+/* a([3,1],[1 2])=[2,1,3,5] */
+#define s2s2s2c2OpIns(in,size1,rows,size2,cols,size3,newVals,size4)\
+									{int i,j;\
+									for (i=0;i<size3[0]*size3[1];i++)\
+										for (j=0;j<size2[0]*size2[1];j++)\
+											in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=creals(newVals[i*size4[0]+j]);\
+									}
+
+#define d2d2d2z2OpIns(in,size1,rows,size2,cols,size3,newVals,size4)\
+									{int i,j;\
+									for (i=0;i<size3[0]*size3[1];i++)\
+										for (j=0;j<size2[0]*size2[1];j++)\
+											in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=zreals(newVals[i*size4[0]+j]);\
+									}
+
+#define c2s2s2s2OpIns(in,size1,rows,size2,cols,size3,newVals,size4)\
+									{int i,j;\
+									for (i=0;i<size3[0]*size3[1];i++)\
+										for (j=0;j<size2[0]*size2[1];j++)\
+											in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=FloatComplex(newVals[i*size4[0]+j],0);\
+									}
 
+#define z2d2d2d2OpIns(in,size1,rows,size2,cols,size3,newVals,size4)\
+									{int i,j;\
+									for (i=0;i<size3[0]*size3[1];i++)\
+										for (j=0;j<size2[0]*size2[1];j++)\
+											in[(int)(cols[i]-1)*size1[0]+(int)rows[j]-1]=DoubleComplex(newVals[i*size4[0]+j],0);\
+									}
+																
 #endif /* !__OPINS_H__ */
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogEq.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogEq.h
index fe0977cd..b15a8b6a 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogEq.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogEq.h
@@ -26,17 +26,32 @@
 #define z0d0OpLogEqd0(in1,in2)	d0z0OpLogEqd0(in2,in1)
 
 
-void s2s0OpLogEqs2(float* in1,int *size,float in2,float *out);		
-#define c2s0OpLogEqs2(in1,size,in2,out)		c2c0OpLogEqs2(in1,size,FloatComplex(in2,0),out)	
-	
-void d2d0OpLogEqd2(double* in1,int *size1,double in2,double* out)	;	
+
+#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) 		sfilla((float*)out,size[0],size[1],0); c2c0OpLogEqs2(FloatComplexMatrix(in1,(float*)out,size[0]*size[1]),size,in2,out)		
-void c2c0OpLogEqs2(floatComplex* in1,int *size,floatComplex in2,float* 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) 		dfilla((double*)out,size[0],size[1],0); z2z0OpLogEqd2(DoubleComplexMatrix(in1,(double*)out,size[0]*size[1]),size,in2,out)
-void z2z0OpLogEqd2(doubleComplex* in1,int *size,doubleComplex in2,double* out);		
+#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)
@@ -47,14 +62,33 @@ void z2z0OpLogEqd2(doubleComplex* in1,int *size,doubleComplex in2,double* 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)
-/*
-void s2s2OpLogEqs2(float* in1, int* in1Size, float* in2, int* in2Size, float* out);
-void d2d2OpLogEqd2(double* in1, int* in1Size, double* in2, int* in2Size, double* out);
-void c2c2OpLogEqs2(floatComplex* in1, int* in1Size, floatComplex* in2, int* in2Size, float* out);
-void z2z2OpLogEqd2(doubleComplex* in1, int* in1Size, doubleComplex* in2, int* in2Size, double* out);
-
-void s2c2OpLogEqs2(float* in1, int* in1Size, floatComplex* in2, int* in2Size, float* out);
-void d2z2OpLogEqd2(double* in1, int* in1Size, doubleComplex* in2, int* in2Size, double* out);
-#define  c2s2OpLogEqs2(in1,in1Size,in2,in2Size,out)		s2c2OpLogEqs2(in2,in2Size,in1,in1Size,out)	
-#define  z2d2OpLogEqd2(in1,in1Size,in2,in2Size,out)		d2z2OpLogEqd2(in2,in2Size,in1,in1Size,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/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogGe.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogGe.h
index 798086f2..ddc9631f 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogGe.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogGe.h
@@ -10,11 +10,12 @@
 ** Copyright INRIA 2006
 */
 
+/*
+   Update 23/02/09 by Arnaud Torset : Add matrix comparaison, remove include(floatComplex and doubleComplex)
+*/
 #ifndef __OPLOGGE_H__
 #define __OPLOGGE_H__
 
-#include "floatComplex.h"
-#include "doubleComplex.h"
 
 #define s0s0OpLogGes0(in1,in2) \

  (float)  (in1 >= in2)
@@ -24,4 +25,12 @@ void s2s0OpLogGes2(float* in1, int* in1Size, float in2, float* out);
  (double)  (in1 >= in2)
 void d2d0OpLogGed2(double* in1, int* in1Size, double in2, double* out);
 
+/* we must have size1=size2 */
+
+#define s2s2OpLogGes2(in1,size1,in2,size2,out) {int i;\
+								for (i=0;i<size1[0]*size2[1]) out[i] = s0s0OpLogGes0(in1[i],in2[i]);\
+								}
+#define d2d2OpLogGed2(in1,size1,in2,size2,out) {int i;\
+								for (i=0;i<size1[0]*size2[1]) out[i] = d0d0OpLogGed0(in1[i],in2[i]);\
+								}	
 #endif /* !__OPLOGLE_H__ */
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogGt.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogGt.h
index e8128e76..88715092 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogGt.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogGt.h
@@ -10,11 +10,13 @@
 ** Copyright INRIA 2006
 */
 
+/*
+   Update 23/02/09 by Arnaud Torset : Add matrix comparaison, remove include(floatComplex and doubleComplex)
+*/
+
 #ifndef __OPLOGGT_H__
 #define __OPLOGGT_H__
 
-#include "floatComplex.h"
-#include "doubleComplex.h"
 
 #define s0s0OpLogGts0(in1,in2) \

  (float)  (in1 > in2)
@@ -24,4 +26,12 @@ void s2s0OpLogGts2(float* in1, int* in1Size, float in2, float* out);
  (double)  (in1 > in2)
 void d2d0OpLogGtd2(double* in1, int* in1Size, double in2, double* out);
 
+/* we must have size1=size2 */
+
+#define s2s2OpLogGts2(in1,size1,in2,size2,out) {int i;\
+								for (i=0;i<size1[0]*size2[1]) out[i] = s0s0OpLogGts0(in1[i],in2[i]);\
+								}
+#define d2d2OpLogGtd2(in1,size1,in2,size2,out) {int i;\
+								for (i=0;i<size1[0]*size2[1]) out[i] = d0d0OpLogGtd0(in1[i],in2[i]);\
+								}					
 #endif /* !__OPLOGGT_H__ */
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLe.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLe.h
index f66c4c1f..5c5fdcd5 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLe.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLe.h
@@ -10,11 +10,13 @@
 ** Copyright INRIA 2006
 */
 
+/*
+   Update 23/02/09 by Arnaud Torset : Add matrix comparaison, remove include(floatComplex and doubleComplex)
+*/
+#ifndef __OPLOGGE_H__
 #ifndef __OPLOGLE_H__
 #define __OPLOGLE_H__
 
-#include "floatComplex.h"
-#include "doubleComplex.h"
 
 #define s0s0OpLogLes0(in1,in2) \

  (float)  (in1 <= in2)
@@ -24,4 +26,12 @@ void s2s0OpLogLes2(float* in1, int* in1Size, float in2, float* out);
  (double)  (in1 <= in2)
 void d2d0OpLogLed2(double* in1, int* in1Size, double in2, double* out);
 
+/* we must have size1=size2 */
+
+#define s2s2OpLogLes2(in1,size1,in2,size2,out) {int i;\
+								for (i=0;i<size1[0]*size2[1]) out[i] = s0s0OpLogLes0(in1[i],in2[i]);\
+								}
+#define d2d2OpLogLed2(in1,size1,in2,size2,out) {int i;\
+								for (i=0;i<size1[0]*size2[1]) out[i] = d0d0OpLogLed0(in1[i],in2[i]);\
+								}	
 #endif /* !__OPLOGLE_H__ */
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLt.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLt.h
index ce1981fb..2962f151 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLt.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogLt.h
@@ -10,12 +10,12 @@
 ** Copyright INRIA 2006
 */
 
+/*
+   Update 23/02/09 by Arnaud Torset : Add matrix comparaison, remove include(floatComplex and doubleComplex)
+*/
 #ifndef __OPLOGLT_H__
 #define __OPLOGLT_H__
 
-#include "floatComplex.h"
-#include "doubleComplex.h"
-
 #define s0s0OpLogLts0(in1,in2) \

  (float)  (in1 < in2)
 void s2s0OpLogLts2(float* in1, int* in1Size, float in2, float* out);
@@ -24,4 +24,12 @@ void s2s0OpLogLts2(float* in1, int* in1Size, float in2, float* out);
  (double)  (in1 < in2)
 void d2d0OpLogLtd2(double* in1, int* in1Size, double in2, double* out);
 
+/* we must have size1=size2 */
+
+#define s2s2OpLogLts2(in1,size1,in2,size2,out) {int i;\
+								for (i=0;i<size1[0]*size2[1]) out[i] = s0s0OpLogLts0(in1[i],in2[i]);\
+								}
+#define d2d2OpLogLtd2(in1,size1,in2,size2,out) {int i;\
+								for (i=0;i<size1[0]*size2[1]) out[i] = d0d0OpLogLtd0(in1[i],in2[i]);\
+								}	
 #endif /* !__OPLOGLT_H__ */
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogNe.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogNe.h
new file mode 100644
index 00000000..238ef483
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/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__ */
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
index 1381f0e5..b53749a9 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
@@ -12,6 +12,7 @@
 #include "OpIns.h"

 #include "OpExt.h"

 #include "FileManagement.h"

+#include "OpLogNe.h"

 #include "OpLogGt.h"

 #include "OpLogLt.h"

 #include "OpLogGe.h"