[mlpack-git] master: Merge branch 'ip' of https://github.com/stephentu/mlpack into stephentu-ip (3564151)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:14:57 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit 356415177c8a5e380465cf468d0bd5c414ee1c4a
Merge: c321d54 73da878
Author: Ryan Curtin <ryan at ratml.org>
Date: Mon Feb 2 11:03:38 2015 -0500
Merge branch 'ip' of https://github.com/stephentu/mlpack into stephentu-ip
>---------------------------------------------------------------
356415177c8a5e380465cf468d0bd5c414ee1c4a
src/mlpack/core/math/CMakeLists.txt | 1 +
src/mlpack/core/math/lin_alg.cpp | 87 +++
src/mlpack/core/math/lin_alg.hpp | 46 ++
src/mlpack/core/math/lin_alg_impl.hpp | 23 +
src/mlpack/core/optimizers/CMakeLists.txt | 2 +-
src/mlpack/core/optimizers/lrsdp/CMakeLists.txt | 13 -
.../core/optimizers/lrsdp/lrsdp_function.cpp | 193 -------
.../core/optimizers/lrsdp/lrsdp_function.hpp | 166 ------
.../core/optimizers/{sgd => sdp}/CMakeLists.txt | 12 +-
.../core/optimizers/{lrsdp => sdp}/lrsdp.hpp | 50 +-
src/mlpack/core/optimizers/sdp/lrsdp_function.hpp | 124 ++++
.../core/optimizers/sdp/lrsdp_function_impl.hpp | 226 ++++++++
.../{lrsdp/lrsdp.cpp => sdp/lrsdp_impl.hpp} | 26 +-
src/mlpack/core/optimizers/sdp/primal_dual.hpp | 133 +++++
.../core/optimizers/sdp/primal_dual_impl.hpp | 455 +++++++++++++++
src/mlpack/core/optimizers/sdp/sdp.hpp | 116 ++++
src/mlpack/core/optimizers/sdp/sdp_impl.hpp | 71 +++
.../matrix_completion/matrix_completion.cpp | 2 +-
.../matrix_completion/matrix_completion.hpp | 9 +-
src/mlpack/methods/mvu/mvu.cpp | 4 +-
src/mlpack/tests/CMakeLists.txt | 1 +
src/mlpack/tests/data/r10.txt | 10 +
src/mlpack/tests/lin_alg_test.cpp | 99 ++++
src/mlpack/tests/lrsdp_test.cpp | 24 +-
src/mlpack/tests/sdp_primal_dual_test.cpp | 622 +++++++++++++++++++++
src/mlpack/tests/to_string_test.cpp | 4 +-
26 files changed, 2087 insertions(+), 432 deletions(-)
diff --cc src/mlpack/core/optimizers/sdp/lrsdp_impl.hpp
index cff6d0c,f3b1c35..1bb4c1b
--- a/src/mlpack/core/optimizers/sdp/lrsdp_impl.hpp
+++ b/src/mlpack/core/optimizers/sdp/lrsdp_impl.hpp
@@@ -18,9 -21,10 +21,10 @@@ LRSDP<SDPType>::LRSDP(const size_t numS
augLag(function)
{ }
- double LRSDP::Optimize(arma::mat& coordinates)
+ template <typename SDPType>
+ double LRSDP<SDPType>::Optimize(arma::mat& coordinates)
{
- augLag.Sigma() = 20;
+ augLag.Sigma() = 10;
augLag.Optimize(coordinates, 1000);
return augLag.Function().Evaluate(coordinates);
More information about the mlpack-git
mailing list