Repository: spark Updated Branches: refs/heads/branch-1.0 c40eec844 -> 1a304297f
SPARK-1357 (addendum). More Experimental items in MLlib Per discussion, this is my suggestion to make ALS Rating, ClassificationModel, RegressionModel experimental for now, to reserve the right to possibly change after 1.0. See what you think of this much. Author: Sean Owen <[email protected]> Closes #372 from srowen/SPARK-1357Addendum and squashes the following commits: 17cf1ea [Sean Owen] Remove (another) blank line after ":: Experimental ::" 6800e4c [Sean Owen] Remove blank line after ":: Experimental ::" b3a88d2 [Sean Owen] Make ALS Rating, ClassificationModel, RegressionModel experimental for now, to reserve the right to possibly change after 1.0 (cherry picked from commit 8aa1f4c4f6d60168737699b5a9eafd6a05660976) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1a304297 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1a304297 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1a304297 Branch: refs/heads/branch-1.0 Commit: 1a304297f6490653a8e0ef556222640a57b09202 Parents: c40eec8 Author: Sean Owen <[email protected]> Authored: Fri Apr 18 10:04:02 2014 -0700 Committer: Reynold Xin <[email protected]> Committed: Fri Apr 18 10:04:11 2014 -0700 ---------------------------------------------------------------------- .../apache/spark/mllib/classification/ClassificationModel.scala | 3 +++ .../main/scala/org/apache/spark/mllib/recommendation/ALS.scala | 2 ++ .../org/apache/spark/mllib/regression/RegressionModel.scala | 5 +++++ 3 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1a304297/mllib/src/main/scala/org/apache/spark/mllib/classification/ClassificationModel.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/mllib/classification/ClassificationModel.scala b/mllib/src/main/scala/org/apache/spark/mllib/classification/ClassificationModel.scala index bd10e2e..6332301 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/classification/ClassificationModel.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/classification/ClassificationModel.scala @@ -19,11 +19,14 @@ package org.apache.spark.mllib.classification import org.apache.spark.mllib.linalg.Vector import org.apache.spark.rdd.RDD +import org.apache.spark.annotation.Experimental /** + * :: Experimental :: * Represents a classification model that predicts to which of a set of categories an example * belongs. The categories are represented by double values: 0.0, 1.0, 2.0, etc. */ +@Experimental trait ClassificationModel extends Serializable { /** * Predict values for the given data set using the model trained. http://git-wip-us.apache.org/repos/asf/spark/blob/1a304297/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala index 5cc47de..102742c 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala @@ -56,8 +56,10 @@ private[recommendation] case class InLinkBlock( /** + * :: Experimental :: * A more compact class to represent a rating than Tuple3[Int, Int, Double]. */ +@Experimental case class Rating(val user: Int, val product: Int, val rating: Double) /** http://git-wip-us.apache.org/repos/asf/spark/blob/1a304297/mllib/src/main/scala/org/apache/spark/mllib/regression/RegressionModel.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/mllib/regression/RegressionModel.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/RegressionModel.scala index 5e4b8a3..027305a 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/regression/RegressionModel.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/regression/RegressionModel.scala @@ -19,7 +19,12 @@ package org.apache.spark.mllib.regression import org.apache.spark.rdd.RDD import org.apache.spark.mllib.linalg.Vector +import org.apache.spark.annotation.Experimental +/** + * :: Experimental :: + */ +@Experimental trait RegressionModel extends Serializable { /** * Predict values for the given data set using the model trained.
