[mlpack-svn] master: remove superfluous inline (1c95375)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Wed Dec 31 16:02:10 EST 2014
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/8c13d5c6d16fadd1fe4dfb2230adfaa0268e95dd...5c67a7f75ba446321f794b63b861dc35f37dcd11
>---------------------------------------------------------------
commit 1c95375b34d90bf1cd4ae9ce0aefa7941ee98718
Author: Stephen Tu <stephent at berkeley.edu>
Date: Tue Dec 23 10:00:34 2014 +0800
remove superfluous inline
>---------------------------------------------------------------
1c95375b34d90bf1cd4ae9ce0aefa7941ee98718
src/mlpack/core/optimizers/lrsdp/lrsdp.hpp | 24 +++++++-------
.../core/optimizers/lrsdp/lrsdp_function.hpp | 38 +++++++++++-----------
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/mlpack/core/optimizers/lrsdp/lrsdp.hpp b/src/mlpack/core/optimizers/lrsdp/lrsdp.hpp
index 81bb779..b34999d 100644
--- a/src/mlpack/core/optimizers/lrsdp/lrsdp.hpp
+++ b/src/mlpack/core/optimizers/lrsdp/lrsdp.hpp
@@ -45,42 +45,42 @@ class LRSDP
double Optimize(arma::mat& coordinates);
//! Return the sparse objective function matrix (C_sparse).
- inline const arma::sp_mat& C_sparse() const { return function.C_sparse(); }
+ const arma::sp_mat& C_sparse() const { return function.C_sparse(); }
//! Modify the sparse objective function matrix (C_sparse).
- inline arma::sp_mat& C_sparse() { return function.C_sparse(); }
+ arma::sp_mat& C_sparse() { return function.C_sparse(); }
//! Return the dense objective function matrix (C_dense).
- inline const arma::mat& C_dense() const { return function.C_dense(); }
+ const arma::mat& C_dense() const { return function.C_dense(); }
//! Modify the dense objective function matrix (C_dense).
- inline arma::mat& C_dense() { return function.C_dense(); }
+ arma::mat& C_dense() { return function.C_dense(); }
//! Return the vector of sparse A matrices (which correspond to the sparse
// constraints).
- inline const std::vector<arma::sp_mat>& A_sparse() const { return function.A_sparse(); }
+ const std::vector<arma::sp_mat>& A_sparse() const { return function.A_sparse(); }
//! Modify the veector of sparse A matrices (which correspond to the sparse
// constraints).
- inline std::vector<arma::sp_mat>& A_sparse() { return function.A_sparse(); }
+ std::vector<arma::sp_mat>& A_sparse() { return function.A_sparse(); }
//! Return the vector of dense A matrices (which correspond to the dense
// constraints).
- inline const std::vector<arma::mat>& A_dense() const { return function.A_dense(); }
+ const std::vector<arma::mat>& A_dense() const { return function.A_dense(); }
//! Modify the veector of dense A matrices (which correspond to the dense
// constraints).
- inline std::vector<arma::mat>& A_dense() { return function.A_dense(); }
+ std::vector<arma::mat>& A_dense() { return function.A_dense(); }
//! Return the vector of sparse B values.
- inline const arma::vec& B_sparse() const { return function.B_sparse(); }
+ const arma::vec& B_sparse() const { return function.B_sparse(); }
//! Modify the vector of sparse B values.
- inline arma::vec& B_sparse() { return function.B_sparse(); }
+ arma::vec& B_sparse() { return function.B_sparse(); }
//! Return the vector of dense B values.
- inline const arma::vec& B_dense() const { return function.B_dense(); }
+ const arma::vec& B_dense() const { return function.B_dense(); }
//! Modify the vector of dense B values.
- inline arma::vec& B_dense() { return function.B_dense(); }
+ arma::vec& B_dense() { return function.B_dense(); }
//! Return the function to be optimized.
const LRSDPFunction& Function() const { return function; }
diff --git a/src/mlpack/core/optimizers/lrsdp/lrsdp_function.hpp b/src/mlpack/core/optimizers/lrsdp/lrsdp_function.hpp
index 2cf09a3..66a004c 100644
--- a/src/mlpack/core/optimizers/lrsdp/lrsdp_function.hpp
+++ b/src/mlpack/core/optimizers/lrsdp/lrsdp_function.hpp
@@ -57,68 +57,68 @@ class LRSDPFunction
arma::mat& gradient) const;
//! Get the number of sparse constraints in the LRSDP.
- inline size_t NumSparseConstraints() const { return b_sparse.n_elem; }
+ size_t NumSparseConstraints() const { return b_sparse.n_elem; }
//! Get the number of dense constraints in the LRSDP.
- inline size_t NumDenseConstraints() const { return b_dense.n_elem; }
+ size_t NumDenseConstraints() const { return b_dense.n_elem; }
//! Get the total number of constraints in the LRSDP.
- inline size_t NumConstraints() const {
+ size_t NumConstraints() const {
return NumSparseConstraints() + NumDenseConstraints();
}
//! Get the initial point of the LRSDP.
- inline const arma::mat& GetInitialPoint() const { return initialPoint; }
+ const arma::mat& GetInitialPoint() const { return initialPoint; }
- inline size_t n() const { return initialPoint.n_rows; }
+ size_t n() const { return initialPoint.n_rows; }
//! Return the sparse objective function matrix (C_sparse).
- inline const arma::sp_mat& C_sparse() const { return c_sparse; }
+ const arma::sp_mat& C_sparse() const { return c_sparse; }
//! Modify the sparse objective function matrix (C_sparse).
- inline arma::sp_mat& C_sparse() {
+ arma::sp_mat& C_sparse() {
hasModifiedSparseObjective = true;
return c_sparse;
}
//! Return the dense objective function matrix (C_dense).
- inline const arma::mat& C_dense() const { return c_dense; }
+ const arma::mat& C_dense() const { return c_dense; }
//! Modify the dense objective function matrix (C_dense).
- inline arma::mat& C_dense() {
+ arma::mat& C_dense() {
hasModifiedDenseObjective = true;
return c_dense;
}
//! Return the vector of sparse A matrices (which correspond to the sparse
// constraints).
- inline const std::vector<arma::sp_mat>& A_sparse() const { return a_sparse; }
+ const std::vector<arma::sp_mat>& A_sparse() const { return a_sparse; }
//! Modify the veector of sparse A matrices (which correspond to the sparse
// constraints).
- inline std::vector<arma::sp_mat>& A_sparse() { return a_sparse; }
+ std::vector<arma::sp_mat>& A_sparse() { return a_sparse; }
//! Return the vector of dense A matrices (which correspond to the dense
// constraints).
- inline const std::vector<arma::mat>& A_dense() const { return a_dense; }
+ const std::vector<arma::mat>& A_dense() const { return a_dense; }
//! Modify the veector of dense A matrices (which correspond to the dense
// constraints).
- inline std::vector<arma::mat>& A_dense() { return a_dense; }
+ std::vector<arma::mat>& A_dense() { return a_dense; }
//! Return the vector of sparse B values.
- inline const arma::vec& B_sparse() const { return b_sparse; }
+ const arma::vec& B_sparse() const { return b_sparse; }
//! Modify the vector of sparse B values.
- inline arma::vec& B_sparse() { return b_sparse; }
+ arma::vec& B_sparse() { return b_sparse; }
//! Return the vector of dense B values.
- inline const arma::vec& B_dense() const { return b_dense; }
+ const arma::vec& B_dense() const { return b_dense; }
//! Modify the vector of dense B values.
- inline arma::vec& B_dense() { return b_dense; }
+ arma::vec& B_dense() { return b_dense; }
- inline bool hasSparseObjective() const { return hasModifiedSparseObjective; }
+ bool hasSparseObjective() const { return hasModifiedSparseObjective; }
- inline bool hasDenseObjective() const { return hasModifiedDenseObjective; }
+ bool hasDenseObjective() const { return hasModifiedDenseObjective; }
//! Return string representation of object.
std::string ToString() const;
More information about the mlpack-svn
mailing list