CMU Sphinx

Revision: 6069
Author:   dhdfu
Date:     2006-08-25 16:02:07 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6069&view=rev

Log Message:
-----------
fix one obvious memory leak but I fear another one lurks

Modified Paths:
--------------
    trunk/SphinxTrain/src/programs/lda_train/main.c
Modified: trunk/SphinxTrain/src/programs/lda_train/main.c
===================================================================
--- trunk/SphinxTrain/src/programs/lda_train/main.c	2006-08-25 22:51:32 UTC (rev 6068)
+++ trunk/SphinxTrain/src/programs/lda_train/main.c	2006-08-25 23:02:07 UTC (rev 6069)
@@ -126,6 +126,7 @@
         }
         n_frame += utt_n_frame;
 
+        ckd_free(seg);
         feat_free(feat);
         ckd_free(mfcc[0]);
         ckd_free(mfcc);
@@ -164,6 +165,7 @@
             matrixadd(scatter[class], op, featlen, featlen);
         }
 
+        ckd_free(seg);
         feat_free(feat);
         ckd_free(mfcc[0]);
         ckd_free(mfcc);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6068
Author:   egouvea
Date:     2006-08-25 15:51:32 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6068&view=rev

Log Message:
-----------
Added missing step at the end: copying the final models to the right place

Modified Paths:
--------------
    trunk/SphinxTrain/scripts_pl/50.cd_hmm_tied/norm_and_launchbw.pl
Modified: trunk/SphinxTrain/scripts_pl/50.cd_hmm_tied/norm_and_launchbw.pl
===================================================================
--- trunk/SphinxTrain/scripts_pl/50.cd_hmm_tied/norm_and_launchbw.pl	2006-08-25 21:42:18 UTC (rev 6067)
+++ trunk/SphinxTrain/scripts_pl/50.cd_hmm_tied/norm_and_launchbw.pl	2006-08-25 22:51:32 UTC (rev 6068)
@@ -212,5 +212,10 @@
 
         Launch_BW($n_gau + $n_split, 0);
 	exit 0;
-    }
+      } elsif ($n_gau == $ST::CFG_FINAL_NUM_DENSITIES) {
+# If we finally reached the desired number of densities, we still have
+# to copy the models to their final destination. The split gaussian
+# script below will do just that
+        RunScript('split_gaussians.pl', $ST::CFG_FINAL_NUM_DENSITIES, 0);
+      }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6067
Author:   dhdfu
Date:     2006-08-25 14:42:18 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6067&view=rev

Log Message:
-----------
Fix windowed features hopefully

Modified Paths:
--------------
    trunk/sphinxbase/src/libsphinxfeat/feat.c
    trunk/sphinxbase/test/unit/Makefile.am
Modified: trunk/sphinxbase/src/libsphinxfeat/feat.c
===================================================================
--- trunk/sphinxbase/src/libsphinxfeat/feat.c	2006-08-25 21:22:37 UTC (rev 6066)
+++ trunk/sphinxbase/src/libsphinxfeat/feat.c	2006-08-25 21:42:18 UTC (rev 6067)
@@ -701,10 +701,14 @@
         uint32 spos = 0;
 
         for (j = 0; j < feat_n_stream(fcb); ++j) {
-            memcpy(feat[j] + ((i + win) * feat_stream_len(fcb, j)),
+            uint32 stream_len;
+
+            /* Unscale the stream length by the window. */
+            stream_len = feat_stream_len(fcb, j) / (2 * win + 1);
+            memcpy(feat[j] + ((i + win) * stream_len),
                    mfc[i] + spos,
-                   feat_stream_len(fcb, j) * sizeof(float32));
-            spos += feat_stream_len(fcb, j);
+                   stream_len * sizeof(float32));
+            spos += stream_len;
         }
     }
 }

Modified: trunk/sphinxbase/test/unit/Makefile.am
===================================================================
--- trunk/sphinxbase/test/unit/Makefile.am	2006-08-25 21:22:37 UTC (rev 6066)
+++ trunk/sphinxbase/test/unit/Makefile.am	2006-08-25 21:42:18 UTC (rev 6067)
@@ -1,2 +1,2 @@
-SUBDIRS=test_case test_hash test_matrix
+SUBDIRS=test_case test_hash test_matrix test_feat
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6066
Author:   dhdfu
Date:     2006-08-25 14:22:37 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6066&view=rev

Log Message:
-----------
oops

Modified Paths:
--------------
    trunk/SphinxTrain/src/libs/libcommon/vector.c
Modified: trunk/SphinxTrain/src/libs/libcommon/vector.c
===================================================================
--- trunk/SphinxTrain/src/libs/libcommon/vector.c	2006-08-25 21:19:46 UTC (rev 6065)
+++ trunk/SphinxTrain/src/libs/libcommon/vector.c	2006-08-25 21:22:37 UTC (rev 6066)
@@ -147,7 +147,7 @@
 		a[i] *= b[i];
 }
 
-void
+float64
 vector_dot(const vector_t a, const vector_t b, uint32 dim)
 {
 	uint32 i;
@@ -155,6 +155,7 @@
 
 	for (i = 0; i < dim; ++i)
 		p += a[i] * b[i];
+	return p;
 }
 
 /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6065
Author:   dhdfu
Date:     2006-08-25 14:19:46 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6065&view=rev

Log Message:
-----------
Add a slightly hacky parameter to allow arbitrary concatenated windows of input features (spectra or cepstra).  Mostly useful for LDA

Modified Paths:
--------------
    trunk/SphinxTrain/src/libs/libcep_feat/feat.c
    trunk/SphinxTrain/src/libs/libcep_feat/v4_feat.c
    trunk/SphinxTrain/src/programs/agg_seg/parse_cmd_ln.c
    trunk/SphinxTrain/src/programs/bw/train_cmd_ln.c
    trunk/SphinxTrain/src/programs/cp_parm/cmd_ln_defn.h
    trunk/SphinxTrain/src/programs/delint/parse_cmd_ln.c
    trunk/SphinxTrain/src/programs/inc_comp/parse_cmd_ln.c
    trunk/SphinxTrain/src/programs/init_gau/parse_cmd_ln.c
    trunk/SphinxTrain/src/programs/init_mixw/parse_cmd_ln.c
    trunk/SphinxTrain/src/programs/kmeans_init/parse_cmd_ln.c
    trunk/SphinxTrain/src/programs/lda_train/parse_cmd_ln.c
    trunk/SphinxTrain/src/programs/mk_s3gau/parse_cmd_ln.c
    trunk/SphinxTrain/src/programs/norm/parse_cmd_ln.c
Modified: trunk/SphinxTrain/src/libs/libcep_feat/feat.c
===================================================================
--- trunk/SphinxTrain/src/libs/libcep_feat/feat.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/libs/libcep_feat/feat.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -95,6 +95,8 @@
     "c/0..L-1/d/0..L-1/",
     "c/0..L-1/",
     "c/0..L-1/dd/0..L-1/",
+    "d/0..L-1/",
+    "dd/0..L-1/",
     NULL
 };
 
@@ -196,6 +198,12 @@
 {
     uint32 i;
 
+    /* HACK: "s2_4x" is an alias for sphinx-II features. */
+    if (strcmp(id_name, "s2_4x") == 0) {
+	fid = FEAT_ID_SPHINX_II_STD;
+	return S3_SUCCESS;
+    }
+
     for (i = 0; name2id[i]; i++) {
 	if (strcmp(id_name, name2id[i]) == 0) {
 	    fid = i;

Modified: trunk/SphinxTrain/src/libs/libcep_feat/v4_feat.c
===================================================================
--- trunk/SphinxTrain/src/libs/libcep_feat/v4_feat.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/libs/libcep_feat/v4_feat.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-2000 Carnegie Mellon University.  All rights 
+ * Copyright (c) 1995-2006 Carnegie Mellon University.  All rights 
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,7 @@
 static uint32 n_feat = N_FEAT;
 static uint32 vecsize[1];
 static uint32 mfcc_len;
+static int32 window_size;
 
 const char *
 v4_feat_doc()
@@ -105,8 +106,9 @@
 v4_feat_set_in_veclen(uint32 veclen)
 {
     mfcc_len = veclen;
+    window_size = cmd_ln_int32("-cepwin");
 
-    vecsize[0] = veclen;
+    vecsize[0] = veclen * (window_size * 2 + 1);
 
     cmn_set_veclen(veclen);
     agc_set_veclen(veclen);
@@ -161,7 +163,7 @@
     uint32 svd_n_frame;
     uint32 n_frame;
     const char *comp_type = cmd_ln_access("-silcomp");
-    uint32 i;
+    int32 i, j;
     uint32 mfcc_len;
     void v4_mfcc_print(vector_t *mfcc, uint32 n_frame);
     
@@ -178,8 +180,24 @@
 
     out = v4_feat_alloc(n_frame);
 
-    for (i = 0; i < n_frame; i++) {
-	memcpy(out[i][0], mfcc[i], mfcc_len * sizeof(float32));
+    for (i = 0; i < n_frame; ++i) {
+	uint32 spos = 0;
+
+	for (j = -window_size; j <= window_size; ++j) {
+	    int32 ii;
+
+	    /* Duplicate the first and last frames for out-of-bounds
+	       window indices. */
+	    if (i + j < 0)
+		ii = -j;
+	    else if (i + j >= n_frame)
+		ii = n_frame - j - 1;
+	    else
+		ii = i;
+
+	    memcpy(out[i][0] + spos, mfcc[(int32)ii + j], mfcc_len * sizeof(float32));
+	    spos += mfcc_len;
+	}
     }
 
     *inout_n_frame = n_frame;

Modified: trunk/SphinxTrain/src/programs/agg_seg/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/agg_seg/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/agg_seg/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -257,6 +257,11 @@
 	  CMD_LN_NO_VALIDATION,
 	  "13",
 	  "# of coefficients per cepstrum frame"},
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
 
 	{ "-agc",
 	  CMD_LN_STRING,

Modified: trunk/SphinxTrain/src/programs/bw/train_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/bw/train_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/bw/train_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -499,6 +499,12 @@
 	  "13",
 	  "The length of the input feature (e.g. MFCC) vectors"},
 
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
+
 	{ "-agc",
 	  CMD_LN_STRING,
 	  CMD_LN_NO_VALIDATION,

Modified: trunk/SphinxTrain/src/programs/cp_parm/cmd_ln_defn.h
===================================================================
--- trunk/SphinxTrain/src/programs/cp_parm/cmd_ln_defn.h	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/cp_parm/cmd_ln_defn.h	2006-08-25 21:19:46 UTC (rev 6065)
@@ -163,12 +163,17 @@
 	  "c[1..L-1]d[1..L-1]c[0]d[0]dd[0]dd[1..L-1]",
 	  "Feature set to use" },
 
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
+	  
 	{ "-ceplen",
 	  CMD_LN_INT32,
 	  CMD_LN_NO_VALIDATION,
 	  "13",
 	  "# of components in base feature vector"},
-
 	  
     { NULL, CMD_LN_UNDEF, CMD_LN_NO_VALIDATION, CMD_LN_NO_DEFAULT, NULL }
     };

Modified: trunk/SphinxTrain/src/programs/delint/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/delint/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/delint/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -150,6 +150,11 @@
 	  CMD_LN_NO_VALIDATION,
 	  "13",
 	  "Input feature vector length (e.g. MFCC)"},
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
 	{ NULL, CMD_LN_UNDEF, CMD_LN_NO_VALIDATION, CMD_LN_NO_DEFAULT, NULL }
     };
 

Modified: trunk/SphinxTrain/src/programs/inc_comp/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/inc_comp/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/inc_comp/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -159,13 +159,18 @@
           "13",
           "The length of the input feature (e.g. MFCC) vectors"},
  
-
 	{ "-feat",
 	  CMD_LN_STRING,
 	  CMD_LN_NO_VALIDATION,
 	  CMD_LN_NO_DEFAULT,
 	  "Defines the acoustic feature set."},
 
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
+	  
 	{ NULL, CMD_LN_UNDEF, CMD_LN_NO_VALIDATION, CMD_LN_NO_DEFAULT, NULL }
     };
 

Modified: trunk/SphinxTrain/src/programs/init_gau/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/init_gau/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/init_gau/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -217,6 +217,11 @@
 	  CMD_LN_NO_VALIDATION,
 	  "13",
 	  "# of components in cepstrum vector"},
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
 	{ "-ldafn",
 	  CMD_LN_STRING,
 	  CMD_LN_NO_VALIDATION,

Modified: trunk/SphinxTrain/src/programs/init_mixw/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/init_mixw/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/init_mixw/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -166,6 +166,11 @@
 	  CMD_LN_NO_VALIDATION,
 	  "13",
 	  "Size of the input feature vector length"},
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
 	{ NULL, CMD_LN_UNDEF, CMD_LN_NO_VALIDATION, CMD_LN_NO_DEFAULT, NULL }
     };
 

Modified: trunk/SphinxTrain/src/programs/kmeans_init/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/kmeans_init/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/kmeans_init/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -181,6 +181,11 @@
 	  CMD_LN_NO_VALIDATION,
 	  "13",
 	  "The length of the input feature (e.g. MFCC) vectors"},
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
 	{ "-agc",
 	  CMD_LN_STRING,
 	  CMD_LN_NO_VALIDATION,

Modified: trunk/SphinxTrain/src/programs/lda_train/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/lda_train/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/lda_train/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -166,6 +166,11 @@
 	  CMD_LN_NO_VALIDATION,
 	  "13",
 	  "# of components in cepstrum vector"},
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
 	{ "-outfn",
 	  CMD_LN_STRING,
 	  CMD_LN_NO_VALIDATION,

Modified: trunk/SphinxTrain/src/programs/mk_s3gau/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/mk_s3gau/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/mk_s3gau/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -156,6 +156,12 @@
 	  "13",
 	  "Defines the input feature vector (e.g. MFCC) len" },
 
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
+
 	{ NULL,
 	  CMD_LN_UNDEF,
 	  CMD_LN_NO_VALIDATION,

Modified: trunk/SphinxTrain/src/programs/norm/parse_cmd_ln.c
===================================================================
--- trunk/SphinxTrain/src/programs/norm/parse_cmd_ln.c	2006-08-25 19:54:41 UTC (rev 6064)
+++ trunk/SphinxTrain/src/programs/norm/parse_cmd_ln.c	2006-08-25 21:19:46 UTC (rev 6065)
@@ -162,6 +162,11 @@
 	  CMD_LN_NO_VALIDATION,
 	  CMD_LN_NO_DEFAULT,
 	  "The vector length of the source features (e.g. MFCC)" },
+	{ "-cepwin",
+	  CMD_LN_INT32,
+	  CMD_LN_NO_VALIDATION,
+	  "0",
+	  "sliding window of features to concatenate (for -feat 1s_c ONLY)"},
 
 	{ NULL, CMD_LN_UNDEF, CMD_LN_NO_VALIDATION, CMD_LN_NO_DEFAULT, NULL }
     };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6064
Author:   dhdfu
Date:     2006-08-25 12:54:41 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6064&view=rev

Log Message:
-----------
Add support for concatenating adjacent frames of "raw" features (for LDA), and add a unit test for this and other feature stuff

Modified Paths:
--------------
    trunk/sphinxbase/configure.in
    trunk/sphinxbase/src/libsphinxfeat/feat.c

Added Paths:
-----------
    trunk/sphinxbase/test/unit/test_feat/
    trunk/sphinxbase/test/unit/test_feat/Makefile.am
    trunk/sphinxbase/test/unit/test_feat/_test_feat.res
    trunk/sphinxbase/test/unit/test_feat/_test_feat.test
    trunk/sphinxbase/test/unit/test_feat/test_feat.c
Modified: trunk/sphinxbase/configure.in
===================================================================
--- trunk/sphinxbase/configure.in	2006-08-25 18:36:00 UTC (rev 6063)
+++ trunk/sphinxbase/configure.in	2006-08-25 19:54:41 UTC (rev 6064)
@@ -183,6 +183,7 @@
 test/unit/test_case/Makefile
 test/unit/test_hash/Makefile
 test/unit/test_matrix/Makefile
+test/unit/test_feat/Makefile
 test/regression/Makefile
 test/regression/test-cepview.sh
 test/regression/test-sphinx_fe-dither-seed.sh
@@ -190,4 +191,4 @@
 test/regression/test-sphinx_fe.sh
 ])
 
-chmod +x test/regression/*.sh
\ No newline at end of file
+chmod +x test/regression/*.sh

Modified: trunk/sphinxbase/src/libsphinxfeat/feat.c
===================================================================
--- trunk/sphinxbase/src/libsphinxfeat/feat.c	2006-08-25 18:36:00 UTC (rev 6063)
+++ trunk/sphinxbase/src/libsphinxfeat/feat.c	2006-08-25 19:54:41 UTC (rev 6064)
@@ -641,7 +641,7 @@
         f[i] = w[i] - _w[i];
 }
 
-void
+static void
 feat_1s_c_d_dd_cep2feat(feat_t * fcb, float32 ** mfc, float32 ** feat)
 {
     float32 *f;
@@ -689,6 +689,26 @@
     }
 }
 
+static void
+feat_copy(feat_t * fcb, float32 ** mfc, float32 ** feat)
+{
+    int32 win, i, j;
+
+    win = feat_window_size(fcb);
+
+    /* Concatenate input features */
+    for (i = -win; i <= win; ++i) {
+        uint32 spos = 0;
+
+        for (j = 0; j < feat_n_stream(fcb); ++j) {
+            memcpy(feat[j] + ((i + win) * feat_stream_len(fcb, j)),
+                   mfc[i] + spos,
+                   feat_stream_len(fcb, j) * sizeof(float32));
+            spos += feat_stream_len(fcb, j);
+        }
+    }
+}
+
 feat_t *
 feat_init(char *type, char *cmn, char *varnorm, char *agc, int32 breport)
 {
@@ -779,16 +799,25 @@
     }
     else {
         /*
-         * Generic definition: Format should be %d,%d,%d,...,%d (i.e., comma separated
-         * list of feature stream widths; #items = #streams).
+         * Generic definition: Format should be %d,%d,%d,...,%d (i.e.,
+         * comma separated list of feature stream widths; #items =
+         * #streams).  An optional window size (frames will be
+         * concatenated) is also allowed, which can be specified with
+         * a colon after the list of feature streams.
          */
         l = strlen(type);
         k = 0;
-        for (i = 1; i < l - 1; i++)
+        for (i = 1; i < l - 1; i++) {
             if (type[i] == ',') {
                 type[i] = ' ';
                 k++;
             }
+            else if (type[i] == ':') {
+                type[i] = '\0';
+                fcb->window_size = atoi(type + i + 1);
+                break;
+            }
+        }
         k++;                    /* Presumably there are (#commas+1) streams */
         fcb->n_stream = k;
         fcb->stream_len = (int32 *) ckd_calloc(k, sizeof(int32));
@@ -797,12 +826,20 @@
         strp = type;
         i = 0;
         fcb->out_dim = 0;
+        fcb->cepsize = 0;
+        fcb->cepsize_used = 0;
         while (sscanf(strp, "%s%n", wd, &l) == 1) {
             strp += l;
             if ((i >= fcb->n_stream)
                 || (sscanf(wd, "%d", &(fcb->stream_len[i])) != 1)
                 || (fcb->stream_len[i] <= 0))
                 E_FATAL("Bad feature type argument\n");
+            /* Input size before windowing */
+            fcb->cepsize += fcb->stream_len[i];
+            fcb->cepsize_used += fcb->stream_len[i];
+            if (fcb->window_size > 0)
+                fcb->stream_len[i] *= (fcb->window_size * 2 + 1);
+            /* Output size after windowing */
             fcb->out_dim += fcb->stream_len[i];
             i++;
         }
@@ -810,10 +847,7 @@
             E_FATAL("Bad feature type argument\n");
 
         /* Input is already the feature stream */
-        fcb->cepsize = feat_stream_len_sum(fcb);
-        fcb->cepsize_used = feat_stream_len_sum(fcb);
-        fcb->window_size = 0;
-        fcb->compute_feat = NULL;
+        fcb->compute_feat = feat_copy;
     }
 
     fcb->cmn_struct = cmn_init();
@@ -842,24 +876,20 @@
     fcb->tmpcepbuf = NULL;
     fcb->out_dim = fcb->stream_len[0];
 
-    if (fcb->cepsize > 0) {
-        fcb->cepbuf = (float32 **) ckd_calloc_2d(LIVEBUFBLOCKSIZE,
-                                                 feat_cepsize(fcb),
-                                                 sizeof(float32));
-        if (!fcb->cepbuf)
-            E_FATAL("Unable to allocate cepbuf ckd_calloc_2d(%ld,%d,%d)\n",
-                    LIVEBUFBLOCKSIZE, feat_cepsize(fcb), sizeof(float32));
-    }
-    if (fcb->window_size > 0) {
-        fcb->tmpcepbuf =
-            (float32 **) ckd_calloc_2d(2 * feat_window_size(fcb) + 1,
-                                       feat_cepsize(fcb), sizeof(float32));
-        if (!fcb->tmpcepbuf)
-            E_FATAL
-                ("Unable to allocate tmpcepbuf ckd_calloc_2d(%ld,%d,%d)\n",
-                 2 * feat_window_size(fcb) + 1, feat_cepsize(fcb),
-                 sizeof(float32));
-    }
+    fcb->cepbuf = (float32 **) ckd_calloc_2d(LIVEBUFBLOCKSIZE,
+                                             feat_cepsize(fcb),
+                                             sizeof(float32));
+    if (!fcb->cepbuf)
+        E_FATAL("Unable to allocate cepbuf ckd_calloc_2d(%ld,%d,%d)\n",
+                LIVEBUFBLOCKSIZE, feat_cepsize(fcb), sizeof(float32));
+    fcb->tmpcepbuf =
+        (float32 **) ckd_calloc_2d(2 * feat_window_size(fcb) + 1,
+                                   feat_cepsize(fcb), sizeof(float32));
+    if (!fcb->tmpcepbuf)
+        E_FATAL
+            ("Unable to allocate tmpcepbuf ckd_calloc_2d(%ld,%d,%d)\n",
+             2 * feat_window_size(fcb) + 1, feat_cepsize(fcb),
+             sizeof(float32));
     return fcb;
 }
 
@@ -1045,15 +1075,9 @@
 #endif
 
     /* Create feature vectors */
-    if (fcb->compute_feat) {
-        for (i = win; i < nfr - win; i++)
-            fcb->compute_feat(fcb, mfc + i, feat[i - win]);
+    for (i = win; i < nfr - win; i++) {
+        fcb->compute_feat(fcb, mfc + i, feat[i - win]);
     }
-    else {
-        for (i = win; i < nfr - win; i++)
-            memcpy(feat[i - win][0], mfc[i],
-                   feat_cepsize_used(fcb) * sizeof(float32));
-    }
 
 #if 0
     E_INFO("After dynamic coefficients computation. \n");
@@ -1118,10 +1142,13 @@
     if (beginutt) {
         /* Replicate first frame into the first win frames */
         for (i = 0; i < win; i++) {
+            /* FIXME: This makes no sense at all!!! */
+#if 0
             if (nfr >= win + 1)
                 memcpy(cepbuf[i], uttcep[0 + i + 1],
                        cepsize * sizeof(float32));
             else
+#endif
                 memcpy(cepbuf[i], uttcep[0], cepsize * sizeof(float32));
         }
         fcb->bufpos = win;

Added: trunk/sphinxbase/test/unit/test_feat/Makefile.am
===================================================================
--- trunk/sphinxbase/test/unit/test_feat/Makefile.am	                        (rev 0)
+++ trunk/sphinxbase/test/unit/test_feat/Makefile.am	2006-08-25 19:54:41 UTC (rev 6064)
@@ -0,0 +1,15 @@
+check_PROGRAMS = test_feat
+
+test_feat_SRCS = test_feat.c
+
+INCLUDES = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
+
+LDADD = ${top_builddir}/src/libsphinxutil/libsphinxutil.la \
+	${top_builddir}/src/libsphinxfeat/libsphinxfeat.la -lm
+
+
+TESTS = $(wildcard _*.test) 
+
+


Property changes on: trunk/sphinxbase/test/unit/test_feat/Makefile.am
___________________________________________________________________
Name: svn:mime-type
   + text/x-makefile
Name: svn:eol-style
   + native

Added: trunk/sphinxbase/test/unit/test_feat/_test_feat.res
===================================================================
--- trunk/sphinxbase/test/unit/test_feat/_test_feat.res	                        (rev 0)
+++ trunk/sphinxbase/test/unit/test_feat/_test_feat.res	2006-08-25 19:54:41 UTC (rev 6064)
@@ -0,0 +1,18 @@
+15.114 -1.424 -0.953 0.186 -0.656 -0.226 -0.105 -0.412 -0.024 -0.091 -0.124 -0.158 -0.197 
+14.729 -1.313 -0.892 0.140 -0.676 -0.089 -0.313 -0.422 -0.058 -0.101 -0.100 -0.128 -0.123 
+14.502 -1.351 -1.028 -0.189 -0.718 -0.139 -0.121 -0.365 -0.139 -0.154 0.041 0.009 -0.073 
+14.557 -1.676 -0.864 0.118 -0.445 -0.168 -0.069 -0.503 -0.013 0.007 -0.056 -0.075 -0.237 
+14.665 -1.498 -0.582 0.209 -0.487 -0.247 -0.142 -0.439 0.059 -0.058 -0.265 -0.109 -0.196 
+15.025 -1.199 -0.607 0.235 -0.499 -0.080 -0.062 -0.554 -0.209 -0.124 -0.445 -0.352 -0.400 
+15.114 -1.424 -0.953 0.186 -0.656 -0.226 -0.105 -0.412 -0.024 -0.091 -0.124 -0.158 -0.197 15.114 -1.424 -0.953 0.186 -0.656 -0.226 -0.105 -0.412 -0.024 -0.091 -0.124 -0.158 -0.197 14.729 -1.313 -0.892 0.140 -0.676 -0.089 -0.313 -0.422 -0.058 -0.101 -0.100 -0.128 -0.123 
+15.114 -1.424 -0.953 0.186 -0.656 -0.226 -0.105 -0.412 -0.024 -0.091 -0.124 -0.158 -0.197 14.729 -1.313 -0.892 0.140 -0.676 -0.089 -0.313 -0.422 -0.058 -0.101 -0.100 -0.128 -0.123 14.502 -1.351 -1.028 -0.189 -0.718 -0.139 -0.121 -0.365 -0.139 -0.154 0.041 0.009 -0.073 
+14.729 -1.313 -0.892 0.140 -0.676 -0.089 -0.313 -0.422 -0.058 -0.101 -0.100 -0.128 -0.123 14.502 -1.351 -1.028 -0.189 -0.718 -0.139 -0.121 -0.365 -0.139 -0.154 0.041 0.009 -0.073 14.557 -1.676 -0.864 0.118 -0.445 -0.168 -0.069 -0.503 -0.013 0.007 -0.056 -0.075 -0.237 
+14.502 -1.351 -1.028 -0.189 -0.718 -0.139 -0.121 -0.365 -0.139 -0.154 0.041 0.009 -0.073 14.557 -1.676 -0.864 0.118 -0.445 -0.168 -0.069 -0.503 -0.013 0.007 -0.056 -0.075 -0.237 14.665 -1.498 -0.582 0.209 -0.487 -0.247 -0.142 -0.439 0.059 -0.058 -0.265 -0.109 -0.196 
+14.557 -1.676 -0.864 0.118 -0.445 -0.168 -0.069 -0.503 -0.013 0.007 -0.056 -0.075 -0.237 14.665 -1.498 -0.582 0.209 -0.487 -0.247 -0.142 -0.439 0.059 -0.058 -0.265 -0.109 -0.196 15.025 -1.199 -0.607 0.235 -0.499 -0.080 -0.062 -0.554 -0.209 -0.124 -0.445 -0.352 -0.400 
+14.665 -1.498 -0.582 0.209 -0.487 -0.247 -0.142 -0.439 0.059 -0.058 -0.265 -0.109 -0.196 15.025 -1.199 -0.607 0.235 -0.499 -0.080 -0.062 -0.554 -0.209 -0.124 -0.445 -0.352 -0.400 15.025 -1.199 -0.607 0.235 -0.499 -0.080 -0.062 -0.554 -0.209 -0.124 -0.445 -0.352 -0.400 
+15.114 -1.424 -0.953 0.186 -0.656 -0.226 -0.105 -0.412 -0.024 -0.091 -0.124 -0.158 -0.197 -0.612 0.073 -0.075 -0.375 -0.062 0.087 -0.016 0.047 -0.115 -0.063 0.165 0.167 0.124 -0.172 -0.363 0.028 -0.022 0.231 -0.079 0.244 -0.081 0.045 0.108 0.044 0.053 -0.114 
+14.729 -1.313 -0.892 0.140 -0.676 -0.089 -0.313 -0.422 -0.058 -0.101 -0.100 -0.128 -0.123 -0.557 -0.252 0.089 -0.068 0.211 0.058 0.036 -0.091 0.011 0.098 0.068 0.083 -0.040 0.163 -0.147 0.446 0.398 0.231 -0.108 -0.021 -0.074 0.198 0.096 -0.306 -0.118 -0.123 
+14.502 -1.351 -1.028 -0.189 -0.718 -0.139 -0.121 -0.365 -0.139 -0.154 0.041 0.009 -0.073 -0.449 -0.074 0.371 0.023 0.169 -0.021 -0.037 -0.027 0.083 0.033 -0.141 0.049 0.001 0.853 0.366 0.196 0.163 -0.034 -0.049 0.215 -0.041 -0.162 -0.121 -0.413 -0.307 -0.237 
+14.557 -1.676 -0.864 0.118 -0.445 -0.168 -0.069 -0.503 -0.013 0.007 -0.056 -0.075 -0.237 0.296 0.114 0.285 0.095 0.177 0.009 0.251 -0.132 -0.151 -0.023 -0.345 -0.224 -0.277 0.972 0.226 0.050 0.401 0.050 0.080 0.096 -0.162 -0.153 -0.003 -0.345 -0.410 -0.328 
+14.665 -1.498 -0.582 0.209 -0.487 -0.247 -0.142 -0.439 0.059 -0.058 -0.265 -0.109 -0.196 0.523 0.152 0.421 0.424 0.219 0.059 0.059 -0.189 -0.070 0.030 -0.486 -0.361 -0.327 0.172 0.363 -0.028 0.022 -0.231 0.079 -0.244 0.081 -0.045 -0.108 -0.044 -0.053 0.114 
+15.025 -1.199 -0.607 0.235 -0.499 -0.080 -0.062 -0.554 -0.209 -0.124 -0.445 -0.352 -0.400 0.468 0.477 0.257 0.117 -0.054 0.088 0.007 -0.051 -0.196 -0.131 -0.389 -0.277 -0.163 -0.163 0.147 -0.446 -0.398 -0.231 0.108 0.021 0.074 -0.198 -0.096 0.306 0.118 0.123 


Property changes on: trunk/sphinxbase/test/unit/test_feat/_test_feat.res
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/sphinxbase/test/unit/test_feat/_test_feat.test
===================================================================
--- trunk/sphinxbase/test/unit/test_feat/_test_feat.test	                        (rev 0)
+++ trunk/sphinxbase/test/unit/test_feat/_test_feat.test	2006-08-25 19:54:41 UTC (rev 6064)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+./test_feat > _test_feat.out
+diff _test_feat.out _test_feat.res >/dev/null 2>&1
+rm -f _test_feat.out


Property changes on: trunk/sphinxbase/test/unit/test_feat/_test_feat.test
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/sphinxbase/test/unit/test_feat/test_feat.c
===================================================================
--- trunk/sphinxbase/test/unit/test_feat/test_feat.c	                        (rev 0)
+++ trunk/sphinxbase/test/unit/test_feat/test_feat.c	2006-08-25 19:54:41 UTC (rev 6064)
@@ -0,0 +1,79 @@
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#include "feat.h"
+#include "ckd_alloc.h"
+
+const float32 data[6][13] = {
+	{ 15.114, -1.424, -0.953, 0.186, -0.656, -0.226, -0.105, -0.412, -0.024, -0.091, -0.124, -0.158, -0.197},
+	{ 14.729, -1.313, -0.892, 0.140, -0.676, -0.089, -0.313, -0.422, -0.058, -0.101, -0.100, -0.128, -0.123},
+	{ 14.502, -1.351, -1.028, -0.189, -0.718, -0.139, -0.121, -0.365, -0.139, -0.154, 0.041, 0.009, -0.073},
+	{ 14.557, -1.676, -0.864, 0.118, -0.445, -0.168, -0.069, -0.503, -0.013, 0.007, -0.056, -0.075, -0.237},
+	{ 14.665, -1.498, -0.582, 0.209, -0.487, -0.247, -0.142, -0.439, 0.059, -0.058, -0.265, -0.109, -0.196},
+	{ 15.025, -1.199, -0.607, 0.235, -0.499, -0.080, -0.062, -0.554, -0.209, -0.124, -0.445, -0.352, -0.400},
+};
+
+int
+main(int argc, char *argv[])
+{
+	feat_t *fcb;
+	float32 **in_feats, ***out_feats;
+	int32 i, j;
+
+	/* Test "raw" features without concatenation */
+	fcb = feat_init(strdup("13"), "none", "no", "none", 1);
+
+	in_feats = (float32 **)ckd_alloc_2d_ptr(6, 13, data, sizeof(float32));
+	out_feats = (float32 ***)ckd_calloc_3d(6, 1, 13, sizeof(float32));
+	feat_s2mfc2feat_block(fcb, in_feats, 6, 1, 1, out_feats);
+
+	for (i = 0; i < 6; ++i) {
+		for (j = 0; j < 13; ++j) {
+			printf("%.3f ", out_feats[i][0][j]);
+		}
+		printf("\n");
+	}
+	feat_free(fcb);
+
+	/* Test "raw" features with concatenation */
+	fcb = feat_init(strdup("13:1"), "none", "no", "none", 1);
+
+	in_feats = (float32 **)ckd_alloc_2d_ptr(6, 13, data, sizeof(float32));
+	out_feats = (float32 ***)ckd_calloc_3d(8, 1, 39, sizeof(float32));
+	feat_s2mfc2feat_block(fcb, in_feats, 6, 1, 1, out_feats);
+
+	for (i = 0; i < 6; ++i) {
+		for (j = 0; j < 39; ++j) {
+			printf("%.3f ", out_feats[i][0][j]);
+		}
+		printf("\n");
+	}
+	feat_free(fcb);
+
+	/* Test 1s_c_d_dd features */
+	fcb = feat_init(strdup("1s_c_d_dd"), "none", "no", "none", 1);
+	feat_s2mfc2feat_block(fcb, in_feats, 6, 1, 1, out_feats);
+
+	for (i = 0; i < 6; ++i) {
+		for (j = 0; j < 39; ++j) {
+			printf("%.3f ", out_feats[i][0][j]);
+		}
+		printf("\n");
+	}
+
+	/* Verify that the deltas are correct. */
+	for (i = 2; i < 4; ++i) {
+		for (j = 0; j < 13; ++j) {
+			if (fabs(out_feats[i][0][13+j] - 
+				 (out_feats[i+2][0][j]
+				  - out_feats[i-2][0][j])) > 0.01) {
+				printf("Delta mismatch in [%d][%d]\n", i, j);
+				return 1;
+			}
+		}
+	}
+	feat_free(fcb);
+
+	return 0;
+}


Property changes on: trunk/sphinxbase/test/unit/test_feat/test_feat.c
___________________________________________________________________
Name: svn:mime-type
   + text/x-csrc
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6062
Author:   egouvea
Date:     2006-08-25 11:21:11 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6062&view=rev

Log Message:
-----------
Skip deleted interpolation for continuous models

Modified Paths:
--------------
    trunk/SphinxTrain/scripts_pl/90.deleted_interpolation/deleted_interpolation.pl
Modified: trunk/SphinxTrain/scripts_pl/90.deleted_interpolation/deleted_interpolation.pl
===================================================================
--- trunk/SphinxTrain/scripts_pl/90.deleted_interpolation/deleted_interpolation.pl	2006-08-25 17:43:35 UTC (rev 6061)
+++ trunk/SphinxTrain/scripts_pl/90.deleted_interpolation/deleted_interpolation.pl	2006-08-25 18:21:11 UTC (rev 6062)
@@ -47,6 +47,11 @@
 use SphinxTrain::Config;
 use SphinxTrain::Util;
 
+if ($ST::CFG_HMM_TYPE eq ".cont.") {
+  Log("    Skipped for continuous models\n");
+  exit(0);
+}
+
 # this script runs deleted interpolation on a bunch of semi-cont
 # hmm buffers. You need 2 or more buffers to run this!!
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6061
Author:   dhdfu
Date:     2006-08-25 10:43:35 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6061&view=rev

Log Message:
-----------
remove redundant Makefiles

Removed Paths:
-------------
    trunk/SphinxTrain/scripts_pl/00.verify/Makefile
    trunk/SphinxTrain/scripts_pl/03.makeuntiedmdef/Makefile
    trunk/SphinxTrain/scripts_pl/10.vector_quantize/Makefile
    trunk/SphinxTrain/scripts_pl/20.ci_hmm/Makefile
    trunk/SphinxTrain/scripts_pl/30.cd_hmm_untied/Makefile
    trunk/SphinxTrain/scripts_pl/40.buildtrees/Makefile
    trunk/SphinxTrain/scripts_pl/50.cd_hmm_tied/Makefile
    trunk/SphinxTrain/scripts_pl/90.deleted_interpolation/Makefile
    trunk/SphinxTrain/scripts_pl/99.make_s2_models/Makefile
Deleted: trunk/SphinxTrain/scripts_pl/00.verify/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/00.verify/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/00.verify/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,50 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/00.verify
-BUILD_DIRS = 
-ALL_DIRS= $(BUILD_DIRS)
-PERLSCRIPTS = verify_all.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-

Deleted: trunk/SphinxTrain/scripts_pl/03.makeuntiedmdef/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/03.makeuntiedmdef/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/03.makeuntiedmdef/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,50 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/03.makeuntiedmdef
-BUILD_DIRS = 
-ALL_DIRS=
-PERLSCRIPTS = make_untied_mdef.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-

Deleted: trunk/SphinxTrain/scripts_pl/10.vector_quantize/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/10.vector_quantize/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/10.vector_quantize/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,50 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/01.vector_quantize
-BUILD_DIRS = 
-ALL_DIRS=
-PERLSCRIPTS = agg_seg.pl kmeans.pl slave.VQ.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-

Deleted: trunk/SphinxTrain/scripts_pl/20.ci_hmm/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/20.ci_hmm/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/20.ci_hmm/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,51 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/02.ci_schmm
-BUILD_DIRS = 
-ALL_DIRS=
-PERLSCRIPTS = baum_welch.pl norm.pl \
-        norm_and_launchbw.pl slave_convg.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-

Deleted: trunk/SphinxTrain/scripts_pl/30.cd_hmm_untied/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/30.cd_hmm_untied/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/30.cd_hmm_untied/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,50 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/04.cd_schmm_untied
-BUILD_DIRS = 
-ALL_DIRS=
-PERLSCRIPTS = baum_welch.pl norm.pl norm_and_launchbw.pl slave_convg.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-

Deleted: trunk/SphinxTrain/scripts_pl/40.buildtrees/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/40.buildtrees/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/40.buildtrees/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,50 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/05.buildtrees
-BUILD_DIRS = 
-ALL_DIRS = $(BUILD_DIRS)
-PERLSCRIPTS = make_questions.pl slave.treebuilder.pl buildtree.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-

Deleted: trunk/SphinxTrain/scripts_pl/50.cd_hmm_tied/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/50.cd_hmm_tied/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/50.cd_hmm_tied/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,50 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/07.cd-schmm
-BUILD_DIRS = 
-ALL_DIRS = $(BUILD_DIRS)
-PERLSCRIPTS = baum_welch.pl norm.pl norm_and_launchbw.pl slave_convg.pl split_gaussians.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-

Deleted: trunk/SphinxTrain/scripts_pl/90.deleted_interpolation/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/90.deleted_interpolation/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/90.deleted_interpolation/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,50 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/08.deleted-interpolation
-BUILD_DIRS = 
-ALL_DIRS = $(BUILD_DIRS)
-PERLSCRIPTS = deleted_interpolation.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-

Deleted: trunk/SphinxTrain/scripts_pl/99.make_s2_models/Makefile
===================================================================
--- trunk/SphinxTrain/scripts_pl/99.make_s2_models/Makefile	2006-08-25 17:42:28 UTC (rev 6060)
+++ trunk/SphinxTrain/scripts_pl/99.make_s2_models/Makefile	2006-08-25 17:43:35 UTC (rev 6061)
@@ -1,50 +0,0 @@
-# ====================================================================
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer. 
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# This work was supported in part by funding from the Defense Advanced 
-# Research Projects Agency and the National Science Foundation of the 
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ====================================================================
-#
-#  Perl scripts
-#
-# ====================================================================
-TOP=../..
-DIRNAME=scripts_pl/09.make_s2_models
-BUILD_DIRS = 
-ALL_DIRS = $(BUILD_DIRS)
-PERLSCRIPTS = make_s2_models.pl
-SCRIPTS = $(PERLSCRIPTS:%=$(SCRIPTDIR)/$(DIRNAME)/%)
-FILES = Makefile $(PERLSCRIPTS)
-
-ALL = $(SCRIPTS)
-
-LOCAL_CLEAN = $(SCRIPTS)
-
-include $(TOP)/config/common_make_rules
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6060
Author:   dhdfu
Date:     2006-08-25 10:42:28 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6060&view=rev

Log Message:
-----------
OopS! Add missing scripts

Added Paths:
-----------
    trunk/SphinxTrain/scripts_pl/40.buildtrees/prunetree.pl
    trunk/SphinxTrain/scripts_pl/40.buildtrees/tiestate.pl
Added: trunk/SphinxTrain/scripts_pl/40.buildtrees/prunetree.pl
===================================================================
--- trunk/SphinxTrain/scripts_pl/40.buildtrees/prunetree.pl	                        (rev 0)
+++ trunk/SphinxTrain/scripts_pl/40.buildtrees/prunetree.pl	2006-08-25 17:42:28 UTC (rev 6060)
@@ -0,0 +1,79 @@
+#!/usr/bin/perl
+## ====================================================================
+##
+## Copyright (c) 1996-2000 Carnegie Mellon University.  All rights 
+## reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##
+## 1. Redistributions of source code must retain the above copyright
+##    notice, this list of conditions and the following disclaimer. 
+##
+## 2. Redistributions in binary form must reproduce the above copyright
+##    notice, this list of conditions and the following disclaimer in
+##    the documentation and/or other materials provided with the
+##    distribution.
+##
+## This work was supported in part by funding from the Defense Advanced 
+## Research Projects Agency and the National Science Foundation of the 
+## United States of America, and the CMU Sphinx Speech Consortium.
+##
+## THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
+## ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+## THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+## NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+## ====================================================================
+#*************************************************************************
+# This script prunes the trees computed earlier to have the desired number
+# of leaves. Each leaf corresponds to one tied state
+#*************************************************************************
+#
+#   Author: Alan W Black (awb@...)
+#
+
+use strict;
+use File::Copy;
+use File::Basename;
+use File::Spec::Functions;
+use File::Path;
+
+use lib catdir(dirname($0), updir(), 'lib');
+use SphinxTrain::Config;
+use SphinxTrain::Util;
+
+die "USAGE: $0 <number of tied states>" if @ARGV != 1;
+
+my $n_tied_states = shift;
+my $occurance_threshold = 0;
+
+my $mdef_file = "$ST::CFG_BASE_DIR/model_architecture/$ST::CFG_EXPTNAME.alltriphones.mdef";
+
+my $unprunedtreedir = "$ST::CFG_BASE_DIR/trees/$ST::CFG_EXPTNAME.unpruned";
+my $prunedtreedir  = "$ST::CFG_BASE_DIR/trees/$ST::CFG_EXPTNAME.$n_tied_states";
+mkdir ($prunedtreedir,0777) unless -d $prunedtreedir;
+
+my $logdir = "$ST::CFG_LOG_DIR/40.buildtrees";
+mkdir ($logdir,0777) unless -d $logdir;
+my $logfile = "$logdir/$ST::CFG_EXPTNAME.prunetree.$n_tied_states.log";
+
+$| = 1; # Turn on autoflushing
+Log ("    Prune trees\n");
+HTML_Print ("\t\t" . FormatURL("$logfile", "Log File") . " ");
+
+exit RunTool('prunetree', $logfile, 0,
+	     -itreedir => $unprunedtreedir,
+	     -nseno => $n_tied_states,
+	     -otreedir => $prunedtreedir,
+	     -moddeffn => $mdef_file,
+	     -psetfn => $ST::CFG_QUESTION_SET,
+	     -minocc => $occurance_threshold);


Property changes on: trunk/SphinxTrain/scripts_pl/40.buildtrees/prunetree.pl
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/x-perl
Name: svn:eol-style
   + native

Added: trunk/SphinxTrain/scripts_pl/40.buildtrees/tiestate.pl
===================================================================
--- trunk/SphinxTrain/scripts_pl/40.buildtrees/tiestate.pl	                        (rev 0)
+++ trunk/SphinxTrain/scripts_pl/40.buildtrees/tiestate.pl	2006-08-25 17:42:28 UTC (rev 6060)
@@ -0,0 +1,74 @@
+#!/usr/bin/perl
+## ====================================================================
+##
+## Copyright (c) 1996-2000 Carnegie Mellon University.  All rights 
+## reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##
+## 1. Redistributions of source code must retain the above copyright
+##    notice, this list of conditions and the following disclaimer. 
+##
+## 2. Redistributions in binary form must reproduce the above copyright
+##    notice, this list of conditions and the following disclaimer in
+##    the documentation and/or other materials provided with the
+##    distribution.
+##
+## This work was supported in part by funding from the Defense Advanced 
+## Research Projects Agency and the National Science Foundation of the 
+## United States of America, and the CMU Sphinx Speech Consortium.
+##
+## THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
+## ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+## THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+## NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+## ====================================================================
+#**************************************************************************
+# This script reads off the leaves of the pruned trees and creates an mdef
+# file
+#**************************************************************************
+#
+# Author: Alan W Black (awb@...)
+#
+use strict;
+use File::Copy;
+use File::Basename;
+use File::Spec::Functions;
+use File::Path;
+
+use lib catdir(dirname($0), updir(), 'lib');
+use SphinxTrain::Config;
+use SphinxTrain::Util;
+
+die "USAGE: $0 <number of tied states>" if @ARGV != 1;
+
+my $n_tied_states = shift;
+
+my $untied_mdef_file = "$ST::CFG_BASE_DIR/model_architecture/$ST::CFG_EXPTNAME.alltriphones.mdef";
+my $prunedtreedir = "$ST::CFG_BASE_DIR/trees/$ST::CFG_EXPTNAME.$n_tied_states";
+my $tied_mdef_file = "$ST::CFG_BASE_DIR/model_architecture/$ST::CFG_EXPTNAME.$n_tied_states.mdef";
+
+my $logdir = "$ST::CFG_LOG_DIR/40.buildtrees";
+mkdir ($logdir,0777) unless -d $logdir;
+my $logfile = "$logdir/$ST::CFG_EXPTNAME.tiestate.$n_tied_states.log";
+
+$| = 1; # Turn on autoflushing
+Log ("    Tie states\n");
+HTML_Print ("\t\t" . FormatURL("$logfile", "Log File") . " ");
+
+exit RunTool('tiestate', $logfile, 0,
+	     -imoddeffn => $untied_mdef_file,
+	     -omoddeffn => $tied_mdef_file,
+	     -treedir => $prunedtreedir,
+	     -psetfn => $ST::CFG_QUESTION_SET);
+


Property changes on: trunk/SphinxTrain/scripts_pl/40.buildtrees/tiestate.pl
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/x-perl
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6059
Author:   egouvea
Date:     2006-08-25 09:28:15 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6059&view=rev

Log Message:
-----------
Changed property to executable

Property Changed:
----------------
    trunk/sphinx3/scripts/setup_tutorial.pl
    trunk/sphinx3/scripts/slave.pl

Property changes on: trunk/sphinx3/scripts/setup_tutorial.pl
___________________________________________________________________
Name: svn:executable
   + *


Property changes on: trunk/sphinx3/scripts/slave.pl
___________________________________________________________________
Name: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6057
Author:   egouvea
Date:     2006-08-25 08:28:15 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6057&view=rev

Log Message:
-----------
Changed vector_dot() return value to void to keep the compiler happy, changed setup_tutorial.pl, texFormat.l and make_feats.pl  to executable

Modified Paths:
--------------
    trunk/SphinxTrain/src/libs/libcommon/vector.c

Property Changed:
----------------
    trunk/SphinxTrain/scripts_pl/make_feats.pl
    trunk/SphinxTrain/scripts_pl/setup_tutorial.pl
    trunk/SphinxTrain/scripts_pl/texFormat.pl

Property changes on: trunk/SphinxTrain/scripts_pl/make_feats.pl
___________________________________________________________________
Name: svn:executable
   + *


Property changes on: trunk/SphinxTrain/scripts_pl/setup_tutorial.pl
___________________________________________________________________
Name: svn:executable
   + *


Property changes on: trunk/SphinxTrain/scripts_pl/texFormat.pl
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/SphinxTrain/src/libs/libcommon/vector.c
===================================================================
--- trunk/SphinxTrain/src/libs/libcommon/vector.c	2006-08-25 01:46:28 UTC (rev 6056)
+++ trunk/SphinxTrain/src/libs/libcommon/vector.c	2006-08-25 15:28:15 UTC (rev 6057)
@@ -147,7 +147,7 @@
 		a[i] *= b[i];
 }
 
-float64
+void
 vector_dot(const vector_t a, const vector_t b, uint32 dim)
 {
 	uint32 i;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

I see.

Will .net safe guard this?

-a

> Interestingly, this issue didn't appear when I converted the dsw/dsp
> files to .net.
>
> A new show of hands on who wants to upgrade the VC 6 files to .NET?
>
> --Evandro
>
>
>
> egouvea@... wrote:
>> Revision: 6055
>> Author:   egouvea
>> Date:     2006-08-24 15:24:12 -0700 (Thu, 24 Aug 2006)
>> ViewCVS:  http://svn.sourceforge.net/cmusphinx/?rev=6055&view=rev
>>