adjusting some functions

5 files changed, 23 insertions, 49 deletions

diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
index 5e9b723b..533086c7 100644
--- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
+++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
@@ -29,7 +29,6 @@ SWSRCS	=	\
 	$(CSRCDIR)/zeros.c \
 	$(CSRCDIR)/OpApex.c \
 	$(CSRCDIR)/OpColon.c \
-	$(CSRCDIR)/OpDotStar.c \
 	$(CSRCDIR)/OpDotHat.c \
 	$(CSRCDIR)/OpDotSlash.c \
 	$(CSRCDIR)/OpEqual.c \
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/OpLogEq.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/OpLogEq.c
index a926f057..5b41445b 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/OpLogEq.c
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/OpLogEq.c
@@ -40,32 +40,6 @@ void d2d0OpLogEqd2(double* in1, int* in1Size, double in2, double* out)
    }
 }
 
-void c2s0OpLogEqs2(floatComplex* in1, int* in1Size, float in2, float* out)
-{
-   int rows = 0;
-   int cols = 0;
-   for (rows = 0; rows < in1Size[0];rows++)
-   {
-      for (cols = 0; cols < in1Size[1];cols++)
-      {
-         out[rows*in1Size[1]+cols] = (float) ((creals(in1[rows*in1Size[1]+cols]) == in2) && (cimags(in1[rows*in1Size[1]+cols]) == 0) );
-      }
-   }
-}
-
-void z2d0OpLogEqd2(doubleComplex* in1, int* in1Size, double in2, double* out)
-{
-   int rows = 0;
-   int cols = 0;
-   for (rows = 0; rows < in1Size[0];rows++)
-   {
-      for (cols = 0; cols < in1Size[1];cols++)
-      {
-         out[rows*in1Size[1]+cols] = (double) ((zreals(in1[rows*in1Size[1]+cols]) == in2) && (zimags(in1[rows*in1Size[1]+cols]) == 0) );
-      }
-   }
-}
-
 
 void c2c0OpLogEqs2(floatComplex* in1, int* in1Size, floatComplex in2, float* out)
 {
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogEq.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogEq.h
index 17e0af35..fe0977cd 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogEq.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpLogEq.h
@@ -26,27 +26,27 @@
 #define z0d0OpLogEqd0(in1,in2)	d0z0OpLogEqd0(in2,in1)
 
 
-void s2s0OpLogEqs2(float* in1,int *size1,float in2,float *out);		
-void c2s0OpLogEqs2(floatComplex* in1,int *size1,float in2,float* out);	
+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)	;	
-void z2d0OpLogEqd2(doubleComplex* in1,int *size1,double in2,double* out);
-		
-void s2c0OpLogEqs2(float* in1,int *size1,floatComplex in2,float* out);		
-void c2c0OpLogEqs2(floatComplex* in1,int *size1,floatComplex in2,float* 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);	
 	
-void d2z0OpLogEqd2(double* in1,int *size1,doubleComplex in2,double* out);		
-void z2z0OpLogEqd2(doubleComplex* in1,int *size1,doubleComplex in2,double* out);		
-
-
-#define  s0s2OpLogEqs2(in1,in2,in2Size,out) 	s2s0OpLogEqs2(in2,in2Size,in1,out)
-#define  c0s2OpLogEqs2(in1,in2,in2Size,out)  	s2c0OpLogEqs2(in2,in2Size,in1,out)
-#define  d0d2OpLogEqd2(in1,in2,in2Size,out)  	d2d0OpLogEqd2(in2,in2Size,in1,out)
-#define  z0d2OpLogEqd2(in1,in2,in2Size,out)  	d2z0OpLogEqd2(in2,in2Size,in1,out)
-#define  s0c2OpLogEqs2(in1,in2,in2Size,out)  	c2s0OpLogEqs2(in2,in2Size,in1,out)
-#define  c0c2OpLogEqs2(in1,in2,in2Size,out)  	c2c0OpLogEqs2(in2,in2Size,in1,out)
-#define  d0z2OpLogEqd2(in1,in2,in2Size,out)  	z2d0OpLogEqd2(in2,in2Size,in1,out)
-#define  z0z2OpLogEqd2(in1,in2,in2Size,out) 	z2z0OpLogEqd2(in2,in2Size,in1,out)
+#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  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)
 /*
 void s2s2OpLogEqs2(float* in1, int* in1Size, float* in2, int* in2Size, float* out);
 void d2d2OpLogEqd2(double* in1, int* in1Size, double* in2, int* in2Size, double* out);
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/SCI2CMacroInterface.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/SCI2CMacroInterface.h
index a2f16d4e..46810fca 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/SCI2CMacroInterface.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/SCI2CMacroInterface.h
@@ -83,7 +83,7 @@ ddOpPlussa1(in1,inptr2, (insizeptr2[0]) * (insizeptr2[1]), outptr)*/
 

 

 /* --- OpDotStar. ---*/

-#define s0s0OpDotStars0(in1,in2) \

+/*#define s0s0OpDotStars0(in1,in2) \

 ssOpDotStarss1(in1,in2);

 
 #define s0s2OpDotStars2(in1,inptr2,insizeptr2,outptr) \

@@ -94,9 +94,9 @@ ssOpDotStaraa1(inptr1,inptr2, insizeptr1[0]*insizeptr1[1], outptr)
 
 #define s2s0OpDotStars2(inptr2,insizeptr2,in1,outptr) \

 ssOpDotStarsa1(in1,inptr2, insizeptr2[0]*insizeptr2[1], outptr);
-/*questa su e' una macro */

+questa su e' una macro */

 

-#define d0d0OpDotStard0(in1,in2) \

+/*#define d0d0OpDotStard0(in1,in2) \

 ddOpDotStarss1(in1,in2);

 

 #define d2d2OpDotStard2(inptr1,insizeptr1,inptr2,insizeptr2,outptr) \

@@ -107,7 +107,7 @@ ddOpDotStarsa1(in1,inptr2, (insizeptr2[0]) * (insizeptr2[1]), outptr)
 

 #define d2d0OpDotStard2(inptr2,insizeptr2,in1,outptr) \

 ddOpDotStarsa1(in1,inptr2, (insizeptr2[0]) * (insizeptr2[1]), outptr)
-/*questa su e' una macro */

+questa su e' una macro */

 

 /*

 // ---------------------

diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
index 0c962388..9d9b7242 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
@@ -66,6 +66,7 @@
 #include "int_disp.h"
/* interfacing multiplication */
 #include "multiplication.h"
 #include "int_OpStar.h"
+#include "int_OpDotStar.h"
 /* interfacing addition */
 #include "addition.h"
 #include "int_OpPlus.h"
/* interfacing subtraction */