[mlpack-git] master: use builtin diagmat (f1beedd)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:14:32 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit f1beedd83736ecf4fab3dffd2d07340a0023e9af
Author: Stephen Tu <tu.stephenl at gmail.com>
Date: Wed Jan 28 18:27:44 2015 -0800
use builtin diagmat
>---------------------------------------------------------------
f1beedd83736ecf4fab3dffd2d07340a0023e9af
src/mlpack/tests/sdp_primal_dual_test.cpp | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/src/mlpack/tests/sdp_primal_dual_test.cpp b/src/mlpack/tests/sdp_primal_dual_test.cpp
index 8b0d77c..9e6cab5 100644
--- a/src/mlpack/tests/sdp_primal_dual_test.cpp
+++ b/src/mlpack/tests/sdp_primal_dual_test.cpp
@@ -149,19 +149,6 @@ ConstructLovaszThetaSDPFromGraph(const UndirectedGraph& g)
return sdp;
}
-// TODO(stephentu): does arma have a builtin way to do this?
-static inline arma::mat
-Diag(const arma::vec& diag)
-{
- arma::mat ret;
- ret.zeros(diag.n_elem, diag.n_elem);
- for (size_t i = 0; i < diag.n_elem; i++)
- {
- ret(i, i) = diag(i);
- }
- return ret;
-}
-
static inline SDP<arma::sp_mat>
ConstructMaxCutSDPFromLaplacian(const std::string& laplacianFilename)
{
@@ -236,7 +223,7 @@ static void SolveMaxCutFeasibleSDP(const SDP<arma::sp_mat>& sdp)
// strictly feasible starting point
X0.eye(sdp.N(), sdp.N());
ysparse0 = -1.1 * arma::vec(arma::sum(arma::abs(sdp.C()), 0).t());
- Z0 = -Diag(ysparse0) + sdp.C();
+ Z0 = -arma::diagmat(ysparse0) + sdp.C();
PrimalDualSolver<SDP<arma::sp_mat>> solver(sdp, X0, ysparse0, ydense0, Z0);
More information about the mlpack-git
mailing list