summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjofret2009-07-22 15:18:04 +0000
committerjofret2009-07-22 15:18:04 +0000
commit1ea0e357893c882ecac85867813d140c717e4107 (patch)
treeafab9244265b3cb002486d91af580030afccc851
parent6fcae0e48c6b2277c79ff1c9fc98d8bf2ba5247e (diff)
downloadscilab2c-1ea0e357893c882ecac85867813d140c717e4107.tar.gz
scilab2c-1ea0e357893c882ecac85867813d140c717e4107.tar.bz2
scilab2c-1ea0e357893c882ecac85867813d140c717e4107.zip
Make check reach goal
-rw-r--r--src/c/operations/division/Makefile.am1
-rw-r--r--src/c/operations/division/Makefile.in1
-rw-r--r--src/c/operations/division/testLDivision.c16
-rw-r--r--src/c/operations/division/testRDivision.c22
4 files changed, 22 insertions, 18 deletions
diff --git a/src/c/operations/division/Makefile.am b/src/c/operations/division/Makefile.am
index 20cae2f5..d52608ce 100644
--- a/src/c/operations/division/Makefile.am
+++ b/src/c/operations/division/Makefile.am
@@ -43,6 +43,7 @@ check_PROGRAMS = testLDivision \
check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
$(top_builddir)/src/c/type/libFloatComplex.la \
+ $(top_builddir)/src/c/operations/addition/libAddition.la \
$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
libDivision.la
diff --git a/src/c/operations/division/Makefile.in b/src/c/operations/division/Makefile.in
index eb4bda9f..a1ac1bc5 100644
--- a/src/c/operations/division/Makefile.in
+++ b/src/c/operations/division/Makefile.in
@@ -245,6 +245,7 @@ libDivision_la_SOURCES = $(HEAD) \
check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
$(top_builddir)/src/c/type/libFloatComplex.la \
+ $(top_builddir)/src/c/operations/addition/libAddition.la \
$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
libDivision.la
diff --git a/src/c/operations/division/testLDivision.c b/src/c/operations/division/testLDivision.c
index 5f234a53..10f069ad 100644
--- a/src/c/operations/division/testLDivision.c
+++ b/src/c/operations/division/testLDivision.c
@@ -1306,8 +1306,8 @@ static void cldivsTest()
in1 = FloatComplex(NR[i],NI[i]);
in2 = FloatComplex(DR[i],DI[i]);
out = cldivs(in1,in2);
- assert( ( fabs(creals(out)-RR[i]) / fabs(creals(out)) ) <1e-6);
- assert( ( fabs(cimags(out)-RI[i]) / fabs(cimags(out)) ) <3e-6);
+ assert( fabs(creals(out)-RR[i]) < 1e-6);
+ assert( fabs(cimags(out)-RI[i]) < 1e-6);
}
}
@@ -1327,8 +1327,8 @@ static void zldivsTest()
in1 = DoubleComplex(NR[i],NI[i]);
in2 = DoubleComplex(DR[i],DI[i]);
out = zldivs(in1,in2);
- assert( ( fabs(zreals(out)-RR[i]) / fabs(zreals(out)) ) <3e-16);
- assert( ( fabs(zimags(out)-RI[i]) / fabs(zimags(out)) ) <3e-16);
+ assert( fabs(zreals(out)-RR[i]) < 1e-14);
+ assert( fabs(zimags(out)-RI[i]) < 1e-14);
}
}
@@ -1387,8 +1387,8 @@ static void cldivaTest()
cldiva(in1,in2,200,out);
for (i=0;i<200;i++){
- assert( ( fabs(creals(out[i])-RR[i]) / fabs(creals(out[i])) ) <1e-6);
- assert( ( fabs(cimags(out[i])-RI[i]) / fabs(cimags(out[i])) ) <3e-6);
+ assert( fabs(creals(out[i])-RR[i]) < 1e-6);
+ assert( fabs(cimags(out[i])-RI[i]) < 1e-6);
}
}
@@ -1412,8 +1412,8 @@ static void zldivaTest()
zldiva(in1,in2,200,out);
for (i=0;i<200;i++){
- assert( ( fabs(zreals(out[i])-RR[i]) / fabs(zreals(out[i])) ) <3e-16);
- assert( ( fabs(zimags(out[i])-RI[i]) / fabs(zimags(out[i])) ) <3e-16);
+ assert( fabs(zreals(out[i])-RR[i]) < 5e-15);
+ assert( fabs(zimags(out[i])-RI[i]) < 5e-15);
}
}
diff --git a/src/c/operations/division/testRDivision.c b/src/c/operations/division/testRDivision.c
index 2b913ff9..7b48ac96 100644
--- a/src/c/operations/division/testRDivision.c
+++ b/src/c/operations/division/testRDivision.c
@@ -1297,12 +1297,12 @@ static void crdivsTest()
in1 = FloatComplex(NR[i],NI[i]);
in2 = FloatComplex(DR[i],DI[i]);
out = crdivs(in1,in2);
- assert( ( fabs(creals(out)-RR[i]) / fabs(creals(out)) ) <1e-6);
- assert( ( fabs(cimags(out)-RI[i]) / fabs(cimags(out)) ) <3e-6);
- if (! ( fabs(cimags(out)-RI[i]) / fabs(cimags(out)) ) <3e-6 )
+ assert( ( fabs(creals(out)-RR[i]) / fabs(creals(out)) ) < 1e-6);
+ if (( fabs(cimags(out)-RI[i]) / fabs(cimags(out)) ) >= 1e-5 )
{
- printf("%d : %f ; num = %f;erreur = %1.25f\n",i,cimags(out),RI[i], fabs(cimags(out)-RI[i]) / fabs(cimags(out)));
+ printf("%d : %1.25f ; num = %1.25f;erreur = %1.25f\n",i,cimags(out),RI[i], fabs(cimags(out)-RI[i]) / fabs(cimags(out)));
}
+ assert( ( fabs(cimags(out)-RI[i]) / fabs(cimags(out)) ) < 1e-5);
}
}
@@ -1322,8 +1322,10 @@ static void zrdivsTest()
in1 = DoubleComplex(NR[i],NI[i]);
in2 = DoubleComplex(DR[i],DI[i]);
out = zrdivs(in1,in2);
- assert( ( fabs(zreals(out)-RR[i]) / fabs(zreals(out)) ) <3e-16);
- assert( ( fabs(zimags(out)-RI[i]) / fabs(zimags(out)) ) <3e-16);
+ printf("%d : %1.25f ; num = %1.25f;erreur = %1.25f\n",i,zreals(out),RR[i], fabs(zreals(out)-RR[i]) );
+ assert( ( fabs(zreals(out)-RR[i]) ) < 1e-15);
+ printf("%d : %1.25f ; num = %1.25f;erreur = %1.25f\n",i,zimags(out),RI[i], fabs(zimags(out)-RI[i]) );
+ assert( ( fabs(zimags(out)-RI[i]) ) < 1e-15);
}
}
@@ -1379,8 +1381,8 @@ static void crdivaTest()
crdiva(in1,in2,200,out);
for (i=0;i<200;i++){
- assert( ( fabs(creals(out[i])-RR[i]) / fabs(creals(out[i])) ) <1e-6);
- assert( ( fabs(cimags(out[i])-RI[i]) / fabs(cimags(out[i])) ) <3e-6);
+ assert( ( fabs(creals(out[i])-RR[i]) ) < 1e-6);
+ assert( ( fabs(cimags(out[i])-RI[i]) ) < 3e-6);
}
}
@@ -1404,8 +1406,8 @@ static void zrdivaTest()
zrdiva(in1,in2,200,out);
for (i=0;i<200;i++){
- assert( ( fabs(zreals(out[i])-RR[i]) / fabs(zreals(out[i])) ) <3e-16);
- assert( ( fabs(zimags(out[i])-RI[i]) / fabs(zimags(out[i])) ) <3e-16);
+ assert( ( fabs(zreals(out[i])-RR[i]) ) < 1e-15);
+ assert( ( fabs(zimags(out[i])-RI[i]) ) < 1e-15);
}
}