From 4fdcc8ed3e9d1900e4afbd5bf389fb236f108d9f Mon Sep 17 00:00:00 2001 From: walragatver Date: Wed, 31 Jul 2019 19:56:40 +0530 Subject: [PATCH] Remove unwanted braces. --- src/mlpack/methods/ann/gan/gan.hpp | 3 ++- src/mlpack/methods/ann/gan/gan_impl.hpp | 20 +++++++++++++++----- src/mlpack/methods/ann/gan/wgan_impl.hpp | 8 ++++++-- src/mlpack/methods/ann/gan/wgangp_impl.hpp | 6 +++++- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/mlpack/methods/ann/gan/gan.hpp b/src/mlpack/methods/ann/gan/gan.hpp index 19cc6666bb..022f1c6785 100644 --- a/src/mlpack/methods/ann/gan/gan.hpp +++ b/src/mlpack/methods/ann/gan/gan.hpp @@ -68,7 +68,8 @@ class GAN * * @param generator Generator network. * @param discriminator Discriminator network. - * @param initializeRule Initialization to use for initializing parameters. + * @param initializeRule Initialization rule to use for initializing + * parameters. * @param noiseFunction Function to be used for generating noise. * @param noiseDim Dimension of noise vector to be created. * @param batchSize Batch size to be used for training. diff --git a/src/mlpack/methods/ann/gan/gan_impl.hpp b/src/mlpack/methods/ann/gan/gan_impl.hpp index 607ae9d024..1090d2edb7 100644 --- a/src/mlpack/methods/ann/gan/gan_impl.hpp +++ b/src/mlpack/methods/ann/gan/gan_impl.hpp @@ -162,8 +162,10 @@ void GAN::ResetData( this->generator.predictors.set_size(noiseDim, batchSize); this->generator.responses.set_size(predictors.n_rows, batchSize); - if ((!reset)) + if (!reset) + { Reset(); + } } template< @@ -234,8 +236,10 @@ GAN::Evaluate( const size_t i, const size_t /* batchSize */) { - if ((parameter.is_empty())) + if (parameter.is_empty()) + { Reset(); + } if (!deterministic) { @@ -289,8 +293,10 @@ EvaluateWithGradient(const arma::mat& /* parameters */, GradType& gradient, const size_t /* batchSize */) { - if ((parameter.is_empty())) + if (parameter.is_empty()) + { Reset(); + } if (gradient.is_empty()) { @@ -409,8 +415,10 @@ template< void GAN::Forward( arma::mat&& input) { - if ((parameter.is_empty())) + if (parameter.is_empty()) + { Reset(); + } generator.Forward(std::move(input)); arma::mat ganOutput = boost::apply_visitor(outputParameterVisitor, @@ -428,8 +436,10 @@ template< void GAN:: Predict(arma::mat input, arma::mat& output) { - if ((parameter.is_empty())) + if (parameter.is_empty()) + { Reset(); + } if (!deterministic) { diff --git a/src/mlpack/methods/ann/gan/wgan_impl.hpp b/src/mlpack/methods/ann/gan/wgan_impl.hpp index 3938d74980..76073ef3b1 100644 --- a/src/mlpack/methods/ann/gan/wgan_impl.hpp +++ b/src/mlpack/methods/ann/gan/wgan_impl.hpp @@ -34,8 +34,10 @@ GAN::Evaluate( const size_t i, const size_t /* batchSize */) { - if ((parameter.is_empty())) + if (parameter.is_empty()) + { Reset(); + } if (!deterministic) { @@ -88,8 +90,10 @@ EvaluateWithGradient(const arma::mat& /* parameters */, GradType& gradient, const size_t /* batchSize */) { - if ((parameter.is_empty())) + if (parameter.is_empty()) + { Reset(); + } if (gradient.is_empty()) { diff --git a/src/mlpack/methods/ann/gan/wgangp_impl.hpp b/src/mlpack/methods/ann/gan/wgangp_impl.hpp index 2ce3b5ff4c..423e731d86 100644 --- a/src/mlpack/methods/ann/gan/wgangp_impl.hpp +++ b/src/mlpack/methods/ann/gan/wgangp_impl.hpp @@ -36,7 +36,9 @@ GAN::Evaluate( const size_t /* batchSize */) { if ((parameter.is_empty())) + { Reset(); + } if (!deterministic) { @@ -102,8 +104,10 @@ EvaluateWithGradient(const arma::mat& /* parameters */, GradType& gradient, const size_t /* batchSize */) { - if ((parameter.is_empty())) + if (parameter.is_empty()) + { Reset(); + } if (gradient.is_empty()) {