You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by me...@apache.org on 2015/05/21 22:06:55 UTC
spark git commit: [SPARK-7498] [MLLIB] add varargs back to setDefault
Repository: spark
Updated Branches:
refs/heads/master 6d75ed7e5 -> cdc7c055c
[SPARK-7498] [MLLIB] add varargs back to setDefault
We removed `varargs` due to Java compilation issues. That was a false alarm because I didn't run `build/sbt clean`. So this PR reverts the changes. jkbradley
Author: Xiangrui Meng <me...@databricks.com>
Closes #6320 from mengxr/SPARK-7498 and squashes the following commits:
74a7259 [Xiangrui Meng] add varargs back to setDefault
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cdc7c055
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cdc7c055
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cdc7c055
Branch: refs/heads/master
Commit: cdc7c055c931c4c931a11b510de473455f3256da
Parents: 6d75ed7
Author: Xiangrui Meng <me...@databricks.com>
Authored: Thu May 21 13:06:53 2015 -0700
Committer: Xiangrui Meng <me...@databricks.com>
Committed: Thu May 21 13:06:53 2015 -0700
----------------------------------------------------------------------
mllib/src/main/scala/org/apache/spark/ml/param/params.scala | 7 +++----
.../test/java/org/apache/spark/ml/param/JavaTestParams.java | 1 +
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/cdc7c055/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/param/params.scala b/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
index c33b66d..94abfcd 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
@@ -438,19 +438,18 @@ trait Params extends Identifiable with Serializable {
* @param value the default value
*/
protected final def setDefault[T](param: Param[T], value: T): this.type = {
- defaultParamMap.put(param, value)
+ defaultParamMap.put(param -> value)
this
}
/**
* Sets default values for a list of params.
*
- * Note: Java developers should use the single-parameter [[setDefault()]].
- * Annotating this with varargs causes compilation failures. See SPARK-7498.
* @param paramPairs a list of param pairs that specify params and their default values to set
* respectively. Make sure that the params are initialized before this method
* gets called.
*/
+ @varargs
protected final def setDefault(paramPairs: ParamPair[_]*): this.type = {
paramPairs.foreach { p =>
setDefault(p.param.asInstanceOf[Param[Any]], p.value)
@@ -559,7 +558,7 @@ final class ParamMap private[ml] (private val map: mutable.Map[Param[Any], Any])
/**
* Puts a (param, value) pair (overwrites if the input param exists).
*/
- def put[T](param: Param[T], value: T): this.type = put(ParamPair(param, value))
+ def put[T](param: Param[T], value: T): this.type = put(param -> value)
/**
* Puts a list of param pairs (overwrites if the input params exists).
http://git-wip-us.apache.org/repos/asf/spark/blob/cdc7c055/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java
----------------------------------------------------------------------
diff --git a/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java b/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java
index 3a41890..947ae3a 100644
--- a/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java
+++ b/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java
@@ -81,5 +81,6 @@ public class JavaTestParams extends JavaParams {
ParamValidators.inArray(validStrings));
setDefault(myIntParam_, 1);
setDefault(myDoubleParam_, 0.5);
+ setDefault(myIntParam().w(1), myDoubleParam().w(0.5));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org