trunk: small fix to get_lda_block.sh (thanks: mozno@users.sf.net) plus a few...

trunk: small fix to get_lda_block.sh (thanks: mozno@users.sf.net) plus a few other unrelated small changes

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@5238 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8

COPYING

@@ -20,21 +20,22 @@
  // Copyright    2013   Johns Hopkins University (author: Daniel Povey)
 
  it is because the individual who wrote the code was at that institution as an
- employee, so the copyright is owned by the university (we have checked that the
- contributions were in accordance with the open-source policies of the
+ employee, so the copyright is owned by the university (and we will have checked
+ that the contributions were in accordance with the open-source policies of the
  institutions concerned, including getting them vetted individually where
- necessary).  In some cases, however, particularly early on, we just wrote the
- name of the university or company concerned, without the actual author's name
- in parentheses.  If you see something like
+ necessary).  From a legal point of view the copyright ownership is that of the
+ institution concerned, and the (author: xxx) in parentheses is just
+ informational, to identify the actual person who wrote the code, and is not
+ intended to have any legal implications.  In some cases, however, particularly
+ early on, we just wrote the name of the university or company concerned,
+ without the actual author's name in parentheses.  If you see something like
 
  //  Copyright  2009-2012   Arnab Ghoshal  Microsoft Corporation
 
  it does not imply that Arnab was working for Microsoft, it is because someone
  else contributed to the file while working at Microsoft (this would be Daniel
  Povey, in fact, who was working at Microsoft Research at the outset of the
- project).  If the actual author's name in parentheses, it is just to clarify
- who wrote the code; it is not supposed to signify ownership of the copyright by
- that individual.
+ project).
 
  The list of authors of each file is in an essentially arbitrary order, but is
  often chronological if they contributed in different years.

egs/wsj/s5/steps/nnet2/get_lda_block.sh

@@ -97,14 +97,14 @@ cur_index=0
 num_blocks=0
 context_length=$[1+2*($splice_width)]
 
-while [ $[$cur_index+$block_size] -lt $feat_dim ]; do
+while [ $[$cur_index+$block_size] -le $feat_dim ]; do
   for n in `seq $cur_index $[cur_index+$block_size-1]`; do
     echo -n `seq $n $feat_dim $[$n+($feat_dim*($context_length-1))]` '' >> $dir/indexes
   done
   echo >> $dir/indexes
   num_blocks=$[$num_blocks+1]
   cur_index=$[$cur_index+$block_shift]
-  if [ $[$cur_index+$block_size] -gt $feat_dim ]; then
+  if [ $[$cur_index+$block_size-1] -gt $feat_dim ]; then
     cur_index=$[$feat_dim-$block_size];
   fi
 done

src/doc/README

@@ -22,6 +22,13 @@
 doc/make_tools.sh
 doxygen
 cp doc/*.pptx html/;
+# get the style sheet in the html/ directory.
+# note, we actually use a modified version of the header, which is checked into
+# doc/.  
+doxygen -w html header.html footer.html stylesheet.css
+rm header.html footer.html
+mv stylesheet.css html/
+
 
 if [[ $(hostname -f) == *.clsp.jhu.edu ]]; then
    cp ../misc/logo/KaldiIco.png html/favicon.ico
@@ -56,6 +63,6 @@ fi
 # moved the header.html to doc/ and edited it to include the following snippet,
 # and added it to the repo.
 #<link rel="icon" type="image/png" href="http://kaldi.sf.net/favicon.ico">
-# Also did similar with stylesheet.
+
 
 

src/doc/dnn.dox

@@ -64,7 +64,7 @@ namespace kaldi {
 
   The best published descriptions of the DNN setups are:
   - Karel's setup : <a href="http://www.fit.vutbr.cz/research/groups/speech/publi/2013/vesely_interspeech2013_IS131333.pdf">Sequence-discriminative training of deep neural networks</a>
-  - Dans's setup : <a href="http://arxiv-web3.library.cornell.edu/pdf/1410.7455v4">Parallel training of DNNs with natural gradient and parameter averaging</a>
+  - Dan's setup : <a href="http://arxiv-web3.library.cornell.edu/pdf/1410.7455v4">Parallel training of DNNs with natural gradient and parameter averaging</a>
 
   The setups use incompatible DNN formats, while there is a converter of Karel's network into Dan's format \ref dnn1_conversion_to_dnn2.