about to change to split design

git-svn-id: https://svn.code.sf.net/p/freetel/code@606 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/unittest/Makefile.in b/codec2-dev/unittest/Makefile.in
index f2a6835003c616a7fbb1ec90369bbdf3230c5f3d..f03d3a4138d251aaed422c36ac3ec70ad74dd178 100644 (file)
--- a/codec2-dev/unittest/Makefile.in
+++ b/codec2-dev/unittest/Makefile.in
@@ -41,8 +41,8 @@ noinst_PROGRAMS = genres$(EXEEXT) genlsp$(EXEEXT) extract$(EXEEXT) \
        tinterp$(EXEEXT) tquant$(EXEEXT) vq_train_jvm$(EXEEXT) \
        scalarlsptest$(EXEEXT) tfdmdv$(EXEEXT) t48_8$(EXEEXT) \
        lspsync$(EXEEXT) create_interleaver$(EXEEXT) tlspsens$(EXEEXT) \
-       tphinterp$(EXEEXT) vqtrainph$(EXEEXT) genphdata$(EXEEXT) \
-       genampdata$(EXEEXT) polar2rect$(EXEEXT) vqtrainsp$(EXEEXT)
+       vqtrainph$(EXEEXT) genphdata$(EXEEXT) genampdata$(EXEEXT) \
+       polar2rect$(EXEEXT) vqtrainsp$(EXEEXT)
 subdir = unittest
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -149,16 +149,16 @@ SOURCES = $(create_interleaver_SOURCES) $(extract_SOURCES) \
        $(genres_SOURCES) $(lspsync_SOURCES) $(polar2rect_SOURCES) \
        $(scalarlsptest_SOURCES) $(t48_8_SOURCES) $(tfdmdv_SOURCES) \
        $(tinterp_SOURCES) $(tlspsens_SOURCES) $(tnlp_SOURCES) \
-       $(tphinterp_SOURCES) $(tquant_SOURCES) $(vq_train_jvm_SOURCES) \
-       $(vqtrain_SOURCES) $(vqtrainjnd_SOURCES) $(vqtrainph_SOURCES) \
+       $(tquant_SOURCES) $(vq_train_jvm_SOURCES) $(vqtrain_SOURCES) \
+       $(vqtrainjnd_SOURCES) $(vqtrainph_SOURCES) \
        $(vqtrainsp_SOURCES)
 DIST_SOURCES = $(create_interleaver_SOURCES) $(extract_SOURCES) \
        $(genampdata_SOURCES) $(genlsp_SOURCES) $(genphdata_SOURCES) \
        $(genres_SOURCES) $(lspsync_SOURCES) $(polar2rect_SOURCES) \
        $(scalarlsptest_SOURCES) $(t48_8_SOURCES) $(tfdmdv_SOURCES) \
        $(tinterp_SOURCES) $(tlspsens_SOURCES) $(tnlp_SOURCES) \
-       $(tphinterp_SOURCES) $(tquant_SOURCES) $(vq_train_jvm_SOURCES) \
-       $(vqtrain_SOURCES) $(vqtrainjnd_SOURCES) $(vqtrainph_SOURCES) \
+       $(tquant_SOURCES) $(vq_train_jvm_SOURCES) $(vqtrain_SOURCES) \
+       $(vqtrainjnd_SOURCES) $(vqtrainph_SOURCES) \
        $(vqtrainsp_SOURCES)
 ETAGS = etags
 CTAGS = ctags

diff --git a/codec2-dev/unittest/vqtrainsp.c b/codec2-dev/unittest/vqtrainsp.c
index 45158099a4474282369b641b0340e27789a226d6..d7cb2e0c47192c34b604a3ceb91263a11c91c2e7 100644 (file)
--- a/codec2-dev/unittest/vqtrainsp.c
+++ b/codec2-dev/unittest/vqtrainsp.c
@@ -183,7 +183,7 @@ int main(int argc, char *argv[]) {
            ind = quantise(cb, vec, d, e, &se);
            #ifdef DBG
            print_vec(vec, d, 1);
-           printf("      ind %d\n", ind);
+           printf("      ind %d se: %f\n", ind, se);
            #endif
            acc(&cent[ind*d], vec, d);
            for(j=0; j<d; j++)
@@ -364,7 +364,7 @@ int quantise(float cb[], float vec[], int d, int e, float *se)
    for(j=0; j<e; j++) {
        error = 0.0; n = 0;
        for(i=0; i<d; i++) {
-          if ((vec[i] != 0.0)&& (cb[j*d+i] != 0.0)) {
+          if ((vec[i] != 0.0) && (cb[j*d+i] != 0.0)) {
               diff = cb[j*d+i] - vec[i];
               error += diff*diff;
               n++;