summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimon2008-10-14 09:54:58 +0000
committersimon2008-10-14 09:54:58 +0000
commitb4cc05c95d28ebc4a842d970dbd5b0bb88099601 (patch)
tree6c5279abd7ed5c690b05ebc6c6204e7cd9b3ec9c
parent6ce212d9640c16f9dcd39b4b9cb279f7d6b52a2f (diff)
downloadscilab2c-b4cc05c95d28ebc4a842d970dbd5b0bb88099601.tar.gz
scilab2c-b4cc05c95d28ebc4a842d970dbd5b0bb88099601.tar.bz2
scilab2c-b4cc05c95d28ebc4a842d970dbd5b0bb88099601.zip
corrected assert
-rw-r--r--src/statisticsFunctions/mean/testDoubleMean.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/statisticsFunctions/mean/testDoubleMean.c b/src/statisticsFunctions/mean/testDoubleMean.c
index cbb5ce1a..b48ad7d4 100644
--- a/src/statisticsFunctions/mean/testDoubleMean.c
+++ b/src/statisticsFunctions/mean/testDoubleMean.c
@@ -24,8 +24,8 @@ static int dmeansTest(void) {
double value2 = 1.123456789;
printf("\n>>>> Mean Double Scalar Test\n");
- assert(dmeans(value1) == 3.0);
- assert(dmeans(value2) == 1.123456789);
+ assert( ( fabs(dmeans(value1) ) - ( 3.0 ) ) / fabs ( dmeans(value1) ) < 1e-15 );
+ assert( ( fabs(dmeans(value2) ) - ( 1.123456789 ) ) / fabs ( dmeans(value2) ) < 1e-15 );
return 0;
}
@@ -39,8 +39,8 @@ static int dmeanaTest(void) {
9.186784563};
printf("\n>>>> Mean Double Array Test\n");
- assert(dmeana(table1, 3) == 9.0 / 3.0);
- assert((dmeana(table2, 5) == (9.186784563 + 9.186784563 + 9.186784563 + 9.186784563 + 9.186784563) / 5.0));
+ assert( ( fabs(dmeana(table1, 3) ) - ( 9.0 / 3.0 ) ) / fabs ( dmeana(table1, 3) ) < 1e-15 );
+ assert(( ( fabs(dmeana(table2, 5) ) - ( (9.186784563 + 9.186784563 + 9.186784563 + 9.186784563 + 9.186784563) / 5.0) ) ) / fabs ( dmeana(table2, 5) ) < 1e-15 );
return 0;
}
@@ -61,15 +61,15 @@ static int dcolumnmeanaTest(void) {
[ 7 8 9 ]
*/
dcolumnmeana(table1, 3, 3,columnMeanmedTable1_3_3);
- assert(columnMeanmedTable1_3_3[0] == 6.0 / 3.0);
- assert(columnMeanmedTable1_3_3[1] == 15.0 / 3.0);
- assert(columnMeanmedTable1_3_3[2] == 24.0 / 3.0);
+ assert( ( fabs(columnMeanmedTable1_3_3[0] ) - ( 6.0 / 3.0 ) ) / fabs ( columnMeanmedTable1_3_3[0] ) < 1e-15 );
+ assert( ( fabs(columnMeanmedTable1_3_3[1] ) - ( 15.0 / 3.0 ) ) / fabs ( columnMeanmedTable1_3_3[1] ) < 1e-15 );
+ assert( ( fabs(columnMeanmedTable1_3_3[2] ) - ( 24.0 / 3.0 ) ) / fabs ( columnMeanmedTable1_3_3[2] ) < 1e-15 );
/*
[ 1 2 3 4 5 6 7 8 9 ] => [ 45 ]
*/
dcolumnmeana(table1, 1, 9,columnMeanmedTable1_1_9);
- assert(columnMeanmedTable1_1_9[0] == 45.0 / 9.0);
+ assert( ( fabs(columnMeanmedTable1_1_9[0] ) - ( 45.0 / 9.0 ) ) / fabs ( columnMeanmedTable1_1_9[0] ) < 1e-15 );
/*
[ 1 ]
@@ -93,8 +93,8 @@ static int dcolumnmeanaTest(void) {
[ 2 4 6 8 10 ] => [ 25 30 ]
*/
dcolumnmeana(table2, 2, 5,columnMeanmedTable2_2_5);
- assert(columnMeanmedTable2_2_5[0] == 25.0 / 5.0);
- assert(columnMeanmedTable2_2_5[1] == 30.0 / 5.0);
+ assert( ( fabs(columnMeanmedTable2_2_5[0] ) - ( 25.0 / 5.0 ) ) / fabs ( columnMeanmedTable2_2_5[0] ) < 1e-15 );
+ assert( ( fabs(columnMeanmedTable2_2_5[1] ) - ( 30.0 / 5.0 ) ) / fabs ( columnMeanmedTable2_2_5[1] ) < 1e-15 );
for ( i = 0 ; i < 2 ; ++i) {
printf("columnMeanmedTable2_2_5[%d] = %e\n", i, columnMeanmedTable2_2_5[i]);
}
@@ -107,11 +107,11 @@ static int dcolumnmeanaTest(void) {
[ 5 10 ]
*/
dcolumnmeana(table2, 5, 2,columnMeanmedTable2_5_2);
- assert(columnMeanmedTable2_5_2[0] == 7.0 / 2.0);
- assert(columnMeanmedTable2_5_2[1] == 9.0 / 2.0);
- assert(columnMeanmedTable2_5_2[2] == 11.0 / 2.0);
- assert(columnMeanmedTable2_5_2[3] == 13.0 / 2.0);
- assert(columnMeanmedTable2_5_2[4] == 15.0 / 2.0);
+ assert( ( fabs(columnMeanmedTable2_5_2[0] ) - ( 7.0 / 2.0 ) ) / fabs ( columnMeanmedTable2_5_2[0] ) < 1e-15 );
+ assert( ( fabs(columnMeanmedTable2_5_2[1] ) - ( 9.0 / 2.0 ) ) / fabs ( columnMeanmedTable2_5_2[1] ) < 1e-15 );
+ assert( ( fabs(columnMeanmedTable2_5_2[2] ) - ( 11.0 / 2.0 ) ) / fabs ( columnMeanmedTable2_5_2[2] ) < 1e-15 );
+ assert( ( fabs(columnMeanmedTable2_5_2[3] ) - ( 13.0 / 2.0 ) ) / fabs ( columnMeanmedTable2_5_2[3] ) < 1e-15 );
+ assert( ( fabs(columnMeanmedTable2_5_2[4] ) - ( 15.0 / 2.0 ) ) / fabs ( columnMeanmedTable2_5_2[4] ) < 1e-15 );
for ( i = 0 ; i < 5 ; ++i) {
printf("columnMeanmedTable2_5_2[%d] = %e\n", i, columnMeanmedTable2_5_2[i]);
}
@@ -139,9 +139,9 @@ static int drowmeanaTest(void) {
for ( i = 0 ; i < 3 ; ++i) {
printf("rowMeanmedTable1_3_3[%d] = %e\n", i, rowMeanmedTable1_3_3[i]);
}
- assert(rowMeanmedTable1_3_3[0] == 12.0 / 3.0);
- assert(rowMeanmedTable1_3_3[1] == 15.0 / 3.0);
- assert(rowMeanmedTable1_3_3[2] == 18.0 / 3.0);
+ assert( ( fabs(rowMeanmedTable1_3_3[0] ) - ( 12.0 / 3.0 ) ) / fabs ( rowMeanmedTable1_3_3[0] ) < 1e-15 );
+ assert( ( fabs(rowMeanmedTable1_3_3[1] ) - ( 15.0 / 3.0 ) ) / fabs ( rowMeanmedTable1_3_3[1] ) < 1e-15 );
+ assert( ( fabs(rowMeanmedTable1_3_3[2] ) - ( 18.0 / 3.0 ) ) / fabs ( rowMeanmedTable1_3_3[2] ) < 1e-15 );
/*
[ 1 ]
@@ -164,7 +164,7 @@ static int drowmeanaTest(void) {
[ 1 2 3 4 5 6 7 8 9 ] => [ 45 ]
*/
drowmeana(table1, 9, 1,rowMeanmedTable1_9_1);
- assert(rowMeanmedTable1_9_1[0] == 45.0 / 9.0);
+ assert( ( fabs(rowMeanmedTable1_9_1[0] ) - ( 45.0 / 9.0 ) ) / fabs ( rowMeanmedTable1_9_1[0] ) < 1e-15 );
/*
[ 1 3 5 7 9 ]
@@ -174,11 +174,11 @@ static int drowmeanaTest(void) {
for ( i = 0 ; i < 5 ; ++i) {
printf("rowMeanmedTable2_2_5[%d] = %e\n", i, rowMeanmedTable2_2_5[i]);
}
- assert(rowMeanmedTable2_2_5[0] == 3.0 / 2.0);
- assert(rowMeanmedTable2_2_5[1] == 7.0 / 2.0);
- assert(rowMeanmedTable2_2_5[2] == 11.0 / 2.0);
- assert(rowMeanmedTable2_2_5[3] == 15.0 / 2.0);
- assert(rowMeanmedTable2_2_5[4] == 19.0 / 2.0);
+ assert( ( fabs(rowMeanmedTable2_2_5[0] ) - ( 3.0 / 2.0 ) ) / fabs ( rowMeanmedTable2_2_5[0] ) < 1e-15 );
+ assert( ( fabs(rowMeanmedTable2_2_5[1] ) - ( 7.0 / 2.0 ) ) / fabs ( rowMeanmedTable2_2_5[1] ) < 1e-15 );
+ assert( ( fabs(rowMeanmedTable2_2_5[2] ) - ( 11.0 / 2.0 ) ) / fabs ( rowMeanmedTable2_2_5[2] ) < 1e-15 );
+ assert( ( fabs(rowMeanmedTable2_2_5[3] ) - ( 15.0 / 2.0 ) ) / fabs ( rowMeanmedTable2_2_5[3] ) < 1e-15 );
+ assert( ( fabs(rowMeanmedTable2_2_5[4] ) - ( 19.0 / 2.0 ) ) / fabs ( rowMeanmedTable2_2_5[4] ) < 1e-15 );
/*
[ 1 6 ]
@@ -188,8 +188,8 @@ static int drowmeanaTest(void) {
[ 5 10 ]
*/
drowmeana(table2, 5, 2,rowMeanmedTable2_5_2);
- assert(rowMeanmedTable2_5_2[0] == 15.0 / 5.0);
- assert(rowMeanmedTable2_5_2[1] == 40.0 / 5.0);
+ assert( ( fabs(rowMeanmedTable2_5_2[0] ) - ( 15.0 / 5.0 ) ) / fabs ( rowMeanmedTable2_5_2[0] ) < 1e-15 );
+ assert( ( fabs(rowMeanmedTable2_5_2[1] ) - ( 40.0 / 5.0 ) ) / fabs ( rowMeanmedTable2_5_2[1] ) < 1e-15 );
for ( i = 0 ; i < 2 ; ++i) {
printf("rowMeanmedTable2_5_2[%d] = %e\n", i, rowMeanmedTable2_5_2[i]);
}
@@ -202,10 +202,10 @@ static int zmeansTest(void) {
doubleComplex value2 = DoubleComplex(1.123456789, 1.123456789);
printf("\n>>>> Mean Double Complex Scalar Test\n");
- assert(zreals(zmeans(value1)) == 3.0);
- assert(zimags(zmeans(value1)) == 3.0);
- assert(zreals(zmeans(value2)) == 1.123456789);
- assert(zimags(zmeans(value2)) == 1.123456789);
+ assert( ( fabs(zreals(zmeans(value1)) ) - ( 3.0 ) ) / fabs ( zreals(zmeans(value1)) ) < 1e-15 );
+ assert( ( fabs(zimags(zmeans(value1)) ) - ( 3.0 ) ) / fabs ( zimags(zmeans(value1)) ) < 1e-15 );
+ assert( ( fabs(zreals(zmeans(value2)) ) - ( 1.123456789 ) ) / fabs ( zreals(zmeans(value2)) ) < 1e-15 );
+ assert( ( fabs(zimags(zmeans(value2)) ) - ( 1.123456789 ) ) / fabs ( zimags(zmeans(value2)) ) < 1e-15 );
return 0;
}
@@ -235,10 +235,10 @@ static int zmeanaTest(void) {
printf("%e\n", zimags(zmeana(table2, 5)));
printf("--------\n");
#endif
- assert(zreals(zmeana(table1, 3)) == 9.0 / 3.0);
- assert(zimags(zmeana(table1, 3)) == 9.0 / 3.0);
- assert(zreals(zmeana(table2, 5)) == (9.186784563 + 9.186784563 + 9.186784563 + 9.186784563 + 9.186784563) / 5.0);
- assert(zimags(zmeana(table2, 5)) == (9.186784563 + 9.186784563 + 9.186784563 + 9.186784563 + 9.186784563) / 5.0);
+ assert( ( fabs(zreals(zmeana(table1, 3)) ) - ( 9.0 / 3.0 ) ) / fabs ( zreals(zmeana(table1, 3)) ) < 1e-15 );
+ assert( ( fabs(zimags(zmeana(table1, 3)) ) - ( 9.0 / 3.0 ) ) / fabs ( zimags(zmeana(table1, 3)) ) < 1e-15 );
+ assert( ( fabs(zreals(zmeana(table2, 5)) ) - ( (9.186784563 + 9.186784563 + 9.186784563 + 9.186784563 + 9.186784563) / 5.0 ) ) / fabs ( zreals(zmeana(table2, 5)) ) < 1e-15 );
+ assert( ( fabs(zimags(zmeana(table2, 5)) ) - ( (9.186784563 + 9.186784563 + 9.186784563 + 9.186784563 + 9.186784563) / 5.0 ) ) / fabs ( zimags(zmeana(table2, 5)) ) < 1e-15 );
return 0;
}
@@ -271,11 +271,11 @@ static int zrowmeanaTest(void) {
printf("rowMeanmedIn_4_3[%d] = %e + %ei\n", i, zreals(rowMeanmedIn_4_3[i]), zimags(rowMeanmedIn_4_3[i]));
}
assert(fabs(zreals(rowMeanmedIn_4_3[0]) - 0.6 / 4.0) < 1e-16);
- assert(zimags(rowMeanmedIn_4_3[0]) == 3.8 / 4.0);
- assert(zreals(rowMeanmedIn_4_3[1]) == 2.2 / 4.0);
+ assert( ( fabs(zimags(rowMeanmedIn_4_3[0]) ) - ( 3.8 / 4.0 ) ) / fabs ( zimags(rowMeanmedIn_4_3[0]) ) < 1e-15 );
+ assert( ( fabs(zreals(rowMeanmedIn_4_3[1]) ) - ( 2.2 / 4.0 ) ) / fabs ( zreals(rowMeanmedIn_4_3[1]) ) < 1e-15 );
assert(fabs(zimags(rowMeanmedIn_4_3[1]) - 2.2 / 4.0) < 1e-15);
assert(fabs(zreals(rowMeanmedIn_4_3[2]) - 3.8 / 4.0) < 1e-15);
- assert(zimags(rowMeanmedIn_4_3[2]) == 0.6 / 4.0);
+ assert( ( fabs(zimags(rowMeanmedIn_4_3[2]) ) - ( 0.6 / 4.0 ) ) / fabs ( zimags(rowMeanmedIn_4_3[2]) ) < 1e-15 );
/*
[ 1.1i 0.3+0.8i 0.6+0.5i 0.9+0.2i ]
@@ -287,11 +287,11 @@ static int zrowmeanaTest(void) {
printf("rowMeanmedIn_3_4[%d] = %e + %ei\n", i, zreals(rowMeanmedIn_3_4[i]), zimags(rowMeanmedIn_3_4[i]));
}
assert(fabs(zreals(rowMeanmedIn_3_4[0]) - 0.3 / 3.0) < 1e-16);
- assert(zimags(rowMeanmedIn_3_4[0]) == 3.0 / 3.0);
+ assert( ( fabs(zimags(rowMeanmedIn_3_4[0]) ) - ( 3.0 / 3.0 ) ) / fabs ( zimags(rowMeanmedIn_3_4[0]) ) < 1e-15 );
assert(zreals(rowMeanmedIn_3_4[1]) == 1.2 / 3.0 && zimags(rowMeanmedIn_3_4[1]) == 2.1 / 3.0);
assert(fabs(zreals(rowMeanmedIn_3_4[2]) - 2.1 / 3.0) < 1e-15);
- assert(zimags(rowMeanmedIn_3_4[2]) == 1.2 / 3.0);
- assert(zreals(rowMeanmedIn_3_4[3]) == 3.0 / 3.0);
+ assert( ( fabs(zimags(rowMeanmedIn_3_4[2]) ) - ( 1.2 / 3.0 ) ) / fabs ( zimags(rowMeanmedIn_3_4[2]) ) < 1e-15 );
+ assert( ( fabs(zreals(rowMeanmedIn_3_4[3]) ) - ( 3.0 / 3.0 ) ) / fabs ( zreals(rowMeanmedIn_3_4[3]) ) < 1e-15 );
assert(fabs(zimags(rowMeanmedIn_3_4[3]) - 0.3 / 3.0) < 1e-16);
/*
@@ -318,14 +318,14 @@ static int zrowmeanaTest(void) {
printf("rowMeanmedIn_2_6[%d] = %e + %ei\n", i, zreals(rowMeanmedIn_2_6[i]), zimags(rowMeanmedIn_2_6[i]));
}
assert(zreals(rowMeanmedIn_2_6[0]) == 0.1 / 2.0 && zimags(rowMeanmedIn_2_6[0]) == 2.1 / 2.0);
- assert(zreals(rowMeanmedIn_2_6[1]) == 0.5 / 2.0);
+ assert( ( fabs(zreals(rowMeanmedIn_2_6[1]) ) - ( 0.5 / 2.0 ) ) / fabs ( zreals(rowMeanmedIn_2_6[1]) ) < 1e-15 );
assert(fabs(zimags(rowMeanmedIn_2_6[1]) == 1.7 / 2.0) < 1e-16);
- assert(zreals(rowMeanmedIn_2_6[2]) == 0.9 / 2.0);
+ assert( ( fabs(zreals(rowMeanmedIn_2_6[2]) ) - ( 0.9 / 2.0 ) ) / fabs ( zreals(rowMeanmedIn_2_6[2]) ) < 1e-15 );
assert(fabs(zimags(rowMeanmedIn_2_6[2]) == 1.3 / 2.0) < 1e-16);
assert(fabs(zreals(rowMeanmedIn_2_6[3]) == 1.3 / 2.0) < 1e-16);
- assert(zimags(rowMeanmedIn_2_6[3]) == 0.9 / 2.0);
+ assert( ( fabs(zimags(rowMeanmedIn_2_6[3]) ) - ( 0.9 / 2.0 ) ) / fabs ( zimags(rowMeanmedIn_2_6[3]) ) < 1e-15 );
assert(fabs(zreals(rowMeanmedIn_2_6[4]) == 1.7 / 2.0) < 1e-16);
- assert(zimags(rowMeanmedIn_2_6[4]) == 0.5 / 2.0);
+ assert( ( fabs(zimags(rowMeanmedIn_2_6[4]) ) - ( 0.5 / 2.0 ) ) / fabs ( zimags(rowMeanmedIn_2_6[4]) ) < 1e-15 );
assert(zreals(rowMeanmedIn_2_6[5]) == 2.1 / 2.0 && zimags(rowMeanmedIn_2_6[5]) == 0.1 / 2.0);
/*