summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortorset2009-01-29 08:48:41 +0000
committertorset2009-01-29 08:48:41 +0000
commit47eff0c4b795ab3a4461013bcb5f28188ed142ab (patch)
tree986eeb8576652a48a08d58a9c3ef105b7203f325
parentaa166e0b3bb650d1cb53b9e34b10282f4546d875 (diff)
downloadscilab2c-47eff0c4b795ab3a4461013bcb5f28188ed142ab.tar.gz
scilab2c-47eff0c4b795ab3a4461013bcb5f28188ed142ab.tar.bz2
scilab2c-47eff0c4b795ab3a4461013bcb5f28188ed142ab.zip
Update
-rw-r--r--src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc10
-rw-r--r--src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h1
-rw-r--r--src/operations/interface/int_OpDotSlash.h12
-rw-r--r--src/operations/interface/int_OpSlash.h4
4 files changed, 18 insertions, 9 deletions
diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
index 7d13e170..735f07f3 100644
--- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
+++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
@@ -252,7 +252,15 @@ SWSRCS = \
$(CSRCDIR)/sacoshs.c \
$(CSRCDIR)/sacosha.c \
$(CSRCDIR)/zacoshs.c \
- $(CSRCDIR)/zacosha.c
+ $(CSRCDIR)/zacosha.c\
+ $(CSRCDIR)/crdivma.c \
+ $(CSRCDIR)/drdivma.c \
+ $(CSRCDIR)/srdivma.c \
+ $(CSRCDIR)/zrdivma.c\
+ $(CSRCDIR)/cldivma.c \
+ $(CSRCDIR)/dldivma.c \
+ $(CSRCDIR)/sldivma.c \
+ $(CSRCDIR)/zldivma.c
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
index f7b4d9e2..a8b94cd7 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
@@ -104,6 +104,7 @@
#include "int_OpDotStar.h"
/* interfacing division */
#include "division.h"
+#include "matrixDivision.h"
#include "int_OpSlash.h"
#include "int_OpDotSlash.h"
#include "int_OpBackSlash.h"
diff --git a/src/operations/interface/int_OpDotSlash.h b/src/operations/interface/int_OpDotSlash.h
index b45e1e8d..87c79a81 100644
--- a/src/operations/interface/int_OpDotSlash.h
+++ b/src/operations/interface/int_OpDotSlash.h
@@ -115,16 +115,16 @@
#define c2s2OpDotSlashc2(in1,size1,in2,size2,out) {int i=0;\
- for (i=0;i<size[0]*size[1];i++) out[i]=crdivs(in1[i],FloatComplex(in2[i],0));}
+ for (i=0;i<size1[0]*size2[1];i++) out[i]=crdivs(in1[i],FloatComplex(in2[i],0));}
#define s2c2OpDotSlashc2(in1,size1,in2,size2,out) {int i=0;\
- for (i=0;i<size[0]*size[1];i++) out[i]=crdivs(FloatComplex(in1[i],0),in2[i]);}
+ for (i=0;i<size1[0]*size2[1];i++) out[i]=crdivs(FloatComplex(in1[i],0),in2[i]);}
-#define z2d2OpDotSlashc2(in1,size1,in2,size2,out) {int i=0;\
- for (i=0;i<size[0]*size[1];i++) out[i]=zrdivs(in1[i],DoubleComplex(in2[i],0));}
+#define z2d2OpDotSlashz2(in1,size1,in2,size2,out) {int i=0;\
+ for (i=0;i<size1[0]*size2[1];i++) out[i]=zrdivs(in1[i],DoubleComplex(in2[i],0));}
-#define d2z2OpDotSlashc2(in1,size1,in2,size2,out) {int i=0;\
- for (i=0;i<size[0]*size[1];i++) out[i]=zrdivs(DoubleComplex(in1[i],0),in2[i]);}
+#define d2z2OpDotSlashz2(in1,size1,in2,size2,out) {int i=0;\
+ for (i=0;i<size1[0]*size2[1];i++) out[i]=zrdivs(DoubleComplex(in1[i],0),in2[i]);}
diff --git a/src/operations/interface/int_OpSlash.h b/src/operations/interface/int_OpSlash.h
index def50514..40c135e5 100644
--- a/src/operations/interface/int_OpSlash.h
+++ b/src/operations/interface/int_OpSlash.h
@@ -126,12 +126,12 @@
sfilla(temp,size1[0],size1[1],0);\
c2c2OpSlashc2(FloatComplexMatrix(in2,temp,size1[0]*size1[1]), size1, in2, size2, out);}
-#define z2d2OpSlashc2(in1,size1,in2,size2,out) {double* temp;\
+#define z2d2OpSlashz2(in1,size1,in2,size2,out) {double* temp;\
temp=malloc((uint)(size2[0]*size2[1])*sizeof(double));\
dfilla(temp,size2[0],size2[1],0);\
z2z2OpSlashz2(in1, size1, DoubleComplexMatrix(in2,temp,size2[0]*size2[1]), size2, out);}
-#define d2z2OpSlashc2(in1,size1,in2,size2,out) {double* temp;\
+#define d2z2OpSlashz2(in1,size1,in2,size2,out) {double* temp;\
temp=malloc((uint)(size2[0]*size2[1])*sizeof(double));\
dfilla(temp,size1[0],size1[1],0);\
z2z2OpSlashz2(DoubleComplexMatrix(in1,temp,size1[0]*size1[1]), size1, in2, size2, out);}