[mlpack-git] master: Standardize terminology. (52d7f6e)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Mon Nov 30 17:24:07 EST 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/10b9d45b806a3e879b0564d78ccb183ebc7051ba...31c557d9cc7e4da57fd8a246085c19e076d12271

>---------------------------------------------------------------

commit 52d7f6ee086188194df45e1bf06468db3391f3ed
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Nov 20 23:28:39 2015 +0000

    Standardize terminology.


>---------------------------------------------------------------

52d7f6ee086188194df45e1bf06468db3391f3ed
 src/mlpack/methods/decision_stump/decision_stump.hpp      |  2 +-
 src/mlpack/methods/decision_stump/decision_stump_impl.hpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mlpack/methods/decision_stump/decision_stump.hpp b/src/mlpack/methods/decision_stump/decision_stump.hpp
index 411f4d1..61eea06 100644
--- a/src/mlpack/methods/decision_stump/decision_stump.hpp
+++ b/src/mlpack/methods/decision_stump/decision_stump.hpp
@@ -87,7 +87,7 @@ class DecisionStump
 
  private:
   //! Stores the number of classes.
-  size_t numClass;
+  size_t numClasses;
 
   //! Stores the value of the attribute on which to split.
   int splitAttribute;
diff --git a/src/mlpack/methods/decision_stump/decision_stump_impl.hpp b/src/mlpack/methods/decision_stump/decision_stump_impl.hpp
index 568e296..4b5d987 100644
--- a/src/mlpack/methods/decision_stump/decision_stump_impl.hpp
+++ b/src/mlpack/methods/decision_stump/decision_stump_impl.hpp
@@ -28,7 +28,7 @@ DecisionStump<MatType>::DecisionStump(const MatType& data,
                                       const size_t classes,
                                       size_t inpBucketSize)
 {
-  numClass = classes;
+  numClasses = classes;
   bucketSize = inpBucketSize;
 
   arma::rowvec weightD;
@@ -117,7 +117,7 @@ void DecisionStump<MatType>::Classify(const MatType& test,
 }
 
 /**
- * Alternate constructor which copies parameters bucketSize and numClass
+ * Alternate constructor which copies parameters bucketSize and numClasses
  * from an already initiated decision stump, other. It appropriately
  * sets the Weight vector.
  *
@@ -134,7 +134,7 @@ DecisionStump<MatType>::DecisionStump(const DecisionStump<>& other,
                                       const arma::Row<size_t>& labels,
                                       const arma::rowvec& weights)
 {
-  numClass = other.numClass;
+  numClasses = other.numClasses;
   bucketSize = other.bucketSize;
 
   // weightD = weights;
@@ -416,7 +416,7 @@ double DecisionStump<MatType>::CalculateEntropy(
   double entropy = 0.0;
   size_t j;
 
-  arma::Row<size_t> numElem(numClass);
+  arma::Row<size_t> numElem(numClasses);
   numElem.fill(0);
 
   // Variable to accumulate the weight in this subview_row.
@@ -432,7 +432,7 @@ double DecisionStump<MatType>::CalculateEntropy(
     }
       // numElem(labels(j))++;
 
-    for (j = 0; j < numClass; j++)
+    for (j = 0; j < numClasses; j++)
     {
       const double p1 = ((double) numElem(j) / accWeight);
 
@@ -447,7 +447,7 @@ double DecisionStump<MatType>::CalculateEntropy(
     for (j = 0; j < labels.n_elem; j++)
       numElem(labels(j))++;
 
-    for (j = 0; j < numClass; j++)
+    for (j = 0; j < numClasses; j++)
     {
       const double p1 = ((double) numElem(j) / labels.n_elem);
 



More information about the mlpack-git mailing list