From d26f7cb0121767da678bbbbf3a0e31c63d5e3159 Mon Sep 17 00:00:00 2001 From: Yanbo Liang Date: Tue, 3 May 2016 16:46:13 +0200 Subject: [SPARK-14971][ML][PYSPARK] PySpark ML Params setter code clean up ## What changes were proposed in this pull request? PySpark ML Params setter code clean up. For examples, ```setInputCol``` can be simplified from ``` self._set(inputCol=value) return self ``` to: ``` return self._set(inputCol=value) ``` This is a pretty big sweeps, and we cleaned wherever possible. ## How was this patch tested? Exist unit tests. Author: Yanbo Liang Closes #12749 from yanboliang/spark-14971. --- python/pyspark/ml/classification.py | 21 ++-- python/pyspark/ml/clustering.py | 18 ++-- python/pyspark/ml/evaluation.py | 9 +- python/pyspark/ml/feature.py | 111 +++++++-------------- python/pyspark/ml/param/_shared_params_code_gen.py | 3 +- python/pyspark/ml/param/shared.py | 87 ++++++---------- python/pyspark/ml/pipeline.py | 3 +- python/pyspark/ml/recommendation.py | 35 +++---- python/pyspark/ml/regression.py | 36 +++---- python/pyspark/ml/tuning.py | 6 +- 10 files changed, 110 insertions(+), 219 deletions(-) (limited to 'python') diff --git a/python/pyspark/ml/classification.py b/python/pyspark/ml/classification.py index 4331f73b73..f032963334 100644 --- a/python/pyspark/ml/classification.py +++ b/python/pyspark/ml/classification.py @@ -464,8 +464,7 @@ class TreeClassifierParams(object): """ Sets the value of :py:attr:`impurity`. """ - self._set(impurity=value) - return self + return self._set(impurity=value) @since("1.6.0") def getImpurity(self): @@ -826,8 +825,7 @@ class GBTClassifier(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredictionCol """ Sets the value of :py:attr:`lossType`. """ - self._set(lossType=value) - return self + return self._set(lossType=value) @since("1.4.0") def getLossType(self): @@ -956,8 +954,7 @@ class NaiveBayes(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredictionCol, H """ Sets the value of :py:attr:`smoothing`. """ - self._set(smoothing=value) - return self + return self._set(smoothing=value) @since("1.5.0") def getSmoothing(self): @@ -971,8 +968,7 @@ class NaiveBayes(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredictionCol, H """ Sets the value of :py:attr:`modelType`. """ - self._set(modelType=value) - return self + return self._set(modelType=value) @since("1.5.0") def getModelType(self): @@ -1098,8 +1094,7 @@ class MultilayerPerceptronClassifier(JavaEstimator, HasFeaturesCol, HasLabelCol, """ Sets the value of :py:attr:`layers`. """ - self._set(layers=value) - return self + return self._set(layers=value) @since("1.6.0") def getLayers(self): @@ -1113,8 +1108,7 @@ class MultilayerPerceptronClassifier(JavaEstimator, HasFeaturesCol, HasLabelCol, """ Sets the value of :py:attr:`blockSize`. """ - self._set(blockSize=value) - return self + return self._set(blockSize=value) @since("1.6.0") def getBlockSize(self): @@ -1162,8 +1156,7 @@ class OneVsRestParams(HasFeaturesCol, HasLabelCol, HasPredictionCol): .. note:: Only LogisticRegression and NaiveBayes are supported now. """ - self._set(classifier=value) - return self + return self._set(classifier=value) @since("2.0.0") def getClassifier(self): diff --git a/python/pyspark/ml/clustering.py b/python/pyspark/ml/clustering.py index 50ebf4fde1..b90daf16e2 100644 --- a/python/pyspark/ml/clustering.py +++ b/python/pyspark/ml/clustering.py @@ -156,8 +156,7 @@ class GaussianMixture(JavaEstimator, HasFeaturesCol, HasPredictionCol, HasMaxIte """ Sets the value of :py:attr:`k`. """ - self._set(k=value) - return self + return self._set(k=value) @since("2.0.0") def getK(self): @@ -272,8 +271,7 @@ class KMeans(JavaEstimator, HasFeaturesCol, HasPredictionCol, HasMaxIter, HasTol """ Sets the value of :py:attr:`k`. """ - self._set(k=value) - return self + return self._set(k=value) @since("1.5.0") def getK(self): @@ -287,8 +285,7 @@ class KMeans(JavaEstimator, HasFeaturesCol, HasPredictionCol, HasMaxIter, HasTol """ Sets the value of :py:attr:`initMode`. """ - self._set(initMode=value) - return self + return self._set(initMode=value) @since("1.5.0") def getInitMode(self): @@ -302,8 +299,7 @@ class KMeans(JavaEstimator, HasFeaturesCol, HasPredictionCol, HasMaxIter, HasTol """ Sets the value of :py:attr:`initSteps`. """ - self._set(initSteps=value) - return self + return self._set(initSteps=value) @since("1.5.0") def getInitSteps(self): @@ -422,8 +418,7 @@ class BisectingKMeans(JavaEstimator, HasFeaturesCol, HasPredictionCol, HasMaxIte """ Sets the value of :py:attr:`k`. """ - self._set(k=value) - return self + return self._set(k=value) @since("2.0.0") def getK(self): @@ -437,8 +432,7 @@ class BisectingKMeans(JavaEstimator, HasFeaturesCol, HasPredictionCol, HasMaxIte """ Sets the value of :py:attr:`minDivisibleClusterSize`. """ - self._set(minDivisibleClusterSize=value) - return self + return self._set(minDivisibleClusterSize=value) @since("2.0.0") def getMinDivisibleClusterSize(self): diff --git a/python/pyspark/ml/evaluation.py b/python/pyspark/ml/evaluation.py index 455795f9a0..2a41678741 100644 --- a/python/pyspark/ml/evaluation.py +++ b/python/pyspark/ml/evaluation.py @@ -147,8 +147,7 @@ class BinaryClassificationEvaluator(JavaEvaluator, HasLabelCol, HasRawPrediction """ Sets the value of :py:attr:`metricName`. """ - self._set(metricName=value) - return self + return self._set(metricName=value) @since("1.4.0") def getMetricName(self): @@ -217,8 +216,7 @@ class RegressionEvaluator(JavaEvaluator, HasLabelCol, HasPredictionCol): """ Sets the value of :py:attr:`metricName`. """ - self._set(metricName=value) - return self + return self._set(metricName=value) @since("1.4.0") def getMetricName(self): @@ -284,8 +282,7 @@ class MulticlassClassificationEvaluator(JavaEvaluator, HasLabelCol, HasPredictio """ Sets the value of :py:attr:`metricName`. """ - self._set(metricName=value) - return self + return self._set(metricName=value) @since("1.5.0") def getMetricName(self): diff --git a/python/pyspark/ml/feature.py b/python/pyspark/ml/feature.py index b95d288198..f21e3062ef 100644 --- a/python/pyspark/ml/feature.py +++ b/python/pyspark/ml/feature.py @@ -114,8 +114,7 @@ class Binarizer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, Java """ Sets the value of :py:attr:`threshold`. """ - self._set(threshold=value) - return self + return self._set(threshold=value) @since("1.4.0") def getThreshold(self): @@ -190,8 +189,7 @@ class Bucketizer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, Jav """ Sets the value of :py:attr:`splits`. """ - self._set(splits=value) - return self + return self._set(splits=value) @since("1.4.0") def getSplits(self): @@ -295,8 +293,7 @@ class CountVectorizer(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`minTF`. """ - self._set(minTF=value) - return self + return self._set(minTF=value) @since("1.6.0") def getMinTF(self): @@ -310,8 +307,7 @@ class CountVectorizer(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`minDF`. """ - self._set(minDF=value) - return self + return self._set(minDF=value) @since("1.6.0") def getMinDF(self): @@ -325,8 +321,7 @@ class CountVectorizer(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`vocabSize`. """ - self._set(vocabSize=value) - return self + return self._set(vocabSize=value) @since("1.6.0") def getVocabSize(self): @@ -340,8 +335,7 @@ class CountVectorizer(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`binary`. """ - self._set(binary=value) - return self + return self._set(binary=value) @since("2.0.0") def getBinary(self): @@ -433,8 +427,7 @@ class DCT(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, JavaMLWrit """ Sets the value of :py:attr:`inverse`. """ - self._set(inverse=value) - return self + return self._set(inverse=value) @since("1.6.0") def getInverse(self): @@ -500,8 +493,7 @@ class ElementwiseProduct(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReada """ Sets the value of :py:attr:`scalingVec`. """ - self._set(scalingVec=value) - return self + return self._set(scalingVec=value) @since("1.5.0") def getScalingVec(self): @@ -573,8 +565,7 @@ class HashingTF(JavaTransformer, HasInputCol, HasOutputCol, HasNumFeatures, Java """ Sets the value of :py:attr:`binary`. """ - self._set(binary=value) - return self + return self._set(binary=value) @since("2.0.0") def getBinary(self): @@ -647,8 +638,7 @@ class IDF(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, JavaMLWritab """ Sets the value of :py:attr:`minDocFreq`. """ - self._set(minDocFreq=value) - return self + return self._set(minDocFreq=value) @since("1.4.0") def getMinDocFreq(self): @@ -832,8 +822,7 @@ class MinMaxScaler(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, Jav """ Sets the value of :py:attr:`min`. """ - self._set(min=value) - return self + return self._set(min=value) @since("1.6.0") def getMin(self): @@ -847,8 +836,7 @@ class MinMaxScaler(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, Jav """ Sets the value of :py:attr:`max`. """ - self._set(max=value) - return self + return self._set(max=value) @since("1.6.0") def getMax(self): @@ -956,8 +944,7 @@ class NGram(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, JavaMLWr """ Sets the value of :py:attr:`n`. """ - self._set(n=value) - return self + return self._set(n=value) @since("1.5.0") def getN(self): @@ -1023,8 +1010,7 @@ class Normalizer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, Jav """ Sets the value of :py:attr:`p`. """ - self._set(p=value) - return self + return self._set(p=value) @since("1.4.0") def getP(self): @@ -1106,8 +1092,7 @@ class OneHotEncoder(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`dropLast`. """ - self._set(dropLast=value) - return self + return self._set(dropLast=value) @since("1.4.0") def getDropLast(self): @@ -1175,8 +1160,7 @@ class PolynomialExpansion(JavaTransformer, HasInputCol, HasOutputCol, JavaMLRead """ Sets the value of :py:attr:`degree`. """ - self._set(degree=value) - return self + return self._set(degree=value) @since("1.4.0") def getDegree(self): @@ -1257,8 +1241,7 @@ class QuantileDiscretizer(JavaEstimator, HasInputCol, HasOutputCol, HasSeed, Jav """ Sets the value of :py:attr:`numBuckets`. """ - self._set(numBuckets=value) - return self + return self._set(numBuckets=value) @since("2.0.0") def getNumBuckets(self): @@ -1355,8 +1338,7 @@ class RegexTokenizer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`minTokenLength`. """ - self._set(minTokenLength=value) - return self + return self._set(minTokenLength=value) @since("1.4.0") def getMinTokenLength(self): @@ -1370,8 +1352,7 @@ class RegexTokenizer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`gaps`. """ - self._set(gaps=value) - return self + return self._set(gaps=value) @since("1.4.0") def getGaps(self): @@ -1385,8 +1366,7 @@ class RegexTokenizer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`pattern`. """ - self._set(pattern=value) - return self + return self._set(pattern=value) @since("1.4.0") def getPattern(self): @@ -1400,8 +1380,7 @@ class RegexTokenizer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`toLowercase`. """ - self._set(toLowercase=value) - return self + return self._set(toLowercase=value) @since("2.0.0") def getToLowercase(self): @@ -1462,8 +1441,7 @@ class SQLTransformer(JavaTransformer, JavaMLReadable, JavaMLWritable): """ Sets the value of :py:attr:`statement`. """ - self._set(statement=value) - return self + return self._set(statement=value) @since("1.6.0") def getStatement(self): @@ -1540,8 +1518,7 @@ class StandardScaler(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, J """ Sets the value of :py:attr:`withMean`. """ - self._set(withMean=value) - return self + return self._set(withMean=value) @since("1.4.0") def getWithMean(self): @@ -1555,8 +1532,7 @@ class StandardScaler(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, J """ Sets the value of :py:attr:`withStd`. """ - self._set(withStd=value) - return self + return self._set(withStd=value) @since("1.4.0") def getWithStd(self): @@ -1724,8 +1700,7 @@ class IndexToString(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, """ Sets the value of :py:attr:`labels`. """ - self._set(labels=value) - return self + return self._set(labels=value) @since("1.6.0") def getLabels(self): @@ -1795,8 +1770,7 @@ class StopWordsRemover(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadabl """ Specify the stopwords to be filtered. """ - self._set(stopWords=value) - return self + return self._set(stopWords=value) @since("1.6.0") def getStopWords(self): @@ -1810,8 +1784,7 @@ class StopWordsRemover(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadabl """ Set whether to do a case sensitive comparison over the stop words """ - self._set(caseSensitive=value) - return self + return self._set(caseSensitive=value) @since("1.6.0") def getCaseSensitive(self): @@ -2027,8 +2000,7 @@ class VectorIndexer(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, Ja """ Sets the value of :py:attr:`maxCategories`. """ - self._set(maxCategories=value) - return self + return self._set(maxCategories=value) @since("1.4.0") def getMaxCategories(self): @@ -2137,8 +2109,7 @@ class VectorSlicer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, J """ Sets the value of :py:attr:`indices`. """ - self._set(indices=value) - return self + return self._set(indices=value) @since("1.6.0") def getIndices(self): @@ -2152,8 +2123,7 @@ class VectorSlicer(JavaTransformer, HasInputCol, HasOutputCol, JavaMLReadable, J """ Sets the value of :py:attr:`names`. """ - self._set(names=value) - return self + return self._set(names=value) @since("1.6.0") def getNames(self): @@ -2261,8 +2231,7 @@ class Word2Vec(JavaEstimator, HasStepSize, HasMaxIter, HasSeed, HasInputCol, Has """ Sets the value of :py:attr:`vectorSize`. """ - self._set(vectorSize=value) - return self + return self._set(vectorSize=value) @since("1.4.0") def getVectorSize(self): @@ -2276,8 +2245,7 @@ class Word2Vec(JavaEstimator, HasStepSize, HasMaxIter, HasSeed, HasInputCol, Has """ Sets the value of :py:attr:`numPartitions`. """ - self._set(numPartitions=value) - return self + return self._set(numPartitions=value) @since("1.4.0") def getNumPartitions(self): @@ -2291,8 +2259,7 @@ class Word2Vec(JavaEstimator, HasStepSize, HasMaxIter, HasSeed, HasInputCol, Has """ Sets the value of :py:attr:`minCount`. """ - self._set(minCount=value) - return self + return self._set(minCount=value) @since("1.4.0") def getMinCount(self): @@ -2306,8 +2273,7 @@ class Word2Vec(JavaEstimator, HasStepSize, HasMaxIter, HasSeed, HasInputCol, Has """ Sets the value of :py:attr:`windowSize`. """ - self._set(windowSize=value) - return self + return self._set(windowSize=value) @since("2.0.0") def getWindowSize(self): @@ -2412,8 +2378,7 @@ class PCA(JavaEstimator, HasInputCol, HasOutputCol, JavaMLReadable, JavaMLWritab """ Sets the value of :py:attr:`k`. """ - self._set(k=value) - return self + return self._set(k=value) @since("1.5.0") def getK(self): @@ -2545,8 +2510,7 @@ class RFormula(JavaEstimator, HasFeaturesCol, HasLabelCol, JavaMLReadable, JavaM """ Sets the value of :py:attr:`formula`. """ - self._set(formula=value) - return self + return self._set(formula=value) @since("1.5.0") def getFormula(self): @@ -2638,8 +2602,7 @@ class ChiSqSelector(JavaEstimator, HasFeaturesCol, HasOutputCol, HasLabelCol, Ja """ Sets the value of :py:attr:`numTopFeatures`. """ - self._set(numTopFeatures=value) - return self + return self._set(numTopFeatures=value) @since("2.0.0") def getNumTopFeatures(self): diff --git a/python/pyspark/ml/param/_shared_params_code_gen.py b/python/pyspark/ml/param/_shared_params_code_gen.py index a2acf956bc..12f14534f4 100644 --- a/python/pyspark/ml/param/_shared_params_code_gen.py +++ b/python/pyspark/ml/param/_shared_params_code_gen.py @@ -85,8 +85,7 @@ def _gen_param_code(name, doc, defaultValueStr): """ Sets the value of :py:attr:`$name`. """ - self._set($name=value) - return self + return self._set($name=value) def get$Name(self): """ diff --git a/python/pyspark/ml/param/shared.py b/python/pyspark/ml/param/shared.py index 538c0b718a..9ed63e48ae 100644 --- a/python/pyspark/ml/param/shared.py +++ b/python/pyspark/ml/param/shared.py @@ -34,8 +34,7 @@ class HasMaxIter(Params): """ Sets the value of :py:attr:`maxIter`. """ - self._set(maxIter=value) - return self + return self._set(maxIter=value) def getMaxIter(self): """ @@ -58,8 +57,7 @@ class HasRegParam(Params): """ Sets the value of :py:attr:`regParam`. """ - self._set(regParam=value) - return self + return self._set(regParam=value) def getRegParam(self): """ @@ -83,8 +81,7 @@ class HasFeaturesCol(Params): """ Sets the value of :py:attr:`featuresCol`. """ - self._set(featuresCol=value) - return self + return self._set(featuresCol=value) def getFeaturesCol(self): """ @@ -108,8 +105,7 @@ class HasLabelCol(Params): """ Sets the value of :py:attr:`labelCol`. """ - self._set(labelCol=value) - return self + return self._set(labelCol=value) def getLabelCol(self): """ @@ -133,8 +129,7 @@ class HasPredictionCol(Params): """ Sets the value of :py:attr:`predictionCol`. """ - self._set(predictionCol=value) - return self + return self._set(predictionCol=value) def getPredictionCol(self): """ @@ -158,8 +153,7 @@ class HasProbabilityCol(Params): """ Sets the value of :py:attr:`probabilityCol`. """ - self._set(probabilityCol=value) - return self + return self._set(probabilityCol=value) def getProbabilityCol(self): """ @@ -183,8 +177,7 @@ class HasRawPredictionCol(Params): """ Sets the value of :py:attr:`rawPredictionCol`. """ - self._set(rawPredictionCol=value) - return self + return self._set(rawPredictionCol=value) def getRawPredictionCol(self): """ @@ -207,8 +200,7 @@ class HasInputCol(Params): """ Sets the value of :py:attr:`inputCol`. """ - self._set(inputCol=value) - return self + return self._set(inputCol=value) def getInputCol(self): """ @@ -231,8 +223,7 @@ class HasInputCols(Params): """ Sets the value of :py:attr:`inputCols`. """ - self._set(inputCols=value) - return self + return self._set(inputCols=value) def getInputCols(self): """ @@ -256,8 +247,7 @@ class HasOutputCol(Params): """ Sets the value of :py:attr:`outputCol`. """ - self._set(outputCol=value) - return self + return self._set(outputCol=value) def getOutputCol(self): """ @@ -280,8 +270,7 @@ class HasNumFeatures(Params): """ Sets the value of :py:attr:`numFeatures`. """ - self._set(numFeatures=value) - return self + return self._set(numFeatures=value) def getNumFeatures(self): """ @@ -304,8 +293,7 @@ class HasCheckpointInterval(Params): """ Sets the value of :py:attr:`checkpointInterval`. """ - self._set(checkpointInterval=value) - return self + return self._set(checkpointInterval=value) def getCheckpointInterval(self): """ @@ -329,8 +317,7 @@ class HasSeed(Params): """ Sets the value of :py:attr:`seed`. """ - self._set(seed=value) - return self + return self._set(seed=value) def getSeed(self): """ @@ -353,8 +340,7 @@ class HasTol(Params): """ Sets the value of :py:attr:`tol`. """ - self._set(tol=value) - return self + return self._set(tol=value) def getTol(self): """ @@ -377,8 +363,7 @@ class HasStepSize(Params): """ Sets the value of :py:attr:`stepSize`. """ - self._set(stepSize=value) - return self + return self._set(stepSize=value) def getStepSize(self): """ @@ -401,8 +386,7 @@ class HasHandleInvalid(Params): """ Sets the value of :py:attr:`handleInvalid`. """ - self._set(handleInvalid=value) - return self + return self._set(handleInvalid=value) def getHandleInvalid(self): """ @@ -426,8 +410,7 @@ class HasElasticNetParam(Params): """ Sets the value of :py:attr:`elasticNetParam`. """ - self._set(elasticNetParam=value) - return self + return self._set(elasticNetParam=value) def getElasticNetParam(self): """ @@ -451,8 +434,7 @@ class HasFitIntercept(Params): """ Sets the value of :py:attr:`fitIntercept`. """ - self._set(fitIntercept=value) - return self + return self._set(fitIntercept=value) def getFitIntercept(self): """ @@ -476,8 +458,7 @@ class HasStandardization(Params): """ Sets the value of :py:attr:`standardization`. """ - self._set(standardization=value) - return self + return self._set(standardization=value) def getStandardization(self): """ @@ -500,8 +481,7 @@ class HasThresholds(Params): """ Sets the value of :py:attr:`thresholds`. """ - self._set(thresholds=value) - return self + return self._set(thresholds=value) def getThresholds(self): """ @@ -524,8 +504,7 @@ class HasWeightCol(Params): """ Sets the value of :py:attr:`weightCol`. """ - self._set(weightCol=value) - return self + return self._set(weightCol=value) def getWeightCol(self): """ @@ -549,8 +528,7 @@ class HasSolver(Params): """ Sets the value of :py:attr:`solver`. """ - self._set(solver=value) - return self + return self._set(solver=value) def getSolver(self): """ @@ -573,8 +551,7 @@ class HasVarianceCol(Params): """ Sets the value of :py:attr:`varianceCol`. """ - self._set(varianceCol=value) - return self + return self._set(varianceCol=value) def getVarianceCol(self): """ @@ -603,8 +580,7 @@ class DecisionTreeParams(Params): """ Sets the value of :py:attr:`maxDepth`. """ - self._set(maxDepth=value) - return self + return self._set(maxDepth=value) def getMaxDepth(self): """ @@ -616,8 +592,7 @@ class DecisionTreeParams(Params): """ Sets the value of :py:attr:`maxBins`. """ - self._set(maxBins=value) - return self + return self._set(maxBins=value) def getMaxBins(self): """ @@ -629,8 +604,7 @@ class DecisionTreeParams(Params): """ Sets the value of :py:attr:`minInstancesPerNode`. """ - self._set(minInstancesPerNode=value) - return self + return self._set(minInstancesPerNode=value) def getMinInstancesPerNode(self): """ @@ -642,8 +616,7 @@ class DecisionTreeParams(Params): """ Sets the value of :py:attr:`minInfoGain`. """ - self._set(minInfoGain=value) - return self + return self._set(minInfoGain=value) def getMinInfoGain(self): """ @@ -655,8 +628,7 @@ class DecisionTreeParams(Params): """ Sets the value of :py:attr:`maxMemoryInMB`. """ - self._set(maxMemoryInMB=value) - return self + return self._set(maxMemoryInMB=value) def getMaxMemoryInMB(self): """ @@ -668,8 +640,7 @@ class DecisionTreeParams(Params): """ Sets the value of :py:attr:`cacheNodeIds`. """ - self._set(cacheNodeIds=value) - return self + return self._set(cacheNodeIds=value) def getCacheNodeIds(self): """ diff --git a/python/pyspark/ml/pipeline.py b/python/pyspark/ml/pipeline.py index 146e403a8f..eb6d3310d6 100644 --- a/python/pyspark/ml/pipeline.py +++ b/python/pyspark/ml/pipeline.py @@ -71,8 +71,7 @@ class Pipeline(Estimator, MLReadable, MLWritable): :param value: a list of transformers or estimators :return: the pipeline instance """ - self._set(stages=value) - return self + return self._set(stages=value) @since("1.3.0") def getStages(self): diff --git a/python/pyspark/ml/recommendation.py b/python/pyspark/ml/recommendation.py index 08770d9981..db02684262 100644 --- a/python/pyspark/ml/recommendation.py +++ b/python/pyspark/ml/recommendation.py @@ -177,8 +177,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`rank`. """ - self._set(rank=value) - return self + return self._set(rank=value) @since("1.4.0") def getRank(self): @@ -192,8 +191,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`numUserBlocks`. """ - self._set(numUserBlocks=value) - return self + return self._set(numUserBlocks=value) @since("1.4.0") def getNumUserBlocks(self): @@ -207,8 +205,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`numItemBlocks`. """ - self._set(numItemBlocks=value) - return self + return self._set(numItemBlocks=value) @since("1.4.0") def getNumItemBlocks(self): @@ -223,15 +220,14 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha Sets both :py:attr:`numUserBlocks` and :py:attr:`numItemBlocks` to the specific value. """ self._set(numUserBlocks=value) - self._set(numItemBlocks=value) + return self._set(numItemBlocks=value) @since("1.4.0") def setImplicitPrefs(self, value): """ Sets the value of :py:attr:`implicitPrefs`. """ - self._set(implicitPrefs=value) - return self + return self._set(implicitPrefs=value) @since("1.4.0") def getImplicitPrefs(self): @@ -245,8 +241,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`alpha`. """ - self._set(alpha=value) - return self + return self._set(alpha=value) @since("1.4.0") def getAlpha(self): @@ -260,8 +255,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`userCol`. """ - self._set(userCol=value) - return self + return self._set(userCol=value) @since("1.4.0") def getUserCol(self): @@ -275,8 +269,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`itemCol`. """ - self._set(itemCol=value) - return self + return self._set(itemCol=value) @since("1.4.0") def getItemCol(self): @@ -290,8 +283,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`ratingCol`. """ - self._set(ratingCol=value) - return self + return self._set(ratingCol=value) @since("1.4.0") def getRatingCol(self): @@ -305,8 +297,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`nonnegative`. """ - self._set(nonnegative=value) - return self + return self._set(nonnegative=value) @since("1.4.0") def getNonnegative(self): @@ -320,8 +311,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`intermediateStorageLevel`. """ - self._set(intermediateStorageLevel=value) - return self + return self._set(intermediateStorageLevel=value) @since("2.0.0") def getIntermediateStorageLevel(self): @@ -335,8 +325,7 @@ class ALS(JavaEstimator, HasCheckpointInterval, HasMaxIter, HasPredictionCol, Ha """ Sets the value of :py:attr:`finalStorageLevel`. """ - self._set(finalStorageLevel=value) - return self + return self._set(finalStorageLevel=value) @since("2.0.0") def getFinalStorageLevel(self): diff --git a/python/pyspark/ml/regression.py b/python/pyspark/ml/regression.py index 0f08f9b973..04f566dfec 100644 --- a/python/pyspark/ml/regression.py +++ b/python/pyspark/ml/regression.py @@ -469,8 +469,7 @@ class IsotonicRegression(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredicti """ Sets the value of :py:attr:`isotonic`. """ - self._set(isotonic=value) - return self + return self._set(isotonic=value) def getIsotonic(self): """ @@ -482,8 +481,7 @@ class IsotonicRegression(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredicti """ Sets the value of :py:attr:`featureIndex`. """ - self._set(featureIndex=value) - return self + return self._set(featureIndex=value) def getFeatureIndex(self): """ @@ -532,8 +530,7 @@ class TreeEnsembleParams(DecisionTreeParams): """ Sets the value of :py:attr:`subsamplingRate`. """ - self._set(subsamplingRate=value) - return self + return self._set(subsamplingRate=value) @since("1.4.0") def getSubsamplingRate(self): @@ -562,8 +559,7 @@ class TreeRegressorParams(Params): """ Sets the value of :py:attr:`impurity`. """ - self._set(impurity=value) - return self + return self._set(impurity=value) @since("1.4.0") def getImpurity(self): @@ -595,8 +591,7 @@ class RandomForestParams(TreeEnsembleParams): """ Sets the value of :py:attr:`numTrees`. """ - self._set(numTrees=value) - return self + return self._set(numTrees=value) @since("1.4.0") def getNumTrees(self): @@ -610,8 +605,7 @@ class RandomForestParams(TreeEnsembleParams): """ Sets the value of :py:attr:`featureSubsetStrategy`. """ - self._set(featureSubsetStrategy=value) - return self + return self._set(featureSubsetStrategy=value) @since("1.4.0") def getFeatureSubsetStrategy(self): @@ -982,8 +976,7 @@ class GBTRegressor(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredictionCol, """ Sets the value of :py:attr:`lossType`. """ - self._set(lossType=value) - return self + return self._set(lossType=value) @since("1.4.0") def getLossType(self): @@ -1120,8 +1113,7 @@ class AFTSurvivalRegression(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredi """ Sets the value of :py:attr:`censorCol`. """ - self._set(censorCol=value) - return self + return self._set(censorCol=value) @since("1.6.0") def getCensorCol(self): @@ -1135,8 +1127,7 @@ class AFTSurvivalRegression(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredi """ Sets the value of :py:attr:`quantileProbabilities`. """ - self._set(quantileProbabilities=value) - return self + return self._set(quantileProbabilities=value) @since("1.6.0") def getQuantileProbabilities(self): @@ -1150,8 +1141,7 @@ class AFTSurvivalRegression(JavaEstimator, HasFeaturesCol, HasLabelCol, HasPredi """ Sets the value of :py:attr:`quantilesCol`. """ - self._set(quantilesCol=value) - return self + return self._set(quantilesCol=value) @since("1.6.0") def getQuantilesCol(self): @@ -1300,8 +1290,7 @@ class GeneralizedLinearRegression(JavaEstimator, HasLabelCol, HasFeaturesCol, Ha """ Sets the value of :py:attr:`family`. """ - self._set(family=value) - return self + return self._set(family=value) @since("2.0.0") def getFamily(self): @@ -1315,8 +1304,7 @@ class GeneralizedLinearRegression(JavaEstimator, HasLabelCol, HasFeaturesCol, Ha """ Sets the value of :py:attr:`link`. """ - self._set(link=value) - return self + return self._set(link=value) @since("2.0.0") def getLink(self): diff --git a/python/pyspark/ml/tuning.py b/python/pyspark/ml/tuning.py index eb1f029ebb..b21cf92559 100644 --- a/python/pyspark/ml/tuning.py +++ b/python/pyspark/ml/tuning.py @@ -198,8 +198,7 @@ class CrossValidator(Estimator, ValidatorParams): """ Sets the value of :py:attr:`numFolds`. """ - self._set(numFolds=value) - return self + return self._set(numFolds=value) @since("1.4.0") def getNumFolds(self): @@ -350,8 +349,7 @@ class TrainValidationSplit(Estimator, ValidatorParams): """ Sets the value of :py:attr:`trainRatio`. """ - self._set(trainRatio=value) - return self + return self._set(trainRatio=value) @since("2.0.0") def getTrainRatio(self): -- cgit v1.2.3