[mlpack-git] master: fix compile errors (af7bb6f)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:08:30 EST 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

>---------------------------------------------------------------

commit af7bb6f370b2cf3a6212b6ddff0908de256abb57
Author: Stephen Tu <tu.stephenl at gmail.com>
Date:   Tue Dec 30 14:18:57 2014 -0800

    fix compile errors


>---------------------------------------------------------------

af7bb6f370b2cf3a6212b6ddff0908de256abb57
 src/mlpack/core/optimizers/lrsdp/lrsdp_function.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mlpack/core/optimizers/lrsdp/lrsdp_function.cpp b/src/mlpack/core/optimizers/lrsdp/lrsdp_function.cpp
index 785c27e..064b8af 100644
--- a/src/mlpack/core/optimizers/lrsdp/lrsdp_function.cpp
+++ b/src/mlpack/core/optimizers/lrsdp/lrsdp_function.cpp
@@ -16,7 +16,7 @@ LRSDPFunction::LRSDPFunction(const size_t numSparseConstraints,
                              const size_t numDenseConstraints,
                              const arma::mat& initialPoint):
     sparseC(initialPoint.n_rows, initialPoint.n_rows),
-    denseC(initialPoint.n_rows, initialPoint.n_rows, arma::fill::zeros),
+    denseC(initialPoint.n_rows, initialPoint.n_rows),
     hasModifiedSparseObjective(false),
     hasModifiedDenseObjective(false),
     sparseA(numSparseConstraints),
@@ -25,8 +25,9 @@ LRSDPFunction::LRSDPFunction(const size_t numSparseConstraints,
     denseB(numDenseConstraints),
     initialPoint(initialPoint)
 {
+  denseC.zeros();
   if (initialPoint.n_rows < initialPoint.n_cols)
-    throw invalid_argument("initialPoint n_cols > n_rows");
+    Log::Warn << "initialPoint n_cols > n_rows" << endl;
 }
 
 double LRSDPFunction::Evaluate(const arma::mat& coordinates) const
@@ -160,7 +161,8 @@ void AugLagrangianFunction<LRSDPFunction>::Gradient(
   // S' = C - sum_{i = 1}^{m} y'_i A_i
   // y'_i = y_i - sigma * (Trace(A_i * (R R^T)) - b_i)
   const arma::mat rrt = coordinates * trans(coordinates);
-  arma::mat s(function.n(), function.n(), arma::fill::zeros);
+  arma::mat s(function.n(), function.n());
+  s.zeros();
 
   if (function.hasSparseObjective())
     s += function.SparseC();



More information about the mlpack-git mailing list