diff options
Diffstat (limited to 'src/signalProcessing/conv')
| -rw-r--r-- | src/signalProcessing/conv/Makefile.am | 1 | ||||
| -rw-r--r-- | src/signalProcessing/conv/Makefile.in | 1 | ||||
| -rw-r--r-- | src/signalProcessing/conv/testDoubleConv.c | 24 | ||||
| -rw-r--r-- | src/signalProcessing/conv/testFloatConv.c | 6 |
4 files changed, 17 insertions, 15 deletions
diff --git a/src/signalProcessing/conv/Makefile.am b/src/signalProcessing/conv/Makefile.am index 4ab5a6bc..5599b11e 100644 --- a/src/signalProcessing/conv/Makefile.am +++ b/src/signalProcessing/conv/Makefile.am @@ -47,6 +47,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/lib/blas/libsciblas.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/operations/subtraction/libSubtraction.la \ + $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ libConv.la diff --git a/src/signalProcessing/conv/Makefile.in b/src/signalProcessing/conv/Makefile.in index 1fea8f10..fc30bca4 100644 --- a/src/signalProcessing/conv/Makefile.in +++ b/src/signalProcessing/conv/Makefile.in @@ -227,6 +227,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/lib/blas/libsciblas.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/operations/subtraction/libSubtraction.la \ + $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ libConv.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/signalProcessing/conv/testDoubleConv.c b/src/signalProcessing/conv/testDoubleConv.c index b552b46a..bf09104e 100644 --- a/src/signalProcessing/conv/testDoubleConv.c +++ b/src/signalProcessing/conv/testDoubleConv.c @@ -37,22 +37,22 @@ static void dconvaTest(void){ dconva(x1,2,h1,1,out1); for (i=0;i<2;i++){ - assert( ( fabs(out1[i]-conv1[i]) / fabs(out1[i]) ) <1e-15); + assert( ( fabs(out1[i]-conv1[i]) / fabs(out1[i]) ) <3e-16); } dconva(h1,1,x1,2,out1); for (i=0;i<2;i++){ - assert( ( fabs(out1[i]-conv1[i]) / fabs(out1[i]) ) <1e-15); + assert( ( fabs(out1[i]-conv1[i]) / fabs(out1[i]) ) <3e-16); } dconva(x2,8,h2,5,out2); for (i=0;i<12;i++){ - assert( ( fabs(out2[i]-conv2[i]) / fabs(out2[i]) ) <1e-15); + assert( ( fabs(out2[i]-conv2[i]) / fabs(out2[i]) ) <3e-16); } dconva(h2,5,x2,8,out2); for (i=0;i<12;i++){ - assert( ( fabs(out2[i]-conv2[i]) / fabs(out2[i]) ) <1e-15); + assert( ( fabs(out2[i]-conv2[i]) / fabs(out2[i]) ) <3e-16); } } @@ -94,26 +94,26 @@ static void zconvaTest(void){ zconva(x1,2,h1,1,out1); for (i=0;i<2;i++){ - assert( ( fabs(zreals(out1[i])-rconv1[i]) / fabs(zreals(out1[i])) ) <1e-15); - assert( ( fabs(zimags(out1[i])-iconv1[i]) / fabs(zimags(out1[i])) ) <1e-15); + assert( ( fabs(zreals(out1[i])-rconv1[i]) / fabs(zreals(out1[i])) ) <3e-16); + assert( ( fabs(zimags(out1[i])-iconv1[i]) / fabs(zimags(out1[i])) ) <3e-16); } zconva(h1,1,x1,2,out1); for (i=0;i<2;i++){ - assert( ( fabs(zreals(out1[i])-rconv1[i]) / fabs(zreals(out1[i])) ) <1e-15); - assert( ( fabs(zimags(out1[i])-iconv1[i]) / fabs(zimags(out1[i])) ) <1e-15); + assert( ( fabs(zreals(out1[i])-rconv1[i]) / fabs(zreals(out1[i])) ) <3e-16); + assert( ( fabs(zimags(out1[i])-iconv1[i]) / fabs(zimags(out1[i])) ) <3e-16); } zconva(x2,4,h2,7,out2); for (i=0;i<7;i++){ - assert( ( fabs(zreals(out2[i])-rconv2[i]) / fabs(zreals(out2[i])) ) <1e-15); - assert( ( fabs(zimags(out2[i])-iconv2[i]) / fabs(zimags(out2[i])) ) <1e-15); + assert( ( fabs(zreals(out2[i])-rconv2[i]) / fabs(zreals(out2[i])) ) <3e-16); + assert( ( fabs(zimags(out2[i])-iconv2[i]) / fabs(zimags(out2[i])) ) <3e-16); } zconva(h2,7,x2,4,out2); for (i=0;i<10;i++){ - assert( ( fabs(zreals(out2[i])-rconv2[i]) / fabs(zreals(out2[i])) ) <1e-14); - assert( ( fabs(zimags(out2[i])-iconv2[i]) / fabs(zimags(out2[i])) ) <1e-15); + assert( ( fabs(zreals(out2[i])-rconv2[i]) / fabs(zreals(out2[i])) ) <3e-16); + assert( ( fabs(zimags(out2[i])-iconv2[i]) / fabs(zimags(out2[i])) ) <3e-16); } } diff --git a/src/signalProcessing/conv/testFloatConv.c b/src/signalProcessing/conv/testFloatConv.c index 787ab2cd..932f3752 100644 --- a/src/signalProcessing/conv/testFloatConv.c +++ b/src/signalProcessing/conv/testFloatConv.c @@ -107,13 +107,13 @@ static void cconvaTest(void){ cconva(x2,4,h2,7,out2); for (i=0;i<10;i++){ - assert( ( fabs(creals(out2[i])-rconv2[i]) / fabs(creals(out2[i])) ) <1e-5); + assert( ( fabs(creals(out2[i])-rconv2[i]) / fabs(creals(out2[i])) ) <3e-6); assert( ( fabs(cimags(out2[i])-iconv2[i]) / fabs(cimags(out2[i])) ) <1e-6); } cconva(h2,7,x2,4,out2); for (i=0;i<10;i++){ - assert( ( fabs(creals(out2[i])-rconv2[i]) / fabs(creals(out2[i])) ) <1e-5); + assert( ( fabs(creals(out2[i])-rconv2[i]) / fabs(creals(out2[i])) ) <3e-6); assert( ( fabs(cimags(out2[i])-iconv2[i]) / fabs(cimags(out2[i])) ) <1e-6); } @@ -122,7 +122,7 @@ static void cconvaTest(void){ static int convTest(void){ - printf("\n>>>> Conv Double Tests\n"); + printf("\n>>>> Conv Float Tests\n"); sconvaTest(); cconvaTest(); return 0; |