[mlpack-svn] r15886 - mlpack/trunk/src/mlpack/methods/cf

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

Author: rcurtin
Date: Mon Sep 30 23:54:05 2013
New Revision: 15886

Log:
Remove Query() function as it is only used once; inline it into
GetRecommendations().


Modified:
   mlpack/trunk/src/mlpack/methods/cf/cf.cpp
   mlpack/trunk/src/mlpack/methods/cf/cf.hpp

Modified: mlpack/trunk/src/mlpack/methods/cf/cf.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/cf/cf.cpp	(original)
+++ mlpack/trunk/src/mlpack/methods/cf/cf.cpp	Mon Sep 30 23:54:05 2013
@@ -109,56 +109,9 @@
   // Generate new table by multiplying approximate values.
   rating = w * h;
 
-  // Query-dependent operations.
-  Query(recommendations,users);
-}
-
-void CF::GetRecommendations(arma::Mat<size_t>& recommendations,
-                            arma::Col<size_t>& users,size_t num)
-{
-  //Setting Number of Recommendations
-  NumRecs(num);
-  //Calling Base Function for Recommendations
-  GetRecommendations(recommendations,users);
-}
-
-void CF::GetRecommendations(arma::Mat<size_t>& recommendations,
-                            arma::Col<size_t>& users,size_t num,size_t s)
-{
-  //Setting number of users that should be used for calculating
-  //neighbours
-  NumUsersForSimilarity(s);
-  //Setting Number of Recommendations
-  NumRecs(num);
-  //Calling Base Function for Recommendations
-  GetRecommendations(recommendations,users,num);
-}
-
-void CF::CleanData()
-{
-  // Generate list of locations for batch insert constructor for sparse
-  // matrices.
-  arma::umat locations(2, data.n_cols);
-  arma::vec values(data.n_cols);
-  for (size_t i = 0; i < data.n_cols; ++i)
-  {
-    // We have to transpose it because items are rows, and users are columns.
-    locations(1, i) = ((arma::uword) data(0, i)) - 1;
-    locations(0, i) = ((arma::uword) data(1, i)) - 1;
-    values(i) = data(2, i);
-  }
-
-  // Find maximum user and item IDs.
-  const size_t maxItemID = (size_t) max(locations.row(0)) + 1;
-  const size_t maxUserID = (size_t) max(locations.row(1)) + 1;
-
-  // Fill sparse matrix.
-  cleanedData = arma::sp_mat(locations, values, maxItemID, maxUserID);
-}
+  // Now, we will use the decomposed w and h matrices to estimate what the user
+  // would have rated items as, and then pick the best items.
 
-void CF::Query(arma::Mat<size_t>& recommendations,
-               arma::Col<size_t>& users)
-{
   // Temporarily store feature vector of queried users.
   arma::mat query(rating.n_rows, users.n_elem);
 
@@ -232,6 +185,49 @@
   }
 }
 
+void CF::GetRecommendations(arma::Mat<size_t>& recommendations,
+                            arma::Col<size_t>& users,size_t num)
+{
+  //Setting Number of Recommendations
+  NumRecs(num);
+  //Calling Base Function for Recommendations
+  GetRecommendations(recommendations,users);
+}
+
+void CF::GetRecommendations(arma::Mat<size_t>& recommendations,
+                            arma::Col<size_t>& users,size_t num,size_t s)
+{
+  //Setting number of users that should be used for calculating
+  //neighbours
+  NumUsersForSimilarity(s);
+  //Setting Number of Recommendations
+  NumRecs(num);
+  //Calling Base Function for Recommendations
+  GetRecommendations(recommendations,users,num);
+}
+
+void CF::CleanData()
+{
+  // Generate list of locations for batch insert constructor for sparse
+  // matrices.
+  arma::umat locations(2, data.n_cols);
+  arma::vec values(data.n_cols);
+  for (size_t i = 0; i < data.n_cols; ++i)
+  {
+    // We have to transpose it because items are rows, and users are columns.
+    locations(1, i) = ((arma::uword) data(0, i)) - 1;
+    locations(0, i) = ((arma::uword) data(1, i)) - 1;
+    values(i) = data(2, i);
+  }
+
+  // Find maximum user and item IDs.
+  const size_t maxItemID = (size_t) max(locations.row(0)) + 1;
+  const size_t maxUserID = (size_t) max(locations.row(1)) + 1;
+
+  // Fill sparse matrix.
+  cleanedData = arma::sp_mat(locations, values, maxItemID, maxUserID);
+}
+
 /**
  * Helper function to insert a point into the recommendation matrices.
  *

Modified: mlpack/trunk/src/mlpack/methods/cf/cf.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/cf/cf.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/cf/cf.hpp	Mon Sep 30 23:54:05 2013
@@ -194,14 +194,6 @@
   void CleanData();
 
   /**
-   * Queries the obtained rating matrix.
-   *
-   * @param recommendations Matrix to save recommendations
-   * @param users Users for which recommendations are to be generated
-   */
-  void Query(arma::Mat<size_t>& recommendations,arma::Col<size_t>& users);
-
-  /**
    * Helper function to insert a point into the recommendation matrices.
    *
    * @param queryIndex Index of point whose recommendations we are inserting