[mlpack-git] master: Make sure memory is initialized before loading/saving. (6c63405)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Wed Dec 23 11:44:04 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/de9cc4b05069e1fa4793d9355f2f595af5ff45d2...6070527af14296cd99739de6c62666cc5d2a2125
>---------------------------------------------------------------
commit 6c6340578d41787036fa1b1fe5a891c3fad0073e
Author: ryan <ryan at ratml.org>
Date: Fri Oct 2 01:07:09 2015 -0400
Make sure memory is initialized before loading/saving.
>---------------------------------------------------------------
6c6340578d41787036fa1b1fe5a891c3fad0073e
src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp | 3 ++-
src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp | 1 +
src/mlpack/methods/hoeffding_trees/streaming_decision_tree.hpp | 4 ----
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp b/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp
index 6809dd9..e5ff5fb 100644
--- a/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp
+++ b/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp
@@ -24,7 +24,8 @@ HoeffdingNumericSplit<FitnessFunction, ObservationType>::HoeffdingNumericSplit(
samplesSeen(0),
sufficientStatistics(arma::zeros<arma::Mat<size_t>>(numClasses, bins))
{
- // Nothing to do.
+ observations.zeros();
+ labels.zeros();
}
template<typename FitnessFunction, typename ObservationType>
diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp b/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
index e32d251..40a1eca 100644
--- a/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
+++ b/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
@@ -342,6 +342,7 @@ void HoeffdingSplit<
ar & CreateNVP(ownsMappings, "ownsMappings");
ar & CreateNVP(datasetInfo, "datasetInfo");
ar & CreateNVP(majorityClass, "majorityClass");
+ ar & CreateNVP(majorityProbability, "majorityProbability");
// Depending on whether or not we have split yet, we may need to save
// different things.
diff --git a/src/mlpack/methods/hoeffding_trees/streaming_decision_tree.hpp b/src/mlpack/methods/hoeffding_trees/streaming_decision_tree.hpp
index bf2aa43..a05d9b2 100644
--- a/src/mlpack/methods/hoeffding_trees/streaming_decision_tree.hpp
+++ b/src/mlpack/methods/hoeffding_trees/streaming_decision_tree.hpp
@@ -70,14 +70,12 @@ class StreamingDecisionTree
template<typename Archive>
void Serialize(Archive& ar, const unsigned int /* version */)
{
- std::cout << "serialize split\n";
ar & data::CreateNVP(split, "split");
size_t numChildren;
if (Archive::is_saving::value)
numChildren = children.size();
ar & data::CreateNVP(numChildren, "numChildren");
- std::cout << "serialize " << numChildren << " children\n";
if (Archive::is_loading::value)
children.resize(numChildren, StreamingDecisionTree(data::DatasetInfo(), 0,
0));
@@ -86,9 +84,7 @@ class StreamingDecisionTree
{
std::ostringstream name;
name << "child" << i;
- std::cout << "try to deserialize " << name.str() << "\n";
ar & data::CreateNVP(children[i], name.str());
- std::cout << "serialized " << name.str() << "\n";
}
}
More information about the mlpack-git
mailing list