[mlpack-git] master: Fix warnings. (473dd46)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 21:54:59 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit 473dd46db8f8c86fe3f813b8de8caa568085977c
Author: Ryan Curtin <ryan at ratml.org>
Date: Mon Jul 28 17:43:20 2014 +0000
Fix warnings.
>---------------------------------------------------------------
473dd46db8f8c86fe3f813b8de8caa568085977c
src/mlpack/methods/perceptron/perceptron_impl.hpp | 4 ++--
src/mlpack/tests/emst_test.cpp | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/mlpack/methods/perceptron/perceptron_impl.hpp b/src/mlpack/methods/perceptron/perceptron_impl.hpp
index 8b3bd35..bfa1866 100644
--- a/src/mlpack/methods/perceptron/perceptron_impl.hpp
+++ b/src/mlpack/methods/perceptron/perceptron_impl.hpp
@@ -69,7 +69,7 @@ void Perceptron<LearnPolicy, WeightInitializationPolicy, MatType>::Classify(
arma::mat tempLabelMat;
arma::uword maxIndexRow, maxIndexCol;
- for (int i = 0; i < test.n_cols; i++)
+ for (size_t i = 0; i < test.n_cols; i++)
{
tempLabelMat = weightVectors.submat(0, 1, weightVectors.n_rows - 1,
weightVectors.n_cols - 1) *
@@ -123,7 +123,7 @@ template<
void Perceptron<LearnPolicy, WeightInitializationPolicy, MatType>::Train(
const arma::rowvec& D)
{
- int j, i = 0;
+ size_t j, i = 0;
bool converged = false;
size_t tempLabel;
arma::uword maxIndexRow, maxIndexCol;
diff --git a/src/mlpack/tests/emst_test.cpp b/src/mlpack/tests/emst_test.cpp
index a6f3742..d2b1750 100644
--- a/src/mlpack/tests/emst_test.cpp
+++ b/src/mlpack/tests/emst_test.cpp
@@ -259,8 +259,7 @@ BOOST_AUTO_TEST_CASE(BallTreeTest)
// naive mode.
DualTreeBoruvka<> bst(inputData, true);
// Ball tree.
- DualTreeBoruvka<EuclideanDistance,
- BinarySpaceTree<BallBound<>, DTBStat> > ballt(inputData);
+ DualTreeBoruvka<EuclideanDistance, TreeType> ballt(inputData);
arma::mat bstResults;
arma::mat ballResults;
More information about the mlpack-git
mailing list