Skip to content
Snippets Groups Projects
Commit cb7fe503 authored by zsxwing's avatar zsxwing Committed by Reynold Xin
Browse files

SPARK-1925: Replace '&' with '&&'

JIRA: https://issues.apache.org/jira/browse/SPARK-1925

Author: zsxwing <zsxwing@gmail.com>

Closes #879 from zsxwing/SPARK-1925 and squashes the following commits:

5cf5a6d [zsxwing] SPARK-1925: Replace '&' with '&&'
parent bee6c4f4
No related branches found
No related tags found
No related merge requests found
......@@ -401,7 +401,7 @@ object DecisionTree extends Serializable with Logging {
*/
def isSampleValid(parentFilters: List[Filter], labeledPoint: LabeledPoint): Boolean = {
// leaf
if ((level > 0) & (parentFilters.length == 0)) {
if ((level > 0) && (parentFilters.length == 0)) {
return false
}
......@@ -454,7 +454,7 @@ object DecisionTree extends Serializable with Logging {
val bin = binForFeatures(mid)
val lowThreshold = bin.lowSplit.threshold
val highThreshold = bin.highSplit.threshold
if ((lowThreshold < feature) & (highThreshold >= feature)){
if ((lowThreshold < feature) && (highThreshold >= feature)){
return mid
}
else if (lowThreshold >= feature) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment