Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
cd53eae
skeletal framework
manishamde Nov 28, 2013
92cedce
basic building blocks for intermediate RDD calculation. untested.
manishamde Dec 2, 2013
8bca1e2
additional code for creating intermediate RDD
manishamde Dec 9, 2013
0012a77
basic stump working
manishamde Dec 10, 2013
03f534c
some more tests
manishamde Dec 10, 2013
dad0afc
decison stump functionality working
manishamde Dec 15, 2013
4798aae
added gain stats class
manishamde Dec 15, 2013
80e8c66
working version of multi-level split calculation
manishamde Dec 16, 2013
b0eb866
added logic to handle leaf nodes
manishamde Dec 16, 2013
98ec8d5
tree building and prediction logic
manishamde Dec 22, 2013
02c595c
added command line parsing
manishamde Dec 22, 2013
733d6dd
fixed tests
manishamde Dec 22, 2013
154aa77
enums for configurations
manishamde Dec 23, 2013
b0e3e76
adding enum for feature type
manishamde Jan 12, 2014
c8f6d60
adding enum for feature type
manishamde Jan 12, 2014
e23c2e5
added regression support
manishamde Jan 19, 2014
53108ed
fixing index for highest bin
manishamde Jan 20, 2014
6df35b9
regression predict logic
manishamde Jan 21, 2014
dbb7ac1
categorical feature support
manishamde Jan 23, 2014
d504eb1
more tests for categorical features
manishamde Jan 23, 2014
6b7de78
minor refactoring and tests
manishamde Jan 26, 2014
b09dc98
minor refactoring
manishamde Jan 26, 2014
c0e522b
updated predict and split threshold logic
manishamde Jan 27, 2014
f067d68
minor cleanup
manishamde Jan 27, 2014
5841c28
unit tests for categorical features
manishamde Jan 27, 2014
0dd7659
basic doc
manishamde Jan 27, 2014
dd0c0d7
minor: some docs
manishamde Jan 27, 2014
9372779
code style: max line lenght <= 100
manishamde Feb 17, 2014
84f85d6
code documentation
manishamde Feb 28, 2014
d3023b3
adding more docs for nested methods
manishamde Mar 6, 2014
63e786b
added multiple train methods for java compatability
manishamde Mar 6, 2014
cd2c2b4
fixing code style based on feedback
manishamde Mar 7, 2014
eb8fcbe
minor code style updates
manishamde Mar 7, 2014
794ff4d
minor improvements to docs and style
manishamde Mar 10, 2014
d1ef4f6
more documentation
manishamde Mar 10, 2014
ad1fc21
incorporated mengxr's code style suggestions
manishamde Mar 11, 2014
62c2562
fixing comment indentation
manishamde Mar 11, 2014
6068356
ensuring num bins is always greater than max number of categories
manishamde Mar 12, 2014
2116360
removing dummy bin calculation for categorical variables
manishamde Mar 12, 2014
632818f
removing threshold for classification predict method
manishamde Mar 13, 2014
ff363a7
binary search for bins and while loop for categorical feature bins
manishamde Mar 17, 2014
4576b64
documentation and for to while loop conversion
manishamde Mar 23, 2014
24500c5
minor style updates
mengxr Mar 23, 2014
c487e6a
Merge pull request #1 from mengxr/dtree
manishamde Mar 23, 2014
f963ef5
making methods private
manishamde Mar 23, 2014
201702f
making some more methods private
manishamde Mar 23, 2014
62dc723
updating javadoc and converting helper methods to package private to …
manishamde Mar 24, 2014
e1dd86f
implementing code style suggestions
manishamde Mar 25, 2014
f536ae9
another pass on code style
mengxr Mar 31, 2014
7d54b4f
Merge pull request #4 from mengxr/dtree
manishamde Mar 31, 2014
1e8c704
remove numBins field in the Strategy class
manishamde Apr 1, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more documentation
  • Loading branch information
manishamde committed Mar 10, 2014
commit d1ef4f68c3b194fc96989860d539d5ffd502877d
60 changes: 39 additions & 21 deletions mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,34 @@ class DecisionTree private(val strategy: Strategy) extends Serializable with Log

//Cache input RDD for speedup during multiple passes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put an extra space after "//".

input.cache()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the current implementation of other algorithms in MLlib, we let users to choose whether the data should be cached or not. How many passes does your algorithm need?

logDebug("algo = " + strategy.algo)

//Finding the splits and the corresponding bins (interval between the splits) using a sample
// of the input data.
val (splits, bins) = DecisionTree.findSplitsBins(input, strategy)
logDebug("numSplits = " + bins(0).length)

//Noting numBins for the input data
strategy.numBins = bins(0).length

//The depth of the decision tree
val maxDepth = strategy.maxDepth

//The max number of nodes possible given the depth of the tree
val maxNumNodes = scala.math.pow(2, maxDepth).toInt - 1
//Initalizing an array to hold filters applied to points for each node
val filters = new Array[List[Filter]](maxNumNodes)
//The filter at the top node is an empty list
filters(0) = List()
//Initializing an array to hold parent impurity calculations for each node
val parentImpurities = new Array[Double](maxNumNodes)
//Dummy value for top node (updated during first split calculation)
//parentImpurities(0) = Double.MinValue
val nodes = new Array[Node](maxNumNodes)

logDebug("algo = " + strategy.algo)

//The main-idea here is to perform level-wise training of the decision tree nodes thus
// reducing the passes over the data from l to log2(l) where l is the total number of nodes.
// Each data sample is checked for validity w.r.t to each node at a given level -- i.e.,
// the sample is only used for the split calculation at the node if the sampled would have
// still survived the filters of the parent nodes.
breakable {
for (level <- 0 until maxDepth) {

Expand All @@ -79,36 +90,41 @@ class DecisionTree private(val strategy: Strategy) extends Serializable with Log
level, filters, splits, bins)

for ((nodeSplitStats, index) <- splitsStatsForLevel.view.zipWithIndex) {

//Extract info for nodes at the current level
extractNodeInfo(nodeSplitStats, level, index, nodes)
//Extract info for nodes at the next lower level
extractInfoForLowerLevels(level, index, maxDepth, nodeSplitStats, parentImpurities,
filters)
logDebug("final best split = " + nodeSplitStats._1)

}
require(scala.math.pow(2, level) == splitsStatsForLevel.length)

//Check whether all the nodes at the current level at leaves
val allLeaf = splitsStatsForLevel.forall(_._2.gain <= 0)
logDebug("all leaf = " + allLeaf)
if (allLeaf) break
if (allLeaf) break //no more tree construction

}
}

//Initialize the top or root node of the tree
val topNode = nodes(0)
//Build the full tree using the node info calculated in the level-wise best split calculations
topNode.build(nodes)

val decisionTreeModel = {
return new DecisionTreeModel(topNode, strategy.algo)
}
return decisionTreeModel
//Return a decision tree model
return new DecisionTreeModel(topNode, strategy.algo)
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove extra blank line.


/**
* Extract the decision tree node information for th given tree level and node index
*/
private def extractNodeInfo(
nodeSplitStats: (Split, InformationGainStats),
level: Int, index: Int,
nodes: Array[Node]) {
level: Int,
index: Int,
nodes: Array[Node])
: Unit = {

val split = nodeSplitStats._1
val stats = nodeSplitStats._2
Expand All @@ -119,35 +135,37 @@ class DecisionTree private(val strategy: Strategy) extends Serializable with Log
nodes(nodeIndex) = node
}

/**
* Extract the decision tree node information for the children of the node
*/
private def extractInfoForLowerLevels(
level: Int,
index: Int,
maxDepth: Int,
nodeSplitStats: (Split, InformationGainStats),
parentImpurities: Array[Double],
filters: Array[List[Filter]]) {
filters: Array[List[Filter]])
: Unit = {

// 0 corresponds to the left child node and 1 corresponds to the right child node.
for (i <- 0 to 1) {

//Calculating the index of the node from the node level and the index at the current level
val nodeIndex = scala.math.pow(2, level + 1).toInt - 1 + 2 * index + i

if (level < maxDepth - 1) {

val impurity = if (i == 0) {
nodeSplitStats._2.leftImpurity
} else {
nodeSplitStats._2.rightImpurity
}

logDebug("nodeIndex = " + nodeIndex + ", impurity = " + impurity)
//noting the parent impurities
parentImpurities(nodeIndex) = impurity
//noting the parents filters for the child nodes
val childFilter = new Filter(nodeSplitStats._1, if (i == 0) -1 else 1)
filters(nodeIndex) = childFilter :: filters((nodeIndex - 1) / 2)

for (filter <- filters(nodeIndex)) {
logDebug("Filter = " + filter)
}

}
}
}
Expand Down