[mlpack-git] master: use arma::uword to replace int (3044ad9)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Mon Nov 30 10:40:15 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/5aaf0e441dd64a5de9a0210aa7a837eecf162d12...e4519fc42a2a340cf0387ab082bf49b9715c871b
>---------------------------------------------------------------
commit 3044ad944623056051bb01f62abae0e56fbcbd5b
Author: stereomatchingkiss <stereomatchingkiss at gmail.com>
Date: Thu Oct 29 08:36:45 2015 +0800
use arma::uword to replace int
>---------------------------------------------------------------
3044ad944623056051bb01f62abae0e56fbcbd5b
.../methods/sparse_autoencoder/maximal_inputs.cpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/mlpack/methods/sparse_autoencoder/maximal_inputs.cpp b/src/mlpack/methods/sparse_autoencoder/maximal_inputs.cpp
index 3fc0cde..efc66c6 100644
--- a/src/mlpack/methods/sparse_autoencoder/maximal_inputs.cpp
+++ b/src/mlpack/methods/sparse_autoencoder/maximal_inputs.cpp
@@ -5,20 +5,20 @@ namespace nn {
namespace {
-void VisualizeHiddenUnit(size_t rows, size_t cols,
+void VisualizeHiddenUnit(arma::uword rows, arma::uword cols,
const arma::mat &input,
arma::mat &output)
{
- int const squareRows = static_cast<int>(std::sqrt(input.n_rows));
- int const buf = 1;
+ arma::uword const squareRows = static_cast<arma::uword>(std::sqrt(input.n_rows));
+ arma::uword const buf = 1;
- int const offset = squareRows+buf;
+ arma::uword const offset = squareRows+buf;
output.ones(buf+rows*(offset),
buf+cols*(offset));
- int k = 0;
- for(int i = 0; i != rows; ++i) {
- for(int j = 0; j != cols; ++j) {
+ arma::uword k = 0;
+ for(arma::uword i = 0; i != rows; ++i) {
+ for(arma::uword j = 0; j != cols; ++j) {
if(k >= input.n_cols) {
continue;
}
@@ -51,16 +51,16 @@ void MaximalInputs(const arma::mat ¶meters, arma::mat &output, double minRan
double const mean = arma::mean(arma::mean(paramTemp));
paramTemp -= mean;
- int rows = 0, cols = 0;
+ arma::uword rows = 0, cols = 0;
if(std::pow(std::floor(std::sqrt(paramTemp.n_cols)), 2) != paramTemp.n_cols) {
- cols = (int)std::ceil(std::sqrt(paramTemp.n_cols));
+ cols = static_cast<arma::uword>(std::ceil(std::sqrt(paramTemp.n_cols)));
while(paramTemp.n_cols % cols != 0 && cols < 1.2*std::sqrt(paramTemp.n_cols)) {
++cols;
}
- rows = static_cast<int>
+ rows = static_cast<arma::uword>
(std::ceil(paramTemp.n_cols/static_cast<double>(cols)));
}else{
- cols = static_cast<int>(std::sqrt(paramTemp.n_cols));
+ cols = static_cast<arma::uword>(std::sqrt(paramTemp.n_cols));
rows = cols;
}
More information about the mlpack-git
mailing list