diff options
| author | simon | 2009-07-16 09:10:23 +0000 |
|---|---|---|
| committer | simon | 2009-07-16 09:10:23 +0000 |
| commit | 0019d6a1d68d0500e0b58a673e187162c222263a (patch) | |
| tree | 636638f11861f946b11fce81604810ddae1f6948 /src/c/matrixOperations/interfaces/int_OpCc.h | |
| parent | cb6d500415f8db3078cc95ece2a4bfabb4e50489 (diff) | |
| download | scilab2c-0019d6a1d68d0500e0b58a673e187162c222263a.tar.gz scilab2c-0019d6a1d68d0500e0b58a673e187162c222263a.tar.bz2 scilab2c-0019d6a1d68d0500e0b58a673e187162c222263a.zip | |
added test for OpRc , OpCc and OpMinus
corrected the interfaces of OpCc and OpRc
added the missing combinations in INIT_FillSCI2LibCDirs.sci and updated it
Diffstat (limited to 'src/c/matrixOperations/interfaces/int_OpCc.h')
| -rw-r--r-- | src/c/matrixOperations/interfaces/int_OpCc.h | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/src/c/matrixOperations/interfaces/int_OpCc.h b/src/c/matrixOperations/interfaces/int_OpCc.h index 48ff3907..44d30d70 100644 --- a/src/c/matrixOperations/interfaces/int_OpCc.h +++ b/src/c/matrixOperations/interfaces/int_OpCc.h @@ -76,9 +76,12 @@ drowcata(in1, size[0], size[1],&temp, 1, 1, out); \ } -#define c2c0OpCcc2(in1,size,in2,out) crowcata(in1, size[0], size[1], &in2, 1, 1, out); +#define c2c0OpCcc2(in1,size,in2,out) { floatComplex temp = in2; \ + crowcata(in1, size[0], size[1],&temp, 1, 1, out);\ -#define z2z0OpCcz2(in1,size,in2,out) zrowcata(in1, size[0], size[1], &in2, 1, 1, out); +#define z2z0OpCcz2(in1,size,in2,out) { doubleComplex temp =in2; \ + zrowcata(in1, size[0], size[1],&temp, 1, 1, out);\ + } /* Different type */ @@ -96,13 +99,25 @@ /* Scalar-Matrix */ /* Same type */ -#define s0s2OpCcs2(in1,in2,size,out) srowcata(in1, 1, 1, in2, size[0], size[1], out); - -#define d0d2OpCcd2(in1,in2,size,out) drowcata(in1, 1, 1, in2, size[0], size[1], out); - -#define c0c2OpCcc2(in1,in2,size,out) crowcata(in1, 1, 1, in2, size[0], size[1], out); - -#define z0z2OpCcz2(in1,in2,size,out) zrowcata(in1, 1, 1, in2, size[0], size[1], out); +#define s0s2OpCcs2(in1,in2,size,out) { \ + float __tmp1 = in1 ;\ + srowcata(&__tmp1, 1, 1, in2, size[0], size[1], out);\ +} + +#define d0d2OpCcd2(in1,in2,size,out) { \ + double __tmp1 = in1 ;\ + drowcata(&__tmp1, 1, 1, in2, size[0], size[1], out);\ +} + +#define c0c2OpCcc2(in1,in2,size,out) { \ + floatComplex __tmp1 = in1 ;\ + crowcata(&__tmp1, 1, 1, in2, size[0], size[1], out);\ +} + +#define z0z2OpCcz2(in1,in2,size,out) { \ + doubleComplex __tmp1 = in1 ;\ + zrowcata(&__tmp1, 1, 1, in2, size[0], size[1], out);\ +} /* Different type */ #define s0c2OpCcc2(in1,in2,size,out) c0c2OpCcc2(FloatComplex(in1,0),in2,size,out) |