diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 69c573fe2e59236f063aaa94dcd44b556f945cbc (patch) | |
| tree | 08fa381bec620e38c7a3d2a34448d30160d861eb /src/c/matrixOperations | |
| parent | 87823db220f4c3b8bee16c0b2e08027704de1efe (diff) | |
| parent | 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff) | |
| download | Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2 Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip | |
Scilab2C Arduino Updated
Diffstat (limited to 'src/c/matrixOperations')
| -rw-r--r-- | src/c/matrixOperations/cat/ccata.c | 4 | ||||
| -rw-r--r-- | src/c/matrixOperations/cat/zcata.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/c/matrixOperations/cat/ccata.c b/src/c/matrixOperations/cat/ccata.c index cd2b4c9..6a2a6d9 100644 --- a/src/c/matrixOperations/cat/ccata.c +++ b/src/c/matrixOperations/cat/ccata.c @@ -26,7 +26,11 @@ void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, i { for (j = 0 ; j < lines1 ; ++j) { +<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; +======= + /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { diff --git a/src/c/matrixOperations/cat/zcata.c b/src/c/matrixOperations/cat/zcata.c index 485553d..659f14c 100644 --- a/src/c/matrixOperations/cat/zcata.c +++ b/src/c/matrixOperations/cat/zcata.c @@ -26,7 +26,11 @@ void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, { for (j = 0 ; j < lines1 ; ++j) { +<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; +======= + /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { |