summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortorset2009-01-22 14:58:44 +0000
committertorset2009-01-22 14:58:44 +0000
commit2896ff8643e32923ea30ad4bd683231cb2ba4b6a (patch)
treeba04b9667d2872aad18d45f0e9bd9bbf97aa3247
parent5be413df074856af8653f4c087f553965e2064a8 (diff)
downloadscilab2c-2896ff8643e32923ea30ad4bd683231cb2ba4b6a.tar.gz
scilab2c-2896ff8643e32923ea30ad4bd683231cb2ba4b6a.tar.bz2
scilab2c-2896ff8643e32923ea30ad4bd683231cb2ba4b6a.zip
update
-rw-r--r--src/auxiliaryFunctions/find/cfinda.c3
-rw-r--r--src/auxiliaryFunctions/find/dfinda.c3
-rw-r--r--src/auxiliaryFunctions/find/sfinda.c3
-rw-r--r--src/auxiliaryFunctions/find/testFind.c12
-rw-r--r--src/auxiliaryFunctions/find/zfinda.c5
-rw-r--r--src/auxiliaryFunctions/isempty/cisemptya.c4
-rw-r--r--src/auxiliaryFunctions/isempty/disemptya.c4
-rw-r--r--src/auxiliaryFunctions/isempty/sisemptya.c8
-rw-r--r--src/auxiliaryFunctions/isempty/testIsEmpty.c1
-rw-r--r--src/auxiliaryFunctions/isempty/zisemptya.c4
10 files changed, 29 insertions, 18 deletions
diff --git a/src/auxiliaryFunctions/find/cfinda.c b/src/auxiliaryFunctions/find/cfinda.c
index c2abca8c..f846ce50 100644
--- a/src/auxiliaryFunctions/find/cfinda.c
+++ b/src/auxiliaryFunctions/find/cfinda.c
@@ -15,6 +15,9 @@
void cfinda(floatComplex* z, int size, float *out, int *indiceOut) {
int i = 0;
indiceOut[1]=0;
+
+ /* if out is empty */
+ out[0]=-1;
for (i = 0; i < size ; ++i) {
if (creals(z[i]) != 0 || cimags(z[i]) != 0) {
diff --git a/src/auxiliaryFunctions/find/dfinda.c b/src/auxiliaryFunctions/find/dfinda.c
index 061caf56..986be373 100644
--- a/src/auxiliaryFunctions/find/dfinda.c
+++ b/src/auxiliaryFunctions/find/dfinda.c
@@ -16,6 +16,9 @@
void dfinda(double* x, int size ,double *out, int *indiceOut) {
int i = 0;
indiceOut[1]=0;
+
+ /* if out is empty */
+ out[0]=-1;
for (i = 0; i < size ; ++i) {
diff --git a/src/auxiliaryFunctions/find/sfinda.c b/src/auxiliaryFunctions/find/sfinda.c
index 9d2c125e..6a23a9dd 100644
--- a/src/auxiliaryFunctions/find/sfinda.c
+++ b/src/auxiliaryFunctions/find/sfinda.c
@@ -16,6 +16,9 @@ void sfinda(float* x, int size, float* out, int *indiceOut) {
int i = 0;
indiceOut[1]=0;
+
+ /* if out is empty */
+ out[0]=-1;
for (i = 0; i < size ; ++i) {
diff --git a/src/auxiliaryFunctions/find/testFind.c b/src/auxiliaryFunctions/find/testFind.c
index 6728b7ac..71db0f31 100644
--- a/src/auxiliaryFunctions/find/testFind.c
+++ b/src/auxiliaryFunctions/find/testFind.c
@@ -43,7 +43,7 @@ int sfindaTest() {
result = ERROR;
}
else
- printf("%f ",outGood[i]);
+ printf("%f ",outBad[0]);
printf("\n");
return result;
@@ -81,7 +81,7 @@ int dfindaTest() {
result = ERROR;
}
else
- printf("%f ",outGood[i]);
+ printf("%f ",outBad[0]);
printf("\n");
return result;
@@ -131,7 +131,7 @@ int cfindaTest() {
result = ERROR;
}
else
- printf("%f ",outGood[i]);
+ printf("%f ",outBad[0]);
printf("\n");
return result;
@@ -177,14 +177,14 @@ int zfindaTest() {
}
printf("\n");
-
+
if (outBad[0]!=-1) {
printf("ERROR ! : Test Failed (empty array)\n");
result = ERROR;
}
else
- printf("%f ",outGood[i]);
-
+ printf("%f ",outBad[0]);
+
printf("\n");
return result;
}
diff --git a/src/auxiliaryFunctions/find/zfinda.c b/src/auxiliaryFunctions/find/zfinda.c
index 1a98e3b3..f9c3f970 100644
--- a/src/auxiliaryFunctions/find/zfinda.c
+++ b/src/auxiliaryFunctions/find/zfinda.c
@@ -15,7 +15,10 @@
void zfinda(doubleComplex* z, int size, double *out, int* indiceOut) {
int i = 0;
indiceOut[1]=0;
-
+
+ /* if out is empty */
+ out[0]=-1;
+
for (i = 0; i < size ; ++i) {
if (zreals(z[i]) != 0 || zimags(z[i]) != 0) {
out[indiceOut[1]] = (double)(i+1);
diff --git a/src/auxiliaryFunctions/isempty/cisemptya.c b/src/auxiliaryFunctions/isempty/cisemptya.c
index ac017ee5..7736f370 100644
--- a/src/auxiliaryFunctions/isempty/cisemptya.c
+++ b/src/auxiliaryFunctions/isempty/cisemptya.c
@@ -14,11 +14,11 @@
float cisemptya(floatComplex* x, int size) {
float* out;
- int indiceOut;
+ int indiceOut[2] = {0};
out = malloc((uint)size*sizeof(float));
- cfinda(x, size, out, &indiceOut);
+ cfinda(x, size, out, indiceOut);
if ( out[0] == -1 /*ie tab=NULL*/) {
free(out);
diff --git a/src/auxiliaryFunctions/isempty/disemptya.c b/src/auxiliaryFunctions/isempty/disemptya.c
index c170e819..52f533cb 100644
--- a/src/auxiliaryFunctions/isempty/disemptya.c
+++ b/src/auxiliaryFunctions/isempty/disemptya.c
@@ -14,11 +14,11 @@
double disemptya(double* x, int size) {
double* out;
- int indiceOut;
+ int indiceOut[2]={0};
out = malloc((uint)size*sizeof(double));
- dfinda(x, size, out, &indiceOut);
+ dfinda(x, size, out, indiceOut);
if ( out[0] == -1 /*ie tab=NULL*/) {
free(out);
diff --git a/src/auxiliaryFunctions/isempty/sisemptya.c b/src/auxiliaryFunctions/isempty/sisemptya.c
index cb665e8e..3aa24517 100644
--- a/src/auxiliaryFunctions/isempty/sisemptya.c
+++ b/src/auxiliaryFunctions/isempty/sisemptya.c
@@ -11,15 +11,15 @@
*/
#include "isempty.h"
-
+#include "stdio.h"
float sisemptya(float* x, int size) {
float* out;
- int indiceOut;
+ int indiceOut[2] = {0};
out = malloc((uint)size*sizeof(float));
- sfinda(x, size, out, &indiceOut);
-
+ sfinda(x, size, out, indiceOut);
+
if ( out[0] == -1 /*ie tab=NULL*/) {
free(out);
return 1;
diff --git a/src/auxiliaryFunctions/isempty/testIsEmpty.c b/src/auxiliaryFunctions/isempty/testIsEmpty.c
index 01dd4a59..32ed7ba0 100644
--- a/src/auxiliaryFunctions/isempty/testIsEmpty.c
+++ b/src/auxiliaryFunctions/isempty/testIsEmpty.c
@@ -130,7 +130,6 @@ int testIsEmpty() {
disemptyaTestStatus = disemptyaTest();
cisemptyaTestStatus = cisemptyaTest();
zisemptyaTestStatus = zisemptyaTest();
-
return (sisemptyaTestStatus + disemptyaTestStatus +
cisemptyaTestStatus + zisemptyaTestStatus);
}
diff --git a/src/auxiliaryFunctions/isempty/zisemptya.c b/src/auxiliaryFunctions/isempty/zisemptya.c
index c1a6a401..d6c64b29 100644
--- a/src/auxiliaryFunctions/isempty/zisemptya.c
+++ b/src/auxiliaryFunctions/isempty/zisemptya.c
@@ -14,11 +14,11 @@
double zisemptya(doubleComplex* x, int size) {
double* out;
- int indiceOut;
+ int indiceOut[2]={0};
out = malloc((uint)size*sizeof(double));
- zfinda(x, size, out, &indiceOut);
+ zfinda(x, size, out, indiceOut);
if ( out[0] == -1 /*ie tab=NULL*/) {
free(out);