[mlpack-git] master: Switch to residue termination, because it's *much* faster. Maybe to be switched back later, but I doubt it, kind of. (614f7a9)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/f9a6cd53619e4024a8e052b9ddb296af3f7d7dc7...6d2e43d610eb0dac5c3083d78d097c8103a5f207

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

commit 614f7a9e7ad853f4c04f9f33f4aaee9b3b7c4d1d
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Jun 26 17:18:06 2015 -0400

    Switch to residue termination, because it's *much* faster.
    Maybe to be switched back later, but I doubt it, kind of.


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

614f7a9e7ad853f4c04f9f33f4aaee9b3b7c4d1d
 src/mlpack/methods/amf/amf.hpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/mlpack/methods/amf/amf.hpp b/src/mlpack/methods/amf/amf.hpp
index e7631b7..1348ef5 100644
--- a/src/mlpack/methods/amf/amf.hpp
+++ b/src/mlpack/methods/amf/amf.hpp
@@ -147,7 +147,7 @@ typedef amf::AMF<amf::SimpleResidueTermination,
  * @see SVDBatchLearning
  */
 template<class MatType>
-using SVDBatchFactorizer = amf::AMF<amf::SimpleToleranceTermination<MatType>,
+using SVDBatchFactorizer = amf::AMF<amf::SimpleResidueTermination,
                                     amf::RandomInitialization,
                                     amf::SVDBatchLearning>;
 
@@ -160,7 +160,7 @@ using SVDBatchFactorizer = amf::AMF<amf::SimpleToleranceTermination<MatType>,
  * @see SVDIncompleteIncrementalLearning
  */
 template<class MatType>
-using SVDIncompleteIncrementalFactorizer = amf::AMF<amf::SimpleToleranceTermination<MatType>,
+using SVDIncompleteIncrementalFactorizer = amf::AMF<amf::SimpleResidueTermination,
                                                     amf::RandomInitialization,
                                                     amf::SVDIncompleteIncrementalLearning>;
 /**
@@ -172,7 +172,7 @@ using SVDIncompleteIncrementalFactorizer = amf::AMF<amf::SimpleToleranceTerminat
  * @see SVDCompleteIncrementalLearning
  */
 template<class MatType>
-using SVDCompleteIncrementalFactorizer = amf::AMF<amf::SimpleToleranceTermination<MatType>,
+using SVDCompleteIncrementalFactorizer = amf::AMF<amf::SimpleResidueTermination,
                                                   amf::RandomInitialization,
                                                   amf::SVDCompleteIncrementalLearning<MatType> >;
 
@@ -185,7 +185,7 @@ using SVDCompleteIncrementalFactorizer = amf::AMF<amf::SimpleToleranceTerminatio
  *
  * @see SVDBatchLearning
  */
-typedef amf::AMF<amf::SimpleToleranceTermination<arma::sp_mat>,
+typedef amf::AMF<amf::SimpleResidueTermination,
                  amf::RandomInitialization,
                  amf::SVDBatchLearning> SparseSVDBatchFactorizer;
 
@@ -196,7 +196,7 @@ typedef amf::AMF<amf::SimpleToleranceTermination<arma::sp_mat>,
  *
  * @see SVDBatchLearning
  */
-typedef amf::AMF<amf::SimpleToleranceTermination<arma::mat>,
+typedef amf::AMF<amf::SimpleResidueTermination,
                  amf::RandomInitialization,
                  amf::SVDBatchLearning> SVDBatchFactorizer;
 /**
@@ -207,7 +207,7 @@ typedef amf::AMF<amf::SimpleToleranceTermination<arma::mat>,
  *
  * @see SVDIncompleteIncrementalLearning
  */
-typedef amf::AMF<amf::SimpleToleranceTermination<arma::sp_mat>,
+typedef amf::AMF<amf::SimpleResidueTermination,
                  amf::RandomInitialization,
                  amf::SVDIncompleteIncrementalLearning>
         SparseSVDIncompleteIncrementalFactorizer;
@@ -220,7 +220,7 @@ typedef amf::AMF<amf::SimpleToleranceTermination<arma::sp_mat>,
  *
  * @see SVDIncompleteIncrementalLearning
  */
-typedef amf::AMF<amf::SimpleToleranceTermination<arma::mat>,
+typedef amf::AMF<amf::SimpleResidueTermination,
                  amf::RandomInitialization,
                  amf::SVDIncompleteIncrementalLearning>
         SVDIncompleteIncrementalFactorizer;
@@ -233,7 +233,7 @@ typedef amf::AMF<amf::SimpleToleranceTermination<arma::mat>,
  *
  * @see SVDCompleteIncrementalLearning
  */
-typedef amf::AMF<amf::SimpleToleranceTermination<arma::sp_mat>,
+typedef amf::AMF<amf::SimpleResidueTermination,
                  amf::RandomInitialization,
                  amf::SVDCompleteIncrementalLearning<arma::sp_mat> >
         SparseSVDCompleteIncrementalFactorizer;
@@ -246,16 +246,15 @@ typedef amf::AMF<amf::SimpleToleranceTermination<arma::sp_mat>,
  *
  * @see SVDCompleteIncrementalLearning
  */
-typedef amf::AMF<amf::SimpleToleranceTermination<arma::mat>,
+typedef amf::AMF<amf::SimpleResidueTermination,
                  amf::RandomInitialization,
                  amf::SVDCompleteIncrementalLearning<arma::mat> >
         SVDCompleteIncrementalFactorizer;
 
 #endif // #ifdef MLPACK_USE_CXX11
 
-
-}; // namespace amf
-}; // namespace mlpack
+} // namespace amf
+} // namespace mlpack
 
 // Include implementation.
 #include "amf_impl.hpp"