[mlpack-git] master: Initialize variables more nicely. (bec1b58)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Nov 25 14:18:04 EST 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/4f97fdfb7e158025283c2652084af670bc6e2d76...bec1b581e1738438f58503cbbba2844ef1ea6a8a

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

commit bec1b581e1738438f58503cbbba2844ef1ea6a8a
Author: Ryan Cirtin <ryan at ratml.org>
Date:   Wed Nov 25 14:17:42 2015 -0500

    Initialize variables more nicely.


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

bec1b581e1738438f58503cbbba2844ef1ea6a8a
 src/mlpack/methods/det/dtree.cpp | 43 ++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/mlpack/methods/det/dtree.cpp b/src/mlpack/methods/det/dtree.cpp
index 16b0a15..39ae88b 100644
--- a/src/mlpack/methods/det/dtree.cpp
+++ b/src/mlpack/methods/det/dtree.cpp
@@ -15,9 +15,16 @@ using namespace det;
 DTree::DTree() :
     start(0),
     end(0),
+    splitDim(size_t(-1)),
+    splitValue(DBL_MAX),
     logNegError(-DBL_MAX),
+    subtreeLeavesLogNegError(-DBL_MAX),
+    subtreeLeaves(0),
     root(true),
+    ratio(1.0),
+    logVolume(-DBL_MAX),
     bucketTag(-1),
+    alphaUpper(0.0),
     left(NULL),
     right(NULL)
 { /* Nothing to do. */ }
@@ -31,9 +38,16 @@ DTree::DTree(const arma::vec& maxVals,
     end(totalPoints),
     maxVals(maxVals),
     minVals(minVals),
+    splitDim(size_t(-1)),
+    splitValue(DBL_MAX),
     logNegError(LogNegativeError(totalPoints)),
+    subtreeLeavesLogNegError(-DBL_MAX),
+    subtreeLeaves(0),
     root(true),
+    ratio(1.0),
+    logVolume(-DBL_MAX),
     bucketTag(-1),
+    alphaUpper(0.0),
     left(NULL),
     right(NULL)
 { /* Nothing to do. */ }
@@ -41,12 +55,18 @@ DTree::DTree(const arma::vec& maxVals,
 DTree::DTree(arma::mat& data) :
     start(0),
     end(data.n_cols),
+    splitDim(size_t(-1)),
+    splitValue(DBL_MAX),
+    subtreeLeavesLogNegError(-DBL_MAX),
+    subtreeLeaves(0),
+    root(true),
+    ratio(1.0),
+    logVolume(-DBL_MAX),
+    bucketTag(-1),
+    alphaUpper(0.0),
     left(NULL),
     right(NULL)
 {
-  maxVals.set_size(data.n_rows);
-  minVals.set_size(data.n_rows);
-
   // Initialize to first column; values will be overwritten if necessary.
   maxVals = data.col(0);
   minVals = data.col(0);
@@ -64,9 +84,6 @@ DTree::DTree(arma::mat& data) :
   }
 
   logNegError = LogNegativeError(data.n_cols);
-
-  bucketTag = -1;
-  root = true;
 }
 
 
@@ -80,9 +97,16 @@ DTree::DTree(const arma::vec& maxVals,
     end(end),
     maxVals(maxVals),
     minVals(minVals),
+    splitDim(size_t(-1)),
+    splitValue(DBL_MAX),
     logNegError(logNegError),
+    subtreeLeavesLogNegError(-DBL_MAX),
+    subtreeLeaves(0),
     root(false),
+    ratio(1.0),
+    logVolume(-DBL_MAX),
     bucketTag(-1),
+    alphaUpper(0.0),
     left(NULL),
     right(NULL)
 { /* Nothing to do. */ }
@@ -96,9 +120,16 @@ DTree::DTree(const arma::vec& maxVals,
     end(end),
     maxVals(maxVals),
     minVals(minVals),
+    splitDim(size_t(-1)),
+    splitValue(DBL_MAX),
     logNegError(LogNegativeError(totalPoints)),
+    subtreeLeavesLogNegError(-DBL_MAX),
+    subtreeLeaves(0),
     root(false),
+    ratio(1.0),
+    logVolume(-DBL_MAX),
     bucketTag(-1),
+    alphaUpper(0.0),
     left(NULL),
     right(NULL)
 { /* Nothing to do. */ }



More information about the mlpack-git mailing list