[SPTK-CVS] SPTK/src/bin/vc _vc.c,1.8,1.9

[Shikano M. <sh...@us...>]

Update of /cvsroot/sp-tk/SPTK/src/bin/vc
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12916

Modified Files:
	_vc.c 
Log Message:
modify loop in vc command : suggested by LiXian

Index: _vc.c
===================================================================
RCS file: /cvsroot/sp-tk/SPTK/src/bin/vc/_vc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _vc.c	14 Dec 2015 01:14:24 -0000	1.8
--- _vc.c	22 Dec 2016 06:38:14 -0000	1.9
***************
*** 134,161 ****
     input = dgetmem(src_vlen_dyn);
     alloc_GMM(&gmm_xx, gmm->nmix, src_vlen_dyn, gmm->full);
!    for (t = 0; t < total_frame; t++) {
!       for (i = 0; i < src_vlen_dyn; i++) {
!          input[i] = src_with_dyn[t * src_vlen_dyn + i];
!       }
!       for (i = 0; i < (size_t) gmm_xx.nmix; i++) {
!          gmm_xx.weight[i] = gmm->weight[i];
!          for (j = 0; j < (size_t) gmm_xx.dim; j++) {
!             gmm_xx.gauss[i].mean[j] = gmm->gauss[i].mean[j];
!             if (gmm_xx.full) {
!                for (k = 0; k < (size_t) gmm_xx.dim; k++) {
!                   gmm_xx.gauss[i].cov[j][k] = gmm->gauss[i].cov[j][k];
!                }
!             } else {
!                gmm_xx.gauss[i].var[j] = gmm->gauss[i].var[j];
              }
           }
        }
!       for (i = 0; i < (size_t) gmm_xx.nmix; i++) {
!          invert(gmm_xx.gauss[i].cov, gmm_xx.gauss[i].inv, src_vlen_dyn);
!          gmm_xx.gauss[i].gconst =
!              cal_gconstf(gmm_xx.gauss[i].cov, src_vlen_dyn);
        }
        for (m = 0, logoutp = LZERO; m < gmm->nmix; m++) {
!          logwgd[m] = log_wgd(&gmm_xx, m, src_vlen_dyn, input);
           logoutp = log_add(logoutp, logwgd[m]);
        }
--- 134,160 ----
     input = dgetmem(src_vlen_dyn);
     alloc_GMM(&gmm_xx, gmm->nmix, src_vlen_dyn, gmm->full);
!    for (i = 0; i < (size_t) gmm_xx.nmix; i++) {
!       gmm_xx.weight[i] = gmm->weight[i];
!       for (j = 0; j < (size_t) gmm_xx.dim; j++) {
!          gmm_xx.gauss[i].mean[j] = gmm->gauss[i].mean[j];
!          if (gmm_xx.full) {
!             for (k = 0; k < (size_t) gmm_xx.dim; k++) {
!                gmm_xx.gauss[i].cov[j][k] = gmm->gauss[i].cov[j][k];
              }
+          } else {
+             gmm_xx.gauss[i].var[j] = gmm->gauss[i].var[j];
           }
        }
!    }
!    for (i = 0; i < (size_t) gmm_xx.nmix; i++) {
!       invert(gmm_xx.gauss[i].cov, gmm_xx.gauss[i].inv, src_vlen_dyn);
!       gmm_xx.gauss[i].gconst = cal_gconstf(gmm_xx.gauss[i].cov, src_vlen_dyn);
!    }
!    for (t = 0; t < total_frame; t++) {
!       for (i = 0; i < src_vlen_dyn; i++) {
!          input[i] = src_with_dyn[t * src_vlen_dyn + i];
        }
        for (m = 0, logoutp = LZERO; m < gmm->nmix; m++) {
!          logwgd[m] = log_wgd(&gmm_xx, m, 0, src_vlen_dyn, input);
           logoutp = log_add(logoutp, logwgd[m]);
        }
***************
*** 172,175 ****
--- 171,175 ----
        }
     }
+ 
     for (m = 0; m < gmm->nmix; m++) {
        for (i = 0; i < tgt_vlen_dyn; i++) {