[mlpack-svn] r16865 - in mlpack/trunk/src/mlpack/methods/amf: termination_policies update_rules

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Fri Jul 25 17:23:36 2014
New Revision: 16865

Log:
Patch from Sumedh: fix some uninitialized values.


Modified:
   mlpack/trunk/src/mlpack/methods/amf/termination_policies/complete_incremental_termination.hpp
   mlpack/trunk/src/mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp
   mlpack/trunk/src/mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp
   mlpack/trunk/src/mlpack/methods/amf/update_rules/svd_complete_incremental_learning.hpp

Modified: mlpack/trunk/src/mlpack/methods/amf/termination_policies/complete_incremental_termination.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/amf/termination_policies/complete_incremental_termination.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/amf/termination_policies/complete_incremental_termination.hpp	Fri Jul 25 17:23:36 2014
@@ -1,8 +1,6 @@
 #ifndef COMPLETE_INCREMENTAL_TERMINATION_HPP_INCLUDED
 #define COMPLETE_INCREMENTAL_TERMINATION_HPP_INCLUDED
 
-#include "amf/termination_policies/simple_tolerance_termination.hpp"
-
 namespace mlpack
 {
 namespace amf
@@ -48,6 +46,11 @@
   {
     return iteration;
   }
+  
+  const size_t& MaxIterations()
+  {
+    return t_policy.MaxIterations();
+  }
 
  private:
   TerminationPolicy t_policy;

Modified: mlpack/trunk/src/mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp	Fri Jul 25 17:23:36 2014
@@ -29,6 +29,11 @@
     reverseStepCount = 0;
 
     this->V = &V;
+    
+    c_index = 0;
+    c_indexOld = 0;
+
+    reverseStepCount = 0;
   }
 
   bool IsConverged(arma::mat& W, arma::mat& H)

Modified: mlpack/trunk/src/mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp	Fri Jul 25 17:23:36 2014
@@ -50,6 +50,10 @@
 
     rmse = DBL_MAX;
     rmseOld = DBL_MAX;
+
+    c_index = 0;
+    c_indexOld = 0;
+
     reverseStepCount = 0;
     isCopy = false;
   }

Modified: mlpack/trunk/src/mlpack/methods/amf/update_rules/svd_complete_incremental_learning.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/amf/update_rules/svd_complete_incremental_learning.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/amf/update_rules/svd_complete_incremental_learning.hpp	Fri Jul 25 17:23:36 2014
@@ -2,7 +2,6 @@
 #define SVD_COMPLETE_INCREMENTAL_LEARNING_HPP_INCLUDED
 
 #include <mlpack/core.hpp>
-#include <vector>
 
 namespace mlpack
 {
@@ -21,6 +20,7 @@
 
   void Initialize(const MatType& dataset, const size_t rank)
   {
+    (void)rank;
     n = dataset.n_rows;
     m = dataset.n_cols;
 
@@ -128,6 +128,7 @@
 
   void Initialize(const arma::sp_mat& dataset, const size_t rank)
   {
+    (void)rank;
     n = dataset.n_rows;
     m = dataset.n_cols;
 
@@ -183,6 +184,8 @@
                       const arma::mat& W,
                       arma::mat& H)
   {
+    (void)V;
+  
     arma::mat deltaH(H.n_rows, 1);
     deltaH.zeros();