[mlpack-git] master: Minor style fix; Add some spaces. (dc36801)
gitdub at mlpack.org
gitdub at mlpack.org
Wed Feb 24 14:47:42 EST 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/2aedd27420d7c268d54c867071ef2b85fbacf689...dc368011ee4b11e2638dfdcbd8db9777efd2bb84
>---------------------------------------------------------------
commit dc368011ee4b11e2638dfdcbd8db9777efd2bb84
Author: marcus <marcus.edel at fu-berlin.de>
Date: Wed Feb 24 20:47:42 2016 +0100
Minor style fix; Add some spaces.
>---------------------------------------------------------------
dc368011ee4b11e2638dfdcbd8db9777efd2bb84
src/mlpack/methods/ann/layer/bias_layer.hpp | 22 ++++------------------
src/mlpack/methods/ann/layer/conv_layer.hpp | 8 ++++----
src/mlpack/methods/ann/layer/linear_layer.hpp | 11 +++++------
src/mlpack/methods/ann/layer/lstm_layer.hpp | 6 +++---
src/mlpack/methods/ann/layer/pooling_layer.hpp | 6 +++---
src/mlpack/methods/ann/layer/recurrent_layer.hpp | 10 +++++-----
src/mlpack/methods/ann/layer/softmax_layer.hpp | 6 +++---
src/mlpack/methods/ann/layer/sparse_bias_layer.hpp | 8 ++++----
.../methods/ann/layer/sparse_input_layer.hpp | 8 ++++----
.../methods/ann/layer/sparse_output_layer.hpp | 8 ++++----
10 files changed, 39 insertions(+), 54 deletions(-)
diff --git a/src/mlpack/methods/ann/layer/bias_layer.hpp b/src/mlpack/methods/ann/layer/bias_layer.hpp
index f8f39bc..11d293d 100644
--- a/src/mlpack/methods/ann/layer/bias_layer.hpp
+++ b/src/mlpack/methods/ann/layer/bias_layer.hpp
@@ -47,20 +47,6 @@ class BiasLayer
weights.set_size(outSize, 1);
}
- BiasLayer(BiasLayer &&layer) noexcept
- {
- *this = std::move(layer);
- }
-
- BiasLayer& operator=(BiasLayer &&layer) noexcept
- {
- outSize = layer.outSize;
- bias = layer.bias;
- weights.swap(layer.weights);
-
- return *this;
- }
-
/**
* Ordinary feed forward pass of a neural network, evaluating the function
* f(x) by propagating the activity forward through f.
@@ -142,22 +128,22 @@ class BiasLayer
InputDataType& Weights() { return weights; }
//! Get the input parameter.
- InputDataType& InputParameter() const {return inputParameter; }
+ InputDataType& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- OutputDataType& OutputParameter() const {return outputParameter; }
+ OutputDataType& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType& Delta() const {return delta; }
+ OutputDataType& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
//! Get the gradient.
- InputDataType& Gradient() const {return gradient; }
+ InputDataType& Gradient() const { return gradient; }
//! Modify the gradient.
InputDataType& Gradient() { return gradient; }
diff --git a/src/mlpack/methods/ann/layer/conv_layer.hpp b/src/mlpack/methods/ann/layer/conv_layer.hpp
index 6846eea..06f38a8 100644
--- a/src/mlpack/methods/ann/layer/conv_layer.hpp
+++ b/src/mlpack/methods/ann/layer/conv_layer.hpp
@@ -185,22 +185,22 @@ class ConvLayer
OutputDataType& Weights() { return weights; }
//! Get the input parameter.
- InputDataType& InputParameter() const {return inputParameter; }
+ InputDataType& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- OutputDataType& OutputParameter() const {return outputParameter; }
+ OutputDataType& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType& Delta() const {return delta; }
+ OutputDataType& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
//! Get the gradient.
- OutputDataType& Gradient() const {return gradient; }
+ OutputDataType& Gradient() const { return gradient; }
//! Modify the gradient.
OutputDataType& Gradient() { return gradient; }
diff --git a/src/mlpack/methods/ann/layer/linear_layer.hpp b/src/mlpack/methods/ann/layer/linear_layer.hpp
index d94bb73..f059bb3 100644
--- a/src/mlpack/methods/ann/layer/linear_layer.hpp
+++ b/src/mlpack/methods/ann/layer/linear_layer.hpp
@@ -36,8 +36,7 @@ class LinearLayer
* @param inSize The number of input units.
* @param outSize The number of output units.
*/
- LinearLayer(const size_t inSize,
- const size_t outSize) :
+ LinearLayer(const size_t inSize, const size_t outSize) :
inSize(inSize),
outSize(outSize)
{
@@ -131,22 +130,22 @@ class LinearLayer
OutputDataType& Weights() { return weights; }
//! Get the input parameter.
- InputDataType& InputParameter() const {return inputParameter; }
+ InputDataType& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- OutputDataType& OutputParameter() const {return outputParameter; }
+ OutputDataType& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType& Delta() const {return delta; }
+ OutputDataType& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
//! Get the gradient.
- OutputDataType& Gradient() const {return gradient; }
+ OutputDataType& Gradient() const { return gradient; }
//! Modify the gradient.
OutputDataType& Gradient() { return gradient; }
diff --git a/src/mlpack/methods/ann/layer/lstm_layer.hpp b/src/mlpack/methods/ann/layer/lstm_layer.hpp
index 642dad8..0ac04e7 100644
--- a/src/mlpack/methods/ann/layer/lstm_layer.hpp
+++ b/src/mlpack/methods/ann/layer/lstm_layer.hpp
@@ -268,17 +268,17 @@ class LSTMLayer
OutputDataType& Weights() { return peepholeWeights; }
//! Get the input parameter.
- InputDataType& InputParameter() const {return inputParameter; }
+ InputDataType& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- OutputDataType& OutputParameter() const {return outputParameter; }
+ OutputDataType& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType& Delta() const {return delta; }
+ OutputDataType& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
diff --git a/src/mlpack/methods/ann/layer/pooling_layer.hpp b/src/mlpack/methods/ann/layer/pooling_layer.hpp
index c8eca2e..fdaefad 100644
--- a/src/mlpack/methods/ann/layer/pooling_layer.hpp
+++ b/src/mlpack/methods/ann/layer/pooling_layer.hpp
@@ -149,17 +149,17 @@ class PoolingLayer
}
//! Get the input parameter.
- InputDataType& InputParameter() const {return inputParameter; }
+ InputDataType& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- InputDataType& OutputParameter() const {return outputParameter; }
+ InputDataType& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
InputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType& Delta() const {return delta; }
+ OutputDataType& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
diff --git a/src/mlpack/methods/ann/layer/recurrent_layer.hpp b/src/mlpack/methods/ann/layer/recurrent_layer.hpp
index 6f57899..332a659 100644
--- a/src/mlpack/methods/ann/layer/recurrent_layer.hpp
+++ b/src/mlpack/methods/ann/layer/recurrent_layer.hpp
@@ -119,27 +119,27 @@ class RecurrentLayer
OutputDataType& Weights() { return weights; }
//! Get the input parameter.
- InputDataType& InputParameter() const {return inputParameter; }
+ InputDataType& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the input parameter.
- InputDataType& RecurrentParameter() const {return recurrentParameter; }
+ InputDataType& RecurrentParameter() const { return recurrentParameter; }
//! Modify the input parameter.
InputDataType& RecurrentParameter() { return recurrentParameter; }
//! Get the output parameter.
- OutputDataType& OutputParameter() const {return outputParameter; }
+ OutputDataType& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType& Delta() const {return delta; }
+ OutputDataType& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
//! Get the gradient.
- OutputDataType& Gradient() const {return gradient; }
+ OutputDataType& Gradient() const { return gradient; }
//! Modify the gradient.
OutputDataType& Gradient() { return gradient; }
diff --git a/src/mlpack/methods/ann/layer/softmax_layer.hpp b/src/mlpack/methods/ann/layer/softmax_layer.hpp
index 860d57a..12e0146 100644
--- a/src/mlpack/methods/ann/layer/softmax_layer.hpp
+++ b/src/mlpack/methods/ann/layer/softmax_layer.hpp
@@ -83,17 +83,17 @@ class SoftmaxLayer
}
//! Get the input parameter.
- InputDataType& InputParameter() const {return inputParameter; }
+ InputDataType& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- OutputDataType& OutputParameter() const {return outputParameter; }
+ OutputDataType& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- InputDataType& Delta() const {return delta; }
+ InputDataType& Delta() const { return delta; }
//! Modify the delta.
InputDataType& Delta() { return delta; }
diff --git a/src/mlpack/methods/ann/layer/sparse_bias_layer.hpp b/src/mlpack/methods/ann/layer/sparse_bias_layer.hpp
index 7b7c8b3..2723a98 100644
--- a/src/mlpack/methods/ann/layer/sparse_bias_layer.hpp
+++ b/src/mlpack/methods/ann/layer/sparse_bias_layer.hpp
@@ -112,22 +112,22 @@ class SparseBiasLayer
InputDataType& Weights() { return weights; }
//! Get the input parameter.
- InputDataType const& InputParameter() const {return inputParameter; }
+ InputDataType const& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- OutputDataType const& OutputParameter() const {return outputParameter; }
+ OutputDataType const& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType const& Delta() const {return delta; }
+ OutputDataType const& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
//! Get the gradient.
- InputDataType const& Gradient() const {return gradient; }
+ InputDataType const& Gradient() const { return gradient; }
//! Modify the gradient.
InputDataType& Gradient() { return gradient; }
diff --git a/src/mlpack/methods/ann/layer/sparse_input_layer.hpp b/src/mlpack/methods/ann/layer/sparse_input_layer.hpp
index 4280ae5..efdb777 100644
--- a/src/mlpack/methods/ann/layer/sparse_input_layer.hpp
+++ b/src/mlpack/methods/ann/layer/sparse_input_layer.hpp
@@ -114,22 +114,22 @@ class SparseInputLayer
OutputDataType& Weights() { return weights; }
//! Get the input parameter.
- InputDataType const& InputParameter() const {return inputParameter; }
+ InputDataType const& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- OutputDataType const& OutputParameter() const {return outputParameter; }
+ OutputDataType const& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType const& Delta() const {return delta; }
+ OutputDataType const& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
//! Get the gradient.
- OutputDataType& Gradient() const {return gradient; }
+ OutputDataType& Gradient() const { return gradient; }
//! Modify the gradient.
OutputDataType& Gradient() { return gradient; }
diff --git a/src/mlpack/methods/ann/layer/sparse_output_layer.hpp b/src/mlpack/methods/ann/layer/sparse_output_layer.hpp
index 99a2500..950081a 100644
--- a/src/mlpack/methods/ann/layer/sparse_output_layer.hpp
+++ b/src/mlpack/methods/ann/layer/sparse_output_layer.hpp
@@ -154,22 +154,22 @@ class SparseOutputLayer
OutputDataType& RhoCap() { return rhoCap; }
//! Get the input parameter.
- InputDataType const& InputParameter() const {return inputParameter; }
+ InputDataType const& InputParameter() const { return inputParameter; }
//! Modify the input parameter.
InputDataType& InputParameter() { return inputParameter; }
//! Get the output parameter.
- OutputDataType const& OutputParameter() const {return outputParameter; }
+ OutputDataType const& OutputParameter() const { return outputParameter; }
//! Modify the output parameter.
OutputDataType& OutputParameter() { return outputParameter; }
//! Get the delta.
- OutputDataType const& Delta() const {return delta; }
+ OutputDataType const& Delta() const { return delta; }
//! Modify the delta.
OutputDataType& Delta() { return delta; }
//! Get the gradient.
- OutputDataType const& Gradient() const {return gradient; }
+ OutputDataType const& Gradient() const { return gradient; }
//! Modify the gradient.
OutputDataType& Gradient() { return gradient; }
More information about the mlpack-git
mailing list