diff options
| author | zsxwing <zsxwing@gmail.com> | 2014-05-26 14:34:58 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-05-26 14:35:05 -0700 |
| commit | f09cb8506c9f6a562b5749dcc7dacb701c016ad2 (patch) | |
| tree | 175c231a3c967a9746e1b57fb0ae03dd06b2f494 | |
| parent | 7a831636c4a9320f4b9022ed23936ad1d3866cf7 (diff) | |
| download | spark-f09cb8506c9f6a562b5749dcc7dacb701c016ad2.tar.gz spark-f09cb8506c9f6a562b5749dcc7dacb701c016ad2.tar.bz2 spark-f09cb8506c9f6a562b5749dcc7dacb701c016ad2.zip | |
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 '&&'
(cherry picked from commit cb7fe5034826844f1b50fbe8b92646317b66f21c)
Signed-off-by: Reynold Xin <rxin@apache.org>
| -rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala index 0fe30a3e70..3b13e52a7b 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala @@ -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) { |