Repository: spark
Updated Branches:
  refs/heads/branch-1.5 ebbff391a -> 2217f4f8b


Revert "[SPARK-10959] [PYSPARK] StreamingLogisticRegressionWithSGD does not 
train with given regParam and convergenceTol parameters"

This reverts commit f95129c17523ea60220a37576b8a9390943cf98e.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2217f4f8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2217f4f8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2217f4f8

Branch: refs/heads/branch-1.5
Commit: 2217f4f8b8fa6ad8b0b7200591a5e7c827cb6e18
Parents: ebbff39
Author: Joseph K. Bradley <joseph.kurata.brad...@gmail.com>
Authored: Mon Oct 12 14:53:13 2015 -0700
Committer: Joseph K. Bradley <joseph.kurata.brad...@gmail.com>
Committed: Mon Oct 12 14:53:13 2015 -0700

----------------------------------------------------------------------
 python/pyspark/mllib/classification.py | 3 +--
 python/pyspark/mllib/regression.py     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/2217f4f8/python/pyspark/mllib/classification.py
----------------------------------------------------------------------
diff --git a/python/pyspark/mllib/classification.py 
b/python/pyspark/mllib/classification.py
index a302ed8..8f27c44 100644
--- a/python/pyspark/mllib/classification.py
+++ b/python/pyspark/mllib/classification.py
@@ -632,8 +632,7 @@ class 
StreamingLogisticRegressionWithSGD(StreamingLinearAlgorithm):
             if not rdd.isEmpty():
                 self._model = LogisticRegressionWithSGD.train(
                     rdd, self.numIterations, self.stepSize,
-                    self.miniBatchFraction, self._model.weights,
-                    regParam=self.regParam, convergenceTol=self.convergenceTol)
+                    self.miniBatchFraction, self._model.weights)
 
         dstream.foreachRDD(update)
 

http://git-wip-us.apache.org/repos/asf/spark/blob/2217f4f8/python/pyspark/mllib/regression.py
----------------------------------------------------------------------
diff --git a/python/pyspark/mllib/regression.py 
b/python/pyspark/mllib/regression.py
index 562fb36..41946e3 100644
--- a/python/pyspark/mllib/regression.py
+++ b/python/pyspark/mllib/regression.py
@@ -669,7 +669,7 @@ class 
StreamingLinearRegressionWithSGD(StreamingLinearAlgorithm):
                 self._model = LinearRegressionWithSGD.train(
                     rdd, self.numIterations, self.stepSize,
                     self.miniBatchFraction, self._model.weights,
-                    intercept=self._model.intercept, 
convergenceTol=self.convergenceTol)
+                    self._model.intercept)
 
         dstream.foreachRDD(update)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to