[GSOC]DatasetMapper & Imputer

src/mlpack/core/data/dataset_info.hpp

@@ -59,7 +59,7 @@ class DatasetMapper
    * @param string String to find/create mapping for.
    * @param dimension Index of the dimension of the string.
    */
-  typename MapPolicy::map_type_t MapString(const std::string& string,
+  typename MapPolicy::mapped_type MapString(const std::string& string,
                                             const size_t dimension);
 
   /**
@@ -81,7 +81,7 @@ class DatasetMapper
    * @param string Mapped string for value.
    * @param dimension Dimension to unmap string from.
    */
-  typename MapPolicy::map_type_t UnmapValue(const std::string& string,
+  typename MapPolicy::mapped_type UnmapValue(const std::string& string,
                                             const size_t dimension);
 
   //! Return the type of a given dimension (numeric or categorical).
@@ -118,7 +118,7 @@ class DatasetMapper
   std::vector<Datatype> types;
 
   // BiMapType definition
-  using BiMapType = boost::bimap<std::string, typename MapPolicy::map_type_t>;
+  using BiMapType = boost::bimap<std::string, typename MapPolicy::mapped_type>;
 
   // Mappings from strings to integers.
   // Map entries will only exist for dimensions that are categorical.

src/mlpack/core/data/dataset_info_impl.hpp

@@ -25,7 +25,7 @@ inline DatasetMapper<MapPolicy>::DatasetMapper(const size_t dimensionality) :
 // When we want to insert value into the map,
 // we could use the policy to map the string
 template<typename MapPolicy>
-inline typename MapPolicy::map_type_t DatasetMapper<MapPolicy>::MapString(
+inline typename MapPolicy::mapped_type DatasetMapper<MapPolicy>::MapString(
                                                     const std::string& string,
                                                     const size_t dimension)
 {
@@ -52,7 +52,7 @@ inline const std::string& DatasetMapper<MapPolicy>::UnmapString(
 
 // Return the value corresponding to a string in a given dimension.
 template<typename MapPolicy>
-inline typename MapPolicy::map_type_t DatasetMapper<MapPolicy>::UnmapValue(
+inline typename MapPolicy::mapped_type DatasetMapper<MapPolicy>::UnmapValue(
                                                     const std::string& string,
                                                     const size_t dimension)
 {

src/mlpack/core/data/map_policies/CMakeLists.txt

@@ -1,8 +1,8 @@
 # Define the files we need to compile
 # Anything not in this list will not be compiled into mlpack.
 set(SOURCES
-  increment__policy.hpp
-  missing__policy.hpp
+  increment_policy.hpp
+  missing_policy.hpp
 )
 
 # Add directory name to sources.

src/mlpack/core/data/map_policies/datatype.hpp

@@ -0,0 +1,30 @@
+/**
+ * @file missing_policy.hpp
+ * @author Keon Kim
+ *
+ */
+#ifndef MLPACK_CORE_DATA_MAP_POLICIES_DATATYPE_HPP
+#define MLPACK_CORE_DATA_MAP_POLICIES_DATATYPE_HPP
+
+#include <mlpack/core.hpp>
+
+namespace mlpack {
+namespace data {
+
+/**
+ * The Datatype enum specifies the types of data mlpack algorithms can use.
+ * The vast majority of mlpack algorithms can only use numeric data (i.e.
+ * float/double/etc.), but some algorithms can use categorical data, specified
+ * via this Datatype enum and the DatasetMapper class.
+ */
+enum Datatype : bool /* [> bool is all the precision we need for two types <] */
+{
+  numeric = 0,
+  categorical = 1
+};
+
+
+} // namespace data
+} // namespace mlpack
+
+#endif

src/mlpack/core/data/map_policies/increment_policy.hpp

@@ -10,31 +10,24 @@
 #include <mlpack/core.hpp>
 #include <unordered_map>
 #include <boost/bimap.hpp>
-
+#include <mlpack/core/data/map_policies/datatype.hpp>
 
 using namespace std;
 
 namespace mlpack {
 namespace data {
 
-enum Datatype : bool /* bool is all the precision we need for two types */
-{
-  numeric = 0,
-  categorical = 1
-};
-
-
 /**
  * This class is used to map strings to incrementing unsigned integers (size_t).
  * First string to be mapped will be mapped to 0, next to 1 and so on.
  */
 class IncrementPolicy
 {
  public:
-  typedef size_t map_type_t;
+  typedef size_t mapped_type;
 
   template <typename MapType>
-  map_type_t MapString(MapType& maps,
+  mapped_type MapString(MapType& maps,
                        std::vector<Datatype>& types,
                        const std::string& string,
                        const size_t dimension)

src/mlpack/core/data/map_policies/missing_policy.hpp

@@ -10,31 +10,24 @@
 #include <mlpack/core.hpp>
 #include <unordered_map>
 #include <boost/bimap.hpp>
+#include <mlpack/core/data/map_policies/datatype.hpp>
 
 
 using namespace std;
 
 namespace mlpack {
 namespace data {
 
-// TODO: move this to somewhere else so that it can be reused.
-enum Datatype : bool /* bool is all the precision we need for two types */
-{
-  numeric = 0,
-  categorical = 1
-};
-
-
 /**
  * Same as increment map policy so far.
  */
 class MissingPolicy
 {
  public:
-  typedef size_t map_type_t;
+  typedef size_t mapped_type;
 
   template <typename MapType>
-  map_type_t MapString(MapType& maps,
+  mapped_type MapString(MapType& maps,
                        std::vector<Datatype>& types,
                        const std::string& string,
                        const size_t dimension)