You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by fe...@apache.org on 2017/04/29 17:58:51 UTC
spark git commit: [SPARK-20533][SPARKR] SparkR Wrappers Model should
be private and value should be lazy
Repository: spark
Updated Branches:
refs/heads/master add9d1bba -> ee694cdff
[SPARK-20533][SPARKR] SparkR Wrappers Model should be private and value should be lazy
## What changes were proposed in this pull request?
MultilayerPerceptronClassifierWrapper model should be private.
LogisticRegressionWrapper.scala rFeatures and rCoefficients should be lazy.
## How was this patch tested?
Unit tests.
Author: wangmiao1981 <wm...@hotmail.com>
Closes #17808 from wangmiao1981/lazy.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ee694cdf
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ee694cdf
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ee694cdf
Branch: refs/heads/master
Commit: ee694cdff6fdb47f23370038f87f8594a80a8f27
Parents: add9d1b
Author: wangmiao1981 <wm...@hotmail.com>
Authored: Sat Apr 29 10:58:48 2017 -0700
Committer: Felix Cheung <fe...@apache.org>
Committed: Sat Apr 29 10:58:48 2017 -0700
----------------------------------------------------------------------
.../org/apache/spark/ml/r/LogisticRegressionWrapper.scala | 4 ++--
.../spark/ml/r/MultilayerPerceptronClassifierWrapper.scala | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ee694cdf/mllib/src/main/scala/org/apache/spark/ml/r/LogisticRegressionWrapper.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/r/LogisticRegressionWrapper.scala b/mllib/src/main/scala/org/apache/spark/ml/r/LogisticRegressionWrapper.scala
index c96f99c..703bcdf 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/r/LogisticRegressionWrapper.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/r/LogisticRegressionWrapper.scala
@@ -40,13 +40,13 @@ private[r] class LogisticRegressionWrapper private (
private val lrModel: LogisticRegressionModel =
pipeline.stages(1).asInstanceOf[LogisticRegressionModel]
- val rFeatures: Array[String] = if (lrModel.getFitIntercept) {
+ lazy val rFeatures: Array[String] = if (lrModel.getFitIntercept) {
Array("(Intercept)") ++ features
} else {
features
}
- val rCoefficients: Array[Double] = {
+ lazy val rCoefficients: Array[Double] = {
val numRows = lrModel.coefficientMatrix.numRows
val numCols = lrModel.coefficientMatrix.numCols
val numColsWithIntercept = if (lrModel.getFitIntercept) numCols + 1 else numCols
http://git-wip-us.apache.org/repos/asf/spark/blob/ee694cdf/mllib/src/main/scala/org/apache/spark/ml/r/MultilayerPerceptronClassifierWrapper.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/r/MultilayerPerceptronClassifierWrapper.scala b/mllib/src/main/scala/org/apache/spark/ml/r/MultilayerPerceptronClassifierWrapper.scala
index d34de30..48c8774 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/r/MultilayerPerceptronClassifierWrapper.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/r/MultilayerPerceptronClassifierWrapper.scala
@@ -36,11 +36,11 @@ private[r] class MultilayerPerceptronClassifierWrapper private (
import MultilayerPerceptronClassifierWrapper._
- val mlpModel: MultilayerPerceptronClassificationModel =
+ private val mlpModel: MultilayerPerceptronClassificationModel =
pipeline.stages(1).asInstanceOf[MultilayerPerceptronClassificationModel]
- val weights: Array[Double] = mlpModel.weights.toArray
- val layers: Array[Int] = mlpModel.layers
+ lazy val weights: Array[Double] = mlpModel.weights.toArray
+ lazy val layers: Array[Int] = mlpModel.layers
def transform(dataset: Dataset[_]): DataFrame = {
pipeline.transform(dataset)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org