[mlpack-git] master: Fix the include guards to avoid the problem of double inclusion. (f8b5416)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Mon Jun 1 17:05:35 EDT 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/f07048b466066b80082a65a233af46f758b75568...0547fb75a32eda7e273651a7e6b6a258c5885a1e
>---------------------------------------------------------------
commit f8b5416500c2ec2203ea11610b4fc559dff4b03c
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date: Sun May 10 21:34:23 2015 +0200
Fix the include guards to avoid the problem of double inclusion.
>---------------------------------------------------------------
f8b5416500c2ec2203ea11610b4fc559dff4b03c
src/mlpack/methods/ann/connections/connection_traits.hpp | 4 ++--
src/mlpack/methods/ann/connections/fullself_connection.hpp | 4 ++--
src/mlpack/methods/ann/connections/self_connection.hpp | 4 ++--
.../methods/ann/init_rules/kathirvalavakumar_subavathi_init.hpp | 4 ++--
src/mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp | 4 ++--
src/mlpack/methods/ann/init_rules/oivs_init.hpp | 4 ++--
src/mlpack/methods/ann/init_rules/orthogonal_init.hpp | 4 ++--
src/mlpack/methods/ann/init_rules/random_init.hpp | 4 ++--
src/mlpack/methods/ann/layer/layer_traits.hpp | 4 ++--
src/mlpack/methods/ann/layer/multiclass_classification_layer.hpp | 4 ++--
src/mlpack/methods/ann/layer/one_hot_layer.hpp | 4 ++--
src/mlpack/methods/ann/network_traits.hpp | 4 ++--
src/mlpack/methods/ann/optimizer/irpropm.hpp | 4 ++--
src/mlpack/methods/ann/optimizer/irpropp.hpp | 4 ++--
src/mlpack/methods/ann/optimizer/rpropm.hpp | 4 ++--
src/mlpack/methods/ann/optimizer/rpropp.hpp | 4 ++--
src/mlpack/methods/ann/optimizer/steepest_descent.hpp | 4 ++--
17 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/mlpack/methods/ann/connections/connection_traits.hpp b/src/mlpack/methods/ann/connections/connection_traits.hpp
index b85b648..e859afe 100644
--- a/src/mlpack/methods/ann/connections/connection_traits.hpp
+++ b/src/mlpack/methods/ann/connections/connection_traits.hpp
@@ -5,8 +5,8 @@
* ConnectionTraits class, a template class to get information about various
* layers.
*/
-#ifndef __MLPACK_METHOS_ANN_CONNECTIONS_CONNECTION_TRAITS_HPP
-#define __MLPACK_METHOS_ANN_CONNECTIONS_CONNECTION_TRAITS_HPP
+#ifndef __MLPACK_METHODS_ANN_CONNECTIONS_CONNECTION_TRAITS_HPP
+#define __MLPACK_METHODS_ANN_CONNECTIONS_CONNECTION_TRAITS_HPP
namespace mlpack {
namespace ann {
diff --git a/src/mlpack/methods/ann/connections/fullself_connection.hpp b/src/mlpack/methods/ann/connections/fullself_connection.hpp
index 0f59ea6..03070ec 100644
--- a/src/mlpack/methods/ann/connections/fullself_connection.hpp
+++ b/src/mlpack/methods/ann/connections/fullself_connection.hpp
@@ -5,8 +5,8 @@
* Implementation of the full self connection class. This is used mainly used as
* recurrent connection.
*/
-#ifndef __MLPACK_METHOS_ANN_CONNECTIONS_FULLSELF_CONNECTION_HPP
-#define __MLPACK_METHOS_ANN_CONNECTIONS_FULLSELF_CONNECTION_HPP
+#ifndef __MLPACK_METHODS_ANN_CONNECTIONS_FULLSELF_CONNECTION_HPP
+#define __MLPACK_METHODS_ANN_CONNECTIONS_FULLSELF_CONNECTION_HPP
#include <mlpack/core.hpp>
#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
diff --git a/src/mlpack/methods/ann/connections/self_connection.hpp b/src/mlpack/methods/ann/connections/self_connection.hpp
index f93b3bb..0bbcbaf 100644
--- a/src/mlpack/methods/ann/connections/self_connection.hpp
+++ b/src/mlpack/methods/ann/connections/self_connection.hpp
@@ -5,8 +5,8 @@
* Implementation of the self connection class. This connection is mainly used
* as recurrent connection.
*/
-#ifndef __MLPACK_METHOS_ANN_CONNECTIONS_SELF_CONNECTION_HPP
-#define __MLPACK_METHOS_ANN_CONNECTIONS_SELF_CONNECTION_HPP
+#ifndef __MLPACK_METHODS_ANN_CONNECTIONS_SELF_CONNECTION_HPP
+#define __MLPACK_METHODS_ANN_CONNECTIONS_SELF_CONNECTION_HPP
#include <mlpack/core.hpp>
#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
diff --git a/src/mlpack/methods/ann/init_rules/kathirvalavakumar_subavathi_init.hpp b/src/mlpack/methods/ann/init_rules/kathirvalavakumar_subavathi_init.hpp
index 8c3f18e..c86f6af 100644
--- a/src/mlpack/methods/ann/init_rules/kathirvalavakumar_subavathi_init.hpp
+++ b/src/mlpack/methods/ann/init_rules/kathirvalavakumar_subavathi_init.hpp
@@ -19,8 +19,8 @@
* }
* @endcode
*/
-#ifndef __MLPACK_METHOS_ANN_INIT_RULES_KATHIRVALAVAKUMAR_SUBAVATHI_INIT_HPP
-#define __MLPACK_METHOS_ANN_INIT_RULES_KATHIRVALAVAKUMAR_SUBAVATHI_INIT_HPP
+#ifndef __MLPACK_METHODS_ANN_INIT_RULES_KATHIRVALAVAKUMAR_SUBAVATHI_INIT_HPP
+#define __MLPACK_METHODS_ANN_INIT_RULES_KATHIRVALAVAKUMAR_SUBAVATHI_INIT_HPP
#include <mlpack/core.hpp>
#include <mlpack/methods/ann/activation_functions/logistic_function.hpp>
diff --git a/src/mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp b/src/mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp
index 5c46343..eade5ed 100644
--- a/src/mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp
+++ b/src/mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp
@@ -18,8 +18,8 @@
* }
* @endcode
*/
-#ifndef __MLPACK_METHOS_ANN_INIT_RULES_NGUYEN_WIDROW_INIT_HPP
-#define __MLPACK_METHOS_ANN_INIT_RULES_NGUYEN_WIDROW_INIT_HPP
+#ifndef __MLPACK_METHODS_ANN_INIT_RULES_NGUYEN_WIDROW_INIT_HPP
+#define __MLPACK_METHODS_ANN_INIT_RULES_NGUYEN_WIDROW_INIT_HPP
#include <mlpack/core.hpp>
diff --git a/src/mlpack/methods/ann/init_rules/oivs_init.hpp b/src/mlpack/methods/ann/init_rules/oivs_init.hpp
index 028a41b..4805c7d 100644
--- a/src/mlpack/methods/ann/init_rules/oivs_init.hpp
+++ b/src/mlpack/methods/ann/init_rules/oivs_init.hpp
@@ -19,8 +19,8 @@
* }
* @endcode
*/
-#ifndef __MLPACK_METHOS_ANN_INIT_RULES_OIVS_INIT_HPP
-#define __MLPACK_METHOS_ANN_INIT_RULES_OIVS_INIT_HPP
+#ifndef __MLPACK_METHODS_ANN_INIT_RULES_OIVS_INIT_HPP
+#define __MLPACK_METHODS_ANN_INIT_RULES_OIVS_INIT_HPP
#include <mlpack/core.hpp>
#include <mlpack/methods/ann/activation_functions/logistic_function.hpp>
diff --git a/src/mlpack/methods/ann/init_rules/orthogonal_init.hpp b/src/mlpack/methods/ann/init_rules/orthogonal_init.hpp
index ca2da85..f435f32 100644
--- a/src/mlpack/methods/ann/init_rules/orthogonal_init.hpp
+++ b/src/mlpack/methods/ann/init_rules/orthogonal_init.hpp
@@ -4,8 +4,8 @@
*
* Definition and implementation of the orthogonal matrix initialization method.
*/
-#ifndef __MLPACK_METHOS_ANN_INIT_RULES_ORTHOGONAL_INIT_HPP
-#define __MLPACK_METHOS_ANN_INIT_RULES_ORTHOGONAL_INIT_HPP
+#ifndef __MLPACK_METHODS_ANN_INIT_RULES_ORTHOGONAL_INIT_HPP
+#define __MLPACK_METHODS_ANN_INIT_RULES_ORTHOGONAL_INIT_HPP
#include <mlpack/core.hpp>
diff --git a/src/mlpack/methods/ann/init_rules/random_init.hpp b/src/mlpack/methods/ann/init_rules/random_init.hpp
index daf3fb6..c7714f8 100644
--- a/src/mlpack/methods/ann/init_rules/random_init.hpp
+++ b/src/mlpack/methods/ann/init_rules/random_init.hpp
@@ -5,8 +5,8 @@
* Intialization rule for the neural networks. This simple initialization is
* performed by assigning a random matrix to the weight matrix.
*/
-#ifndef __MLPACK_METHOS_ANN_INIT_RULES_RANDOM_INIT_HPP
-#define __MLPACK_METHOS_ANN_INIT_RULES_RANDOM_INIT_HPP
+#ifndef __MLPACK_METHODS_ANN_INIT_RULES_RANDOM_INIT_HPP
+#define __MLPACK_METHODS_ANN_INIT_RULES_RANDOM_INIT_HPP
#include <mlpack/core.hpp>
diff --git a/src/mlpack/methods/ann/layer/layer_traits.hpp b/src/mlpack/methods/ann/layer/layer_traits.hpp
index 52ee1af..0231171 100644
--- a/src/mlpack/methods/ann/layer/layer_traits.hpp
+++ b/src/mlpack/methods/ann/layer/layer_traits.hpp
@@ -5,8 +5,8 @@
* This provides the LayerTraits class, a template class to get information
* about various layers.
*/
-#ifndef __MLPACK_METHOS_ANN_LAYER_LAYER_TRAITS_HPP
-#define __MLPACK_METHOS_ANN_LAYER_LAYER_TRAITS_HPP
+#ifndef __MLPACK_METHODS_ANN_LAYER_LAYER_TRAITS_HPP
+#define __MLPACK_METHODS_ANN_LAYER_LAYER_TRAITS_HPP
namespace mlpack {
namespace ann {
diff --git a/src/mlpack/methods/ann/layer/multiclass_classification_layer.hpp b/src/mlpack/methods/ann/layer/multiclass_classification_layer.hpp
index 2c8807f..32f9878 100644
--- a/src/mlpack/methods/ann/layer/multiclass_classification_layer.hpp
+++ b/src/mlpack/methods/ann/layer/multiclass_classification_layer.hpp
@@ -5,8 +5,8 @@
* Definition of the MulticlassClassificationLayer class, which implements a
* multiclass classification layer that can be used as output layer.
*/
-#ifndef __MLPACK_METHOS_ANN_LAYER_MULTICLASS_CLASSIFICATION_LAYER_HPP
-#define __MLPACK_METHOS_ANN_LAYER_MULTICLASS_CLASSIFICATION_LAYER_HPP
+#ifndef __MLPACK_METHODS_ANN_LAYER_MULTICLASS_CLASSIFICATION_LAYER_HPP
+#define __MLPACK_METHODS_ANN_LAYER_MULTICLASS_CLASSIFICATION_LAYER_HPP
#include <mlpack/core.hpp>
#include <mlpack/methods/ann/layer/layer_traits.hpp>
diff --git a/src/mlpack/methods/ann/layer/one_hot_layer.hpp b/src/mlpack/methods/ann/layer/one_hot_layer.hpp
index 4113502..f3dd76f 100644
--- a/src/mlpack/methods/ann/layer/one_hot_layer.hpp
+++ b/src/mlpack/methods/ann/layer/one_hot_layer.hpp
@@ -5,8 +5,8 @@
* Definition of the OneHotLayer class, which implements a standard network
* layer.
*/
-#ifndef __MLPACK_METHOS_ANN_LAYER_ONE_HOT_LAYER_HPP
-#define __MLPACK_METHOS_ANN_LAYER_ONE_HOT_LAYER_HPP
+#ifndef __MLPACK_METHODS_ANN_LAYER_ONE_HOT_LAYER_HPP
+#define __MLPACK_METHODS_ANN_LAYER_ONE_HOT_LAYER_HPP
#include <mlpack/core.hpp>
#include <mlpack/methods/ann/layer/layer_traits.hpp>
diff --git a/src/mlpack/methods/ann/network_traits.hpp b/src/mlpack/methods/ann/network_traits.hpp
index 962820a..2d4da22 100644
--- a/src/mlpack/methods/ann/network_traits.hpp
+++ b/src/mlpack/methods/ann/network_traits.hpp
@@ -5,8 +5,8 @@
* NetworkTraits class, a template class to get information about various
* networks.
*/
-#ifndef __MLPACK_METHOS_ANN_NETWORK_TRAITS_HPP
-#define __MLPACK_METHOS_ANN_NETWORK_TRAITS_HPP
+#ifndef __MLPACK_METHODS_ANN_NETWORK_TRAITS_HPP
+#define __MLPACK_METHODS_ANN_NETWORK_TRAITS_HPP
namespace mlpack {
namespace ann {
diff --git a/src/mlpack/methods/ann/optimizer/irpropm.hpp b/src/mlpack/methods/ann/optimizer/irpropm.hpp
index 4bb077b..ef848fd 100644
--- a/src/mlpack/methods/ann/optimizer/irpropm.hpp
+++ b/src/mlpack/methods/ann/optimizer/irpropm.hpp
@@ -5,8 +5,8 @@
* Intialization rule for the neural networks. This simple initialization is
* performed by assigning a random matrix to the weight matrix.
*/
-#ifndef __MLPACK_METHOS_ANN_OPTIMIZER_IRPROPM_HPP
-#define __MLPACK_METHOS_ANN_OPTIMIZER_IRPROPM_HPP
+#ifndef __MLPACK_METHODS_ANN_OPTIMIZER_IRPROPM_HPP
+#define __MLPACK_METHODS_ANN_OPTIMIZER_IRPROPM_HPP
#include <mlpack/core.hpp>
#include <boost/math/special_functions/sign.hpp>
diff --git a/src/mlpack/methods/ann/optimizer/irpropp.hpp b/src/mlpack/methods/ann/optimizer/irpropp.hpp
index 71c95e0..a0deac5 100644
--- a/src/mlpack/methods/ann/optimizer/irpropp.hpp
+++ b/src/mlpack/methods/ann/optimizer/irpropp.hpp
@@ -5,8 +5,8 @@
* Intialization rule for the neural networks. This simple initialization is
* performed by assigning a random matrix to the weight matrix.
*/
-#ifndef __MLPACK_METHOS_ANN_OPTIMIZER_IRPROPP_HPP
-#define __MLPACK_METHOS_ANN_OPTIMIZER_IRPROPP_HPP
+#ifndef __MLPACK_METHODS_ANN_OPTIMIZER_IRPROPP_HPP
+#define __MLPACK_METHODS_ANN_OPTIMIZER_IRPROPP_HPP
#include <mlpack/core.hpp>
#include <boost/math/special_functions/sign.hpp>
diff --git a/src/mlpack/methods/ann/optimizer/rpropm.hpp b/src/mlpack/methods/ann/optimizer/rpropm.hpp
index f72734d..468a1d3 100644
--- a/src/mlpack/methods/ann/optimizer/rpropm.hpp
+++ b/src/mlpack/methods/ann/optimizer/rpropm.hpp
@@ -5,8 +5,8 @@
* Intialization rule for the neural networks. This simple initialization is
* performed by assigning a random matrix to the weight matrix.
*/
-#ifndef __MLPACK_METHOS_ANN_OPTIMIZER_RPROPM_HPP
-#define __MLPACK_METHOS_ANN_OPTIMIZER_RPROPM_HPP
+#ifndef __MLPACK_METHODS_ANN_OPTIMIZER_RPROPM_HPP
+#define __MLPACK_METHODS_ANN_OPTIMIZER_RPROPM_HPP
#include <mlpack/core.hpp>
#include <boost/math/special_functions/sign.hpp>
diff --git a/src/mlpack/methods/ann/optimizer/rpropp.hpp b/src/mlpack/methods/ann/optimizer/rpropp.hpp
index 3f152b0..bf4eb29 100644
--- a/src/mlpack/methods/ann/optimizer/rpropp.hpp
+++ b/src/mlpack/methods/ann/optimizer/rpropp.hpp
@@ -5,8 +5,8 @@
* Intialization rule for the neural networks. This simple initialization is
* performed by assigning a random matrix to the weight matrix.
*/
-#ifndef __MLPACK_METHOS_ANN_OPTIMIZER_RPROPP_HPP
-#define __MLPACK_METHOS_ANN_OPTIMIZER_RPROPP_HPP
+#ifndef __MLPACK_METHODS_ANN_OPTIMIZER_RPROPP_HPP
+#define __MLPACK_METHODS_ANN_OPTIMIZER_RPROPP_HPP
#include <mlpack/core.hpp>
#include <boost/math/special_functions/sign.hpp>
diff --git a/src/mlpack/methods/ann/optimizer/steepest_descent.hpp b/src/mlpack/methods/ann/optimizer/steepest_descent.hpp
index 2c26f33..f2ddd81 100644
--- a/src/mlpack/methods/ann/optimizer/steepest_descent.hpp
+++ b/src/mlpack/methods/ann/optimizer/steepest_descent.hpp
@@ -7,8 +7,8 @@
* nearest local minimum of a function which the assumtion that the gradient of
* the function can be computed.
*/
-#ifndef __MLPACK_METHOS_ANN_OPTIMIZER_STEEPEST_DESCENT_HPP
-#define __MLPACK_METHOS_ANN_OPTIMIZER_STEEPEST_DESCENT_HPP
+#ifndef __MLPACK_METHODS_ANN_OPTIMIZER_STEEPEST_DESCENT_HPP
+#define __MLPACK_METHODS_ANN_OPTIMIZER_STEEPEST_DESCENT_HPP
#include <mlpack/core.hpp>
More information about the mlpack-git
mailing list