From edce15b8779b860718462c7cdf0b4e50cdba236c Mon Sep 17 00:00:00 2001 From: James Cline Date: Tue, 17 Jan 2012 21:11:47 +0000 Subject: [PATCH] How many unused parameters does one library need... Just commenting out the unused variable names so that the code is still readable and sensible. I'm not sure if having several methods that don't do anything at all is a completely sensible approach, though... --- .../aug_lagrangian_test_functions.cpp | 2 +- .../aug_lagrangian_test_functions.hpp | 4 +--- src/mlpack/core/tree/statistic.hpp | 16 ++++++++-------- src/mlpack/methods/emst/dtb_impl.hpp | 8 ++++---- .../methods/kernel_pca/kernel_pca_main.cpp | 2 +- .../methods/kmeans/allow_empty_clusters.hpp | 10 +++++----- .../methods/neighbor_search/neighbor_search.hpp | 12 ++++++------ src/mlpack/tests/tree_test.cpp | 4 ++-- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp index ca46c9988f..c467564212 100644 --- a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp +++ b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.cpp @@ -57,7 +57,7 @@ double AugLagrangianTestFunction::EvaluateConstraint(size_t index, } void AugLagrangianTestFunction::GradientConstraint(size_t index, - const arma::mat& coordinates, arma::mat& gradient) + arma::mat& gradient) { // If the user passed an invalid index (not 0), we will return a zero // gradient. diff --git a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp index c4a982badb..4fcdd0c971 100644 --- a/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp +++ b/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp @@ -32,9 +32,7 @@ class AugLagrangianTestFunction size_t NumConstraints() const { return 1; } double EvaluateConstraint(size_t index, const arma::mat& coordinates); - void GradientConstraint(size_t index, - const arma::mat& coordinates, - arma::mat& gradient); + void GradientConstraint(size_t index, arma::mat& gradient); const arma::mat& GetInitialPoint() { return initialPoint; } diff --git a/src/mlpack/core/tree/statistic.hpp b/src/mlpack/core/tree/statistic.hpp index 1235f24168..802d3b69fd 100644 --- a/src/mlpack/core/tree/statistic.hpp +++ b/src/mlpack/core/tree/statistic.hpp @@ -30,9 +30,9 @@ class EmptyStatistic * @param count Number of points held in this leaf. */ template - EmptyStatistic(const MatType& dataset, - const size_t begin, - const size_t count) + EmptyStatistic(const MatType& /* dataset */, + const size_t /* begin */, + const size_t /* count */) { } /** @@ -46,11 +46,11 @@ class EmptyStatistic * @param rightStat EmptyStatistic object of the right child node. */ template - EmptyStatistic(const MatType& dataset, - const size_t start, - const size_t count, - const EmptyStatistic& leftStat, - const EmptyStatistic& rightStat) + EmptyStatistic(const MatType& /* dataset */, + const size_t /* start */, + const size_t /* count */, + const EmptyStatistic& /* leftStat */, + const EmptyStatistic& /* rightStat */) { } }; diff --git a/src/mlpack/methods/emst/dtb_impl.hpp b/src/mlpack/methods/emst/dtb_impl.hpp index 80ce98be96..a866569877 100644 --- a/src/mlpack/methods/emst/dtb_impl.hpp +++ b/src/mlpack/methods/emst/dtb_impl.hpp @@ -27,7 +27,7 @@ DTBStat::DTBStat() : maxNeighborDistance(DBL_MAX), componentMembership(-1) * An initializer for leaves. */ template -DTBStat::DTBStat(const MatType& dataset, +DTBStat::DTBStat(const MatType& /* dataset */, const size_t start, const size_t count) : maxNeighborDistance(DBL_MAX), @@ -40,11 +40,11 @@ DTBStat::DTBStat(const MatType& dataset, * An initializer for non-leaves. */ template -DTBStat::DTBStat(const MatType& dataset, +DTBStat::DTBStat(const MatType& /* dataset */, const size_t start, const size_t count, - const DTBStat& leftStat, - const DTBStat& right_stat) : + const DTBStat& /* leftStat */, + const DTBStat& /* rightStat */) : maxNeighborDistance(DBL_MAX), componentMembership((count == 1) ? start : -1) { diff --git a/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp b/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp index 1c24fa2dfd..7bfbf5a5d0 100644 --- a/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp +++ b/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp @@ -14,7 +14,7 @@ using namespace mlpack::kpca; using namespace std; using namespace arma; -int main(int argc, char** argv) +int main(int /* argc */, char** /* argv */) { mat data("1 0 2 3 9;" diff --git a/src/mlpack/methods/kmeans/allow_empty_clusters.hpp b/src/mlpack/methods/kmeans/allow_empty_clusters.hpp index 078cf9137c..ac956b3402 100644 --- a/src/mlpack/methods/kmeans/allow_empty_clusters.hpp +++ b/src/mlpack/methods/kmeans/allow_empty_clusters.hpp @@ -37,11 +37,11 @@ class AllowEmptyClusters * @return Number of points changed (0). */ template - static size_t EmptyCluster(const MatType& data, - const size_t emptyCluster, - const MatType& centroids, - arma::Col& clusterCounts, - arma::Col& assignments) + static size_t EmptyCluster(const MatType& /* data */, + const size_t /* emptyCluster */, + const MatType& /* centroids */, + arma::Col& /* clusterCounts */, + arma::Col& /* assignments */) { // Empty clusters are okay! Do nothing. return 0; diff --git a/src/mlpack/methods/neighbor_search/neighbor_search.hpp b/src/mlpack/methods/neighbor_search/neighbor_search.hpp index d05ca1f70d..aea3ce634d 100644 --- a/src/mlpack/methods/neighbor_search/neighbor_search.hpp +++ b/src/mlpack/methods/neighbor_search/neighbor_search.hpp @@ -44,18 +44,18 @@ class QueryStat * Initialization for a leaf, required by the StatisticType policy. */ template - QueryStat(const MatType& dataset, const size_t begin, const size_t count) + QueryStat(const MatType& /* dataset */, const size_t /* begin */, const size_t /* count */) : bound(SortPolicy::WorstDistance()) { } /** * Initialization for a node, required by the StatisticType policy. */ template - QueryStat(const MatType& dataset, - const size_t begin, - const size_t count, - const QueryStat& leftStat, - const QueryStat& rightStat) + QueryStat(const MatType& /* dataset */, + const size_t /* begin */, + const size_t /* count */, + const QueryStat& /* leftStat */, + const QueryStat& /* rightStat */) : bound(SortPolicy::WorstDistance()) { } //! Get the bound. diff --git a/src/mlpack/tests/tree_test.cpp b/src/mlpack/tests/tree_test.cpp index b0bdbd9cbb..e0810afea3 100644 --- a/src/mlpack/tests/tree_test.cpp +++ b/src/mlpack/tests/tree_test.cpp @@ -1308,8 +1308,8 @@ bool CheckPointBounds(TreeType* node, const arma::mat& data) template bool DoBoundsIntersect(HRectBound& a, HRectBound& b, - size_t ia, - size_t ib) + size_t /* ia */, + size_t /* ib */) { size_t dimensionality = a.Dim();