[mlpack-svn] r15392 - mlpack/trunk/src/mlpack/core/data

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

Author: rcurtin
Date: Wed Jul  3 11:21:06 2013
New Revision: 15392

Log:
Change label type to arma::Col<size_t> not arma::uvec.


Modified:
   mlpack/trunk/src/mlpack/core/data/normalize_labels.hpp
   mlpack/trunk/src/mlpack/core/data/normalize_labels_impl.hpp

Modified: mlpack/trunk/src/mlpack/core/data/normalize_labels.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/data/normalize_labels.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/data/normalize_labels.hpp	Wed Jul  3 11:21:06 2013
@@ -26,7 +26,7 @@
  */
 template<typename eT>
 void NormalizeLabels(const arma::Col<eT>& labelsIn,
-                     arma::uvec& labels,
+                     arma::Col<size_t>& labels,
                      arma::Col<eT>& mapping);
 
 /**
@@ -38,7 +38,7 @@
  * @param labelsOut Vector to store new labels in.
  */
 template<typename eT>
-void RevertLabels(const arma::uvec& labels,
+void RevertLabels(const arma::Col<size_t>& labels,
                   const arma::Col<eT>& mapping,
                   arma::Col<eT>& labelsOut);
 

Modified: mlpack/trunk/src/mlpack/core/data/normalize_labels_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/data/normalize_labels_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/data/normalize_labels_impl.hpp	Wed Jul  3 11:21:06 2013
@@ -25,7 +25,7 @@
  */
 template<typename eT>
 void NormalizeLabels(const arma::Col<eT>& labelsIn,
-                     arma::uvec& labels,
+                     arma::Col<size_t>& labels,
                      arma::Col<eT>& mapping)
 {
   // Loop over the input labels, and develop the mapping.  We'll first naively
@@ -70,7 +70,7 @@
  * @param labelsOut Vector to store new labels in.
  */
 template<typename eT>
-void RevertLabels(const arma::uvec& labels,
+void RevertLabels(const arma::Col<size_t>& labels,
                   const arma::Col<eT>& mapping,
                   arma::Col<eT>& labelsOut)
 {