vq_mbest test includes --st and --en to give weighting a work out

Author: drowe67

CMakeLists.txt

@@ -991,10 +991,11 @@ endif(NOT APPLE)
 
      add_test(NAME test_vq_mbest
              COMMAND sh -c "./tvq_mbest; \
-                            cat target.f32 | ../misc/vq_mbest -k 2 -q vq1.f32,vq2.f32 --mbest 2 -v > out.f32; \
-                            diff target.f32 out.f32"
+                            cat target.f32 | \
+                            ../misc/vq_mbest -k 4 -q vq1.f32,vq2.f32 --st 1 --en 2 --mbest 2 -v > /dev/null;"
              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unittest
              )
+             set_tests_properties(test_vq_mbest PROPERTIES PASS_REGULAR_EXPRESSION "MSE: 0.00")
 
      add_test(NAME test_700c_eq
              COMMAND sh -c "cd ${CMAKE_CURRENT_SOURCE_DIR}/unittest;

misc/vq_mbest.c

@@ -23,14 +23,15 @@ void quant_mbest(float vec_out[],
                  int   indexes[],
                  float vec_in[],
                  int   num_stages,
-                 float vq[], 
+                 float vqw[], float vq[], 
                  int   m[], int k,
-                 int   mbest_survivors, int st, int en);
+                 int   mbest_survivors);
 
 int verbose = 0;
 
 int main(int argc, char *argv[]) {
     float vq[MAX_STAGES*MAX_K*MAX_ENTRIES];
+    float vqw[MAX_STAGES*MAX_K*MAX_ENTRIES];
     int   m[MAX_STAGES];
     int   k=0, mbest_survivors=1, num_stages=0;
     char  fnames[256], fn[256], *comma, *p;
@@ -152,8 +153,10 @@ int main(int argc, char *argv[]) {
         w[i] = 0.0;
 
     /* apply weighting to codebook (rather than in search) */
-    for(int s=0; s<num_stages; s++)
-        mbest_precompute_weight(&vq[s*k*MAX_ENTRIES], w, k, m[s]);
+    memcpy(vqw, vq, sizeof(vq));
+    for(int s=0; s<num_stages; s++) {
+        mbest_precompute_weight(&vqw[s*k*MAX_ENTRIES], w, k, m[s]);
+    }
 
     int indexes[num_stages], nvecs = 0; int vec_usage[m[0]];
     for(int i=0; i<m[0]; i++) vec_usage[i] = 0;
@@ -175,7 +178,7 @@ int main(int argc, char *argv[]) {
 		target[i] += -difference;
 	    dont_count = 1;
 	}
-	quant_mbest(quantised, indexes, target, num_stages, vq, m, k, mbest_survivors, st, en);
+	quant_mbest(quantised, indexes, target, num_stages, vqw, vq, m, k, mbest_survivors);
 	if (dont_count == 0) {
 	    for(int i=st; i<=en; i++)
 		sqe += pow(target[i]-quantised[i], 2.0);
@@ -186,7 +189,7 @@ int main(int argc, char *argv[]) {
 	vec_usage[indexes[0]]++;
     }
 
-    fprintf(stderr, "%4.2f\n", sqe/(nvecs*(en-st+1)));
+    fprintf(stderr, "MSE: %4.2f\n", sqe/(nvecs*(en-st+1)));
 
     if (output_vec_usage) {
       for(int i=0; i<m[0]; i++)
@@ -214,9 +217,9 @@ void quant_mbest(float vec_out[],
                  int   indexes[],
                  float vec_in[],
                  int   num_stages,
-                 float vq[],
+                 float vqw[], float vq[],
                  int   m[], int k,
-                 int   mbest_survivors, int st, int en)
+                 int   mbest_survivors)
 {
     float err[k], se1;
     int i,j,s,s1,ind;
@@ -240,7 +243,7 @@ void quant_mbest(float vec_out[],
     /* now quantise err[] using multi-stage mbest search, preserving
        mbest_survivors at each stage */
 
-    mbest_search(vq, err, k, m[0], mbest_stage[0], index);
+    mbest_search(vqw, err, k, m[0], mbest_stage[0], index);
     if (verbose) mbest_print("Stage 1:", mbest_stage[0]);
 
     for(s=1; s<num_stages; s++) {
@@ -258,11 +261,11 @@ void quant_mbest(float vec_out[],
                 ind = index[s-s1];
                 if (verbose) fprintf(stderr, "   s: %d s1: %d s-s1: %d ind: %d\n", s,s1,s-s1,ind);
                 for(i=0; i<k; i++) {
-                    target[i] -= vq[s1*k*MAX_ENTRIES+ind*k+i];
+                    target[i] -= vqw[s1*k*MAX_ENTRIES+ind*k+i];
                 }
             }
             pv("   target: ", target, k);
-            mbest_search(&vq[s*k*MAX_ENTRIES], target, k, m[s], mbest_stage[s], index);
+            mbest_search(&vqw[s*k*MAX_ENTRIES], target, k, m[s], mbest_stage[s], index);
         }
         char str[80]; sprintf(str,"Stage %d:", s+1);
         if (verbose) mbest_print(str, mbest_stage[s]);
@@ -279,7 +282,7 @@ void quant_mbest(float vec_out[],
         int ind = indexes[s];
         float se2 = 0.0;
         for(i=0; i<k; i++) {
-            err[i] -= vq[s*k*MAX_ENTRIES+ind*k+i];
+            err[i] -= vqw[s*k*MAX_ENTRIES+ind*k+i];
             vec_out[i] += vq[s*k*MAX_ENTRIES+ind*k+i];
             se2 += err[i]*err[i];
         }

unittest/tvq_mbest.c

@@ -17,13 +17,15 @@ void write_float_file(char fn[], float *values, int n) {
 }
 
 int main(void) {
-    float target[] = {1.0,1.0};
-    write_float_file("target.f32", target, 2);
-    float vq1[] = {0.9,0.9,  /* this will be a better match on first stage */
-		   0.8,0.8}; /* but after second stage should choose this  */
-    write_float_file("vq1.f32", vq1, 4);
-    float vq2[] = {0.3,0.3,
-		   0.2,0.2}; /* 0.8+0.2 == 1.0 so best 2nd stage entry     */
-    write_float_file("vq2.f32", vq2, 4);
+    /* we're only interested in searching the inner 2 values, outer elements should be
+       ignored */
+    float target[] = {0.0,1.0,1.0,0.0};
+    write_float_file("target.f32", target, 4);
+    float vq1[] = {1.0,0.9,0.9,1.0,  /* this will be a better match on first stage */
+		   2.0,0.8,0.8,2.0}; /* but after second stage should choose this  */
+    write_float_file("vq1.f32", vq1, 8);
+    float vq2[] = {10.0,0.3,0.3,10.0,
+		   20.0,0.2,0.2,20.0}; /* 0.8+0.2 == 1.0 so best 2nd stage entry     */
+    write_float_file("vq2.f32", vq2, 8);
     return 0;
 }