[mlpack-git] master: Merge remote-tracking branch 'mlpack/master' into ip (e7e1721)

[gitdub at big.cc.gt.atl.ga.us]

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

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

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

commit e7e17219b81c5c4fef7798b6fafc4aab712ad41f
Merge: 736f62c 1677a5f
Author: Stephen Tu <stephent at berkeley.edu>
Date:   Wed Jan 21 18:11:55 2015 -0800

    Merge remote-tracking branch 'mlpack/master' into ip
    
    Conflicts:
    	src/mlpack/core/optimizers/sdp/lrsdp_function_impl.hpp


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

e7e17219b81c5c4fef7798b6fafc4aab712ad41f
 HISTORY.md                                         |    6 +
 src/mlpack/core/dists/discrete_distribution.hpp    |   18 +-
 src/mlpack/core/dists/gaussian_distribution.cpp    |   29 +-
 src/mlpack/core/dists/gaussian_distribution.hpp    |   46 +-
 src/mlpack/core/dists/laplace_distribution.cpp     |    8 +-
 src/mlpack/core/dists/laplace_distribution.hpp     |   14 +-
 src/mlpack/core/dists/regression_distribution.hpp  |   15 +-
 .../aug_lagrangian_test_functions.cpp              |    4 +-
 .../core/optimizers/sdp/lrsdp_function_impl.hpp    |   10 +-
 src/mlpack/methods/ann/ffnn.hpp                    |   98 +-
 ...n_layer.hpp => binary_classification_layer.hpp} |   54 +-
 .../ann/layer/multiclass_classification_layer.hpp  |   15 +-
 src/mlpack/methods/ann/trainer/trainer.hpp         |   51 +-
 src/mlpack/prereqs.hpp                             |    2 +-
 src/mlpack/tests/adaboost_test.cpp                 |   93 +-
 src/mlpack/tests/data/nonlinsepdata.txt            |  200 ----
 src/mlpack/tests/data/nonlinsepdata_labels.txt     |  200 ----
 src/mlpack/tests/data/test_labels_nonlinsep.txt    |  600 ++++++++++
 src/mlpack/tests/data/test_nonlinsep.txt           |  600 ++++++++++
 src/mlpack/tests/data/train_labels_nonlinsep.txt   | 1200 ++++++++++++++++++++
 src/mlpack/tests/data/train_nonlinsep.txt          | 1200 ++++++++++++++++++++
 src/mlpack/tests/data/vc2.txt                      |  517 ++++-----
 src/mlpack/tests/data/vc2_labels.txt               |  103 --
 src/mlpack/tests/data/vc2_test.txt                 |   67 ++
 .../{iris_test_labels.csv => vc2_test_labels.txt}  |   26 +-
 src/mlpack/tests/feedforward_network_test.cpp      |  339 ++++++
 src/mlpack/tests/sparse_coding_test.cpp            |    7 -
 27 files changed, 4538 insertions(+), 984 deletions(-)

diff --cc src/mlpack/core/optimizers/sdp/lrsdp_function_impl.hpp
index 06252ac,686ab1a..674eac9
--- a/src/mlpack/core/optimizers/sdp/lrsdp_function_impl.hpp
+++ b/src/mlpack/core/optimizers/sdp/lrsdp_function_impl.hpp
@@@ -60,17 -55,16 +60,17 @@@ double LRSDPFunction<SDPType>::Evaluate
  {
    const arma::mat rrt = coordinates * trans(coordinates);
    if (index < NumSparseConstraints())
-     return trace(SparseA()[index] * rrt) - SparseB()[index];
 -    return accu(sparseA[index] % rrt) - sparseB[index];
++    return accu(SparseA()[index] % rrt) - SparseB()[index];
    const size_t index1 = index - NumSparseConstraints();
-   return trace(DenseA()[index1] * rrt) - DenseB()[index1];
 -  return accu(denseA[index1] % rrt) - denseB[index1];
++  return accu(DenseA()[index1] % rrt) - DenseB()[index1];
  }
  
 -void LRSDPFunction::GradientConstraint(const size_t /* index */,
 -                               const arma::mat& /* coordinates */,
 -                               arma::mat& /* gradient */) const
 +template <typename SDPType>
 +void LRSDPFunction<SDPType>::GradientConstraint(const size_t /* index */,
 +                                                const arma::mat& /* coordinates */,
 +                                                arma::mat& /* gradient */) const
  {
 -  Log::Fatal << "LRSDP::GradientConstraint() not implemented for arbitrary "
 +  Log::Fatal << "LRSDPFunction::GradientConstraint() not implemented for arbitrary "
        << "optimizers!" << std::endl;
  }
  
@@@ -150,7 -144,11 +150,7 @@@ EvaluateImpl(const LRSDPFunction<SDPTyp
    //
    // Similarly for the constraints, taking A*R first should be more efficient
    const arma::mat rrt = coordinates * trans(coordinates);
-   double objective = trace(function.C() * rrt);
 -  double objective = 0.;
 -  if (function.hasSparseObjective())
 -    objective += accu(function.SparseC() % rrt);
 -  if (function.hasDenseObjective())
 -    objective += accu(function.DenseC() % rrt);
++  double objective = accu(function.C() % rrt);
  
    // Now each constraint.
    UpdateObjective(objective, rrt, function.SparseA(), function.SparseB(),