[mlpack-git] master: Fix ambiguities and use of at(). (4fadecf)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Dec 23 11:43:15 EST 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/de9cc4b05069e1fa4793d9355f2f595af5ff45d2...6070527af14296cd99739de6c62666cc5d2a2125

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

commit 4fadecf9a054b2b8cbf44d8973b26ae53c9d90b2
Author: ryan <ryan at ratml.org>
Date:   Wed Sep 30 15:49:21 2015 -0400

    Fix ambiguities and use of at().


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

4fadecf9a054b2b8cbf44d8973b26ae53c9d90b2
 src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp b/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
index 558dfb6..e698552 100644
--- a/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
+++ b/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
@@ -23,10 +23,10 @@ HoeffdingSplit<
                   const double successProbability,
                   const size_t maxSamples,
                   std::unordered_map<size_t, std::pair<size_t, size_t>>*
-                      dimensionMappings) :
-    dimensionMappings((dimensionMappings != NULL) ? dimensionMappings :
+                      dimensionMappingsIn) :
+    dimensionMappings((dimensionMappingsIn != NULL) ? dimensionMappingsIn :
         new std::unordered_map<size_t, std::pair<size_t, size_t>>()),
-    ownsMappings(dimensionMappings == NULL),
+    ownsMappings(dimensionMappingsIn == NULL),
     numSamples(0),
     numClasses(numClasses),
     maxSamples(maxSamples),
@@ -45,13 +45,13 @@ HoeffdingSplit<
       {
         categoricalSplits.push_back(
             CategoricalSplitType(datasetInfo.NumMappings(i), numClasses));
-        dimensionMappings->at(i) = std::make_pair(data::Datatype::categorical,
+        (*dimensionMappings)[i] = std::make_pair(data::Datatype::categorical,
             categoricalSplits.size() - 1);
       }
       else
       {
         numericSplits.push_back(NumericSplitType(numClasses));
-        dimensionMappings->at(i) = std::make_pair(data::Datatype::numeric,
+        (*dimensionMappings)[i] = std::make_pair(data::Datatype::numeric,
             numericSplits.size() - 1);
       }
     }



More information about the mlpack-git mailing list