[mlpack-git] master: minor cleanup of comments (d412841)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:13:04 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit d412841cd39c414749602bdbccd136aa74098ffc
Author: Stephen Tu <tu.stephenl at gmail.com>
Date: Fri Jan 16 13:54:19 2015 -0800
minor cleanup of comments
>---------------------------------------------------------------
d412841cd39c414749602bdbccd136aa74098ffc
src/mlpack/core/optimizers/sdp/primal_dual.cpp | 33 --------------------------
1 file changed, 33 deletions(-)
diff --git a/src/mlpack/core/optimizers/sdp/primal_dual.cpp b/src/mlpack/core/optimizers/sdp/primal_dual.cpp
index 32ba4f4..8a1ea73 100644
--- a/src/mlpack/core/optimizers/sdp/primal_dual.cpp
+++ b/src/mlpack/core/optimizers/sdp/primal_dual.cpp
@@ -174,33 +174,18 @@ PrimalDualSolver::Optimize(arma::mat& X,
rp(arma::span(sdp.NumSparseConstraints(), sdp.NumConstraints() - 1)) =
sdp.DenseB() - Adense * sx;
- //std::cout << "rp" << std::endl;
- //std::cout << rp << std::endl;
-
rd = - sz - Asparse.t() * ysparse - Adense.t() * ydense;
if (sdp.HasSparseObjective())
rd += scsparse;
if (sdp.HasDenseObjective())
rd += scdense;
- //std::cout << "rd" << std::endl;
- //std::cout << rd << std::endl;
-
Rc = mu*arma::eye<arma::mat>(n, n) - 0.5*(X*Z + Z*X);
math::Svec(Rc, rc);
- //std::cout << "rc" << std::endl;
- //std::cout << rc << std::endl;
-
math::SymKronId(Z, E);
math::SymKronId(X, F);
- //std::cout << "E" << std::endl;
- //std::cout << E << std::endl;
-
- //std::cout << "F" << std::endl;
- //std::cout << F << std::endl;
-
for (size_t i = 0; i < sdp.NumSparseConstraints(); i++)
{
SolveLyapunov(Gk, Z, X * sdp.SparseA()[i] + sdp.SparseA()[i] * X);
@@ -208,9 +193,6 @@ PrimalDualSolver::Optimize(arma::mat& X,
Einv_F_AsparseT.col(i) = gk;
}
- //std::cout << "Einv_F_AsparseT" << std::endl;
- //std::cout << Einv_F_AsparseT << std::endl;
-
for (size_t i = 0; i < sdp.NumDenseConstraints(); i++)
{
SolveLyapunov(Gk, Z, X * sdp.DenseA()[i] + sdp.DenseA()[i] * X);
@@ -251,9 +233,6 @@ PrimalDualSolver::Optimize(arma::mat& X,
Adense * Einv_F_AdenseT;
}
- //std::cout << "M" << std::endl;
- //std::cout << M << std::endl;
-
math::Smat(F * rd - rc, Frd_rc_Mat);
SolveLyapunov(Einv_Frd_rc_Mat, Z, 2. * Frd_rc_Mat);
math::Svec(Einv_Frd_rc_Mat, Einv_Frd_rc);
@@ -265,9 +244,6 @@ PrimalDualSolver::Optimize(arma::mat& X,
rhs(arma::span(sdp.NumSparseConstraints(), sdp.NumConstraints() - 1)) += Adense * Einv_Frd_rc;
// TODO(stephentu): use a more efficient method (e.g. LU decomposition)
- //std::cout << "rhs" << std::endl;
- //std::cout << rhs << std::endl;
-
if (!arma::solve(dy, M, rhs))
Log::Fatal << "PrimalDualSolver::Optimize(): Could not solve KKT system" << std::endl;
@@ -275,22 +251,13 @@ PrimalDualSolver::Optimize(arma::mat& X,
dysparse = dy(arma::span(0, sdp.NumSparseConstraints() - 1));
if (sdp.NumDenseConstraints())
dydense = dy(arma::span(sdp.NumSparseConstraints(), sdp.NumConstraints() - 1));
- //std::cout << "dy" << std::endl;
- //std::cout << dy << std::endl;
math::Smat(F * (rd - Asparse.t() * dysparse - Adense.t() * dydense) - rc, Frd_ATdy_rc_Mat);
SolveLyapunov(Einv_Frd_ATdy_rc_Mat, Z, 2. * Frd_ATdy_rc_Mat);
math::Svec(Einv_Frd_ATdy_rc_Mat, Einv_Frd_ATdy_rc);
dsx = -Einv_Frd_ATdy_rc;
-
- //std::cout << "dsx" << std::endl;
- //std::cout << dsx << std::endl;
-
dsz = rd - Asparse.t() * dysparse - Adense.t() * dydense;
- //std::cout << "dsz" << std::endl;
- //std::cout << dsz << std::endl;
-
math::Smat(dsx, dX);
math::Smat(dsz, dZ);
More information about the mlpack-git
mailing list