[mlpack-git] master: Change names of functions. (6dc2730)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 21:57:16 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit 6dc2730cebc5929343d0187b736956a5759d1846
Author: Ryan Curtin <ryan at ratml.org>
Date: Thu Aug 7 15:15:26 2014 +0000
Change names of functions.
>---------------------------------------------------------------
6dc2730cebc5929343d0187b736956a5759d1846
src/mlpack/methods/adaboost/adaboost.hpp | 4 ++--
src/mlpack/methods/adaboost/adaboost_impl.hpp | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/mlpack/methods/adaboost/adaboost.hpp b/src/mlpack/methods/adaboost/adaboost.hpp
index 4f0ef30..5d26e27 100644
--- a/src/mlpack/methods/adaboost/adaboost.hpp
+++ b/src/mlpack/methods/adaboost/adaboost.hpp
@@ -59,7 +59,7 @@ class Adaboost
* @param t The classification matrix to be built
* @param l The labels from which the classification matrix is to be built.
*/
- void buildClassificationMatrix(arma::mat& t, const arma::Row<size_t>& l);
+ void BuildClassificationMatrix(arma::mat& t, const arma::Row<size_t>& l);
/**
* This function helps in building the Weight Distribution matrix
@@ -71,7 +71,7 @@ class Adaboost
* to be calculated.
* @param weights The output weight vector.
*/
- void buildWeightMatrix(const arma::mat& D, arma::rowvec& weights);
+ void BuildWeightMatrix(const arma::mat& D, arma::rowvec& weights);
// Stores the final classification of the Labels.
arma::Row<size_t> finalHypothesis;
diff --git a/src/mlpack/methods/adaboost/adaboost_impl.hpp b/src/mlpack/methods/adaboost/adaboost_impl.hpp
index 139b9d8..af6410e 100644
--- a/src/mlpack/methods/adaboost/adaboost_impl.hpp
+++ b/src/mlpack/methods/adaboost/adaboost_impl.hpp
@@ -66,10 +66,10 @@ Adaboost<MatType, WeakLearner>::Adaboost(
// Build a classification matrix of the form D(i,l)
// where i is the ith instance
// l is the lth class.
- buildClassificationMatrix(yt, labels);
+ BuildClassificationMatrix(yt, labels);
// ht(x), to be loaded after a round of prediction every time the weak
- // learner is run, by using the buildClassificationMatrix function
+ // learner is run, by using the BuildClassificationMatrix function
arma::mat ht(predictedLabels.n_cols, numClasses);
// This matrix is a helper matrix used to calculate the final hypothesis.
@@ -97,14 +97,14 @@ Adaboost<MatType, WeakLearner>::Adaboost(
zt = 0.0;
// Build the weight vectors
- buildWeightMatrix(D, weights);
+ BuildWeightMatrix(D, weights);
// call the other weak learner and train the labels.
WeakLearner w(other, tempData, weights, labels);
w.Classify(tempData, predictedLabels);
//Now from predictedLabels, build ht, the weak hypothesis
- buildClassificationMatrix(ht, predictedLabels);
+ BuildClassificationMatrix(ht, predictedLabels);
// Now, start calculation of alpha(t) using ht
@@ -174,7 +174,7 @@ Adaboost<MatType, WeakLearner>::Adaboost(
* @param l The labels from which the classification matrix is to be built.
*/
template <typename MatType, typename WeakLearner>
-void Adaboost<MatType, WeakLearner>::buildClassificationMatrix(
+void Adaboost<MatType, WeakLearner>::BuildClassificationMatrix(
arma::mat& t, const arma::Row<size_t>& l)
{
int i, j;
@@ -202,7 +202,7 @@ void Adaboost<MatType, WeakLearner>::buildClassificationMatrix(
* @param weights The output weight vector.
*/
template <typename MatType, typename WeakLearner>
-void Adaboost<MatType, WeakLearner>::buildWeightMatrix(
+void Adaboost<MatType, WeakLearner>::BuildWeightMatrix(
const arma::mat& D, arma::rowvec& weights)
{
int i, j;
More information about the mlpack-git
mailing list