[mlpack-svn] r10064 - in mlpack/trunk/src/mlpack/core: io kernels optimizers/aug_lagrangian optimizers/lbfgs tree utilities
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Fri Oct 28 21:56:24 EDT 2011
Author: rcurtin
Date: 2011-10-28 21:56:24 -0400 (Fri, 28 Oct 2011)
New Revision: 10064
Modified:
mlpack/trunk/src/mlpack/core/io/prefixedoutstream.hpp
mlpack/trunk/src/mlpack/core/kernels/cosine_distance.hpp
mlpack/trunk/src/mlpack/core/kernels/example_kernel.hpp
mlpack/trunk/src/mlpack/core/kernels/gaussian_kernel.hpp
mlpack/trunk/src/mlpack/core/kernels/linear_kernel.hpp
mlpack/trunk/src/mlpack/core/kernels/lmetric.hpp
mlpack/trunk/src/mlpack/core/kernels/mahalanobis_distance.hpp
mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp
mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp
mlpack/trunk/src/mlpack/core/tree/binary_space_tree.hpp
mlpack/trunk/src/mlpack/core/tree/dballbound.hpp
mlpack/trunk/src/mlpack/core/tree/dballbound_impl.hpp
mlpack/trunk/src/mlpack/core/tree/hrectbound.hpp
mlpack/trunk/src/mlpack/core/tree/periodichrectbound.hpp
mlpack/trunk/src/mlpack/core/utilities/save_restore_utility.hpp
Log:
Don't include Armadillo directly; just include core.h.
Modified: mlpack/trunk/src/mlpack/core/io/prefixedoutstream.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/io/prefixedoutstream.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/io/prefixedoutstream.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -13,7 +13,6 @@
#include <string>
#include <streambuf>
#include <boost/lexical_cast.hpp>
-#include <armadillo>
namespace mlpack {
namespace io {
Modified: mlpack/trunk/src/mlpack/core/kernels/cosine_distance.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/kernels/cosine_distance.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/kernels/cosine_distance.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -8,7 +8,7 @@
#ifndef __MLPACK_CORE_KERNELS_COSINE_DISTANCE_HPP
#define __MLPACK_CORE_KERNELS_COSINE_DISTANCE_HPP
-#include <armadillo>
+#include <mlpack/core.h>
namespace mlpack {
namespace kernel {
Modified: mlpack/trunk/src/mlpack/core/kernels/example_kernel.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/kernels/example_kernel.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/kernels/example_kernel.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -8,7 +8,7 @@
#ifndef __MLPACK_CORE_KERNELS_EXAMPLE_KERNEL_H
#define __MLPACK_CORE_KERNELS_EXAMPLE_KERNEL_H
-#include <armadillo>
+#include <mlpack/core.h>
namespace mlpack {
Modified: mlpack/trunk/src/mlpack/core/kernels/gaussian_kernel.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/kernels/gaussian_kernel.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/kernels/gaussian_kernel.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -9,7 +9,7 @@
#ifndef __MLPACK_CORE_KERNELS_GAUSSIAN_KERNEL_HPP
#define __MLPACK_CORE_KERNELS_GAUSSIAN_KERNEL_HPP
-#include <armadillo>
+#include <mlpack/core.h>
namespace mlpack {
namespace kernel {
Modified: mlpack/trunk/src/mlpack/core/kernels/linear_kernel.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/kernels/linear_kernel.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/kernels/linear_kernel.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -9,7 +9,7 @@
#ifndef __MLPACK_CORE_KERNELS_LINEAR_KERNEL_HPP
#define __MLPACK_CORE_KERNELS_LINEAR_KERNEL_HPP
-#include <armadillo>
+#include <mlpack/core.h>
namespace mlpack {
namespace kernel {
Modified: mlpack/trunk/src/mlpack/core/kernels/lmetric.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/kernels/lmetric.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/kernels/lmetric.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -10,7 +10,7 @@
#ifndef __MLPACK_CORE_KERNELS_LMETRIC_H
#define __MLPACK_CORE_KERNELS_LMETRIC_H
-#include <armadillo>
+#include <mlpack/core.h>
namespace mlpack {
namespace kernel {
Modified: mlpack/trunk/src/mlpack/core/kernels/mahalanobis_distance.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/kernels/mahalanobis_distance.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/kernels/mahalanobis_distance.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -7,7 +7,7 @@
#ifndef __MLPACK_CORE_KERNELS_MAHALANOBIS_DISTANCE_H
#define __MLPACK_CORE_KERNELS_MAHALANOBIS_DISTANCE_H
-#include <armadillo>
+#include <mlpack/core.h>
namespace mlpack {
namespace kernel {
Modified: mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -7,9 +7,7 @@
#ifndef __MLPACK_CORE_OPTIMIZERS_AUG_LAGRANGIAN_AUG_LAGRANGIAN_TEST_FUNCTIONS_HPP
#define __MLPACK_CORE_OPTIMIZERS_AUG_LAGRANGIAN_AUG_LAGRANGIAN_TEST_FUNCTIONS_HPP
-#include <mlpack/core/io/cli.hpp>
-#include <mlpack/core/io/log.hpp>
-#include <armadillo>
+#include <mlpack/core.h>
namespace mlpack {
namespace optimization {
Modified: mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/optimizers/lbfgs/test_functions.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -15,8 +15,7 @@
#ifndef __MLPAC_CORE_OPTIMIZERS_LBFGS_TEST_FUNCTIONS_HPP
#define __MLPAC_CORE_OPTIMIZERS_LBFGS_TEST_FUNCTIONS_HPP
-#include <mlpack/core/io/cli.hpp>
-#include <mlpack/core/io/log.hpp>
+#include <mlpack/core.h>
// To fulfill the template policy class 'FunctionType', we must implement
// the following:
Modified: mlpack/trunk/src/mlpack/core/tree/binary_space_tree.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/binary_space_tree.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/tree/binary_space_tree.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -6,10 +6,10 @@
#ifndef __MLPACK_CORE_TREE_BINARY_SPACE_TREE_HPP
#define __MLPACK_CORE_TREE_BINARY_SPACE_TREE_HPP
+#include <mlpack/core.h>
+
#include "statistic.hpp"
-#include <armadillo>
-
namespace mlpack {
namespace tree /** Trees and tree-building procedures. */ {
Modified: mlpack/trunk/src/mlpack/core/tree/dballbound.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/dballbound.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/tree/dballbound.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -10,9 +10,9 @@
#ifndef __MLPACK_CORE_TREE_DBALLBOUND_HPP
#define __MLPACK_CORE_TREE_DBALLBOUND_HPP
+#include <mlpack/core.h>
#include <mlpack/core/math/math_misc.hpp>
#include <mlpack/core/kernels/lmetric.hpp>
-#include <armadillo>
namespace mlpack {
namespace bound {
Modified: mlpack/trunk/src/mlpack/core/tree/dballbound_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/dballbound_impl.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/tree/dballbound_impl.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -6,15 +6,14 @@
*
* @experimental
*/
-
#ifndef __MLPACK_CORE_TREE_DBALLBOUND_IMPL_HPP
#define __MLPACK_CORE_TREE_DBALLBOUND_IMPL_HPP
+#include <mlpack/core.h>
+
// Awaiting transition
#include <mlpack/core/kernels/lmetric.hpp>
-#include <armadillo>
-
namespace mlpack {
namespace bound {
Modified: mlpack/trunk/src/mlpack/core/tree/hrectbound.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/hrectbound.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/tree/hrectbound.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -12,8 +12,8 @@
#ifndef __MLPACK_CORE_TREE_HRECTBOUND_HPP
#define __MLPACK_CORE_TREE_HRECTBOUND_HPP
-#include <armadillo>
-#include "mlpack/core/math/range.hpp"
+#include <mlpack/core.h>
+#include <mlpack/core/math/range.hpp>
namespace mlpack {
namespace bound {
Modified: mlpack/trunk/src/mlpack/core/tree/periodichrectbound.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/periodichrectbound.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/tree/periodichrectbound.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -9,7 +9,7 @@
#ifndef __MLPACK_CORE_TREE_PERCLIDICHRECTBOUND_HPP
#define __MLPACK_CORE_TREE_PERCLIDICHRECTBOUND_HPP
-#include <armadillo>
+#include <mlpack/core.h>
namespace mlpack {
namespace bound {
Modified: mlpack/trunk/src/mlpack/core/utilities/save_restore_utility.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/utilities/save_restore_utility.hpp 2011-10-29 01:51:10 UTC (rev 10063)
+++ mlpack/trunk/src/mlpack/core/utilities/save_restore_utility.hpp 2011-10-29 01:56:24 UTC (rev 10064)
@@ -20,7 +20,7 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
-#include <armadillo>
+#include <mlpack/core.h>
#include <boost/tokenizer.hpp>
namespace mlpack {
More information about the mlpack-svn
mailing list