trunk: some minor fixes

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

src/bin/analyze-counts.cc

@@ -33,8 +33,8 @@ int main(int argc, char *argv[]) {
   typedef kaldi::uint64 uint64;
   try {
     const char *usage =
-        "Counts element frequencies from integer vector table.\n"
-        "(eg. for example to get pdf-counts to estimate DNN-output priros, or data analysis)\n"
+        "Computes element counts from integer vector table.\n"
+        "(e.g. for example to get pdf-counts to estimate DNN-output priors, for data analysis)\n"
         "Verbosity : level 1 => print frequencies and histogram\n"
         "\n"
         "Usage:  analyze-counts  [options] <alignments-rspecifier> <counts-wxfilname>\n"
@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
     for(size_t i = 0; i < counts.size(); i++) {
       if(counts_nozero[i] == 0) {
         KALDI_WARN << "Zero count for element " << i << ", force setting to one."
-                   << " This avoids divide-by-zero when used counts used in decoding.";
+                   << " This avoids divide-by-zero when we use the counts in decoding.";
         counts_nozero[i]++;
       }
     }

src/nnet2/nnet-nnet.cc

@@ -708,14 +708,20 @@ Nnet *GenRandomNnet(int32 input_dim,
   return ans;
 }
 
+int32 Nnet::FirstUpdatableComponent() const {
+  for (int32 i = 0; i < NumComponents(); i++) {
+    if (dynamic_cast<UpdatableComponent*>(components_[i]) != NULL)
+      return i;
+  }
+  return NumComponents();
+}
 
 
 int32 Nnet::LastUpdatableComponent() const {
-  int32 last_updatable_component = NumComponents();
   for (int32 i = NumComponents() - 1; i >= 0; i--)
     if (dynamic_cast<UpdatableComponent*>(components_[i]) != NULL)
-      last_updatable_component = i;
-  return last_updatable_component;
+      return i;
+  return -1;
 }
 
 } // namespace nnet2

src/nnet2/nnet-nnet.h

@@ -98,9 +98,12 @@ class Nnet {
   /// this neural net, leaving everything else fixed.
   void CopyStatsFrom(const Nnet &nnet);
 
-
-  /// Returns the index of the last component which is updatable,
-  /// or NumComponents() if none are updatable.
+  /// Returns the index of the lowest-numbered component which is updatable, or
+  /// NumComponents() if none are updatable.
+  int32 FirstUpdatableComponent() const;
+
+  /// Returns the index of the highest-numbered component which is updatable, or
+  /// -1 if none are updatable.
   int32 LastUpdatableComponent() const;
 
   /// Returns the number of updatable components.

src/nnet2/nnet-update.cc

@@ -136,7 +136,7 @@ double NnetUpdater::ComputeTotAccuracy(
 void NnetUpdater::Backprop(CuMatrix<BaseFloat> *deriv) const {
   // We assume ComputeObjfAndDeriv has already been called.
   for (int32 c = nnet_.NumComponents() - 1;
-       c >= nnet_.LastUpdatableComponent(); c--) {
+       c >= nnet_.FirstUpdatableComponent(); c--) {
     const Component &component = nnet_.GetComponent(c);
     Component *component_to_update = (nnet_to_update_ == NULL ? NULL :
                                       &(nnet_to_update_->GetComponent(c)));