aboutsummaryrefslogtreecommitdiff
path: root/mllib
diff options
context:
space:
mode:
authorAmeet Talwalkar <atalwalkar@gmail.com>2013-07-08 14:37:42 -0700
committerAmeet Talwalkar <atalwalkar@gmail.com>2013-07-08 14:37:42 -0700
commitbf4c9a5e0fca2dfc960120a7f3c5fab0b87e3850 (patch)
tree322c6b8787609a63f4660c1dd4d70c795cc821f2 /mllib
parent744da8eefda3ae66f3471a12cc02b29cf5441dbc (diff)
downloadspark-bf4c9a5e0fca2dfc960120a7f3c5fab0b87e3850.tar.gz
spark-bf4c9a5e0fca2dfc960120a7f3c5fab0b87e3850.tar.bz2
spark-bf4c9a5e0fca2dfc960120a7f3c5fab0b87e3850.zip
renamed with labeled prefix
Diffstat (limited to 'mllib')
-rw-r--r--mllib/src/main/scala/spark/mllib/regression/LogisticRegression.scala2
-rw-r--r--mllib/src/main/scala/spark/mllib/regression/LogisticRegressionGenerator.scala2
-rw-r--r--mllib/src/main/scala/spark/mllib/regression/RidgeRegression.scala2
-rw-r--r--mllib/src/main/scala/spark/mllib/regression/RidgeRegressionGenerator.scala2
-rw-r--r--mllib/src/main/scala/spark/mllib/util/MLUtils.scala4
5 files changed, 6 insertions, 6 deletions
diff --git a/mllib/src/main/scala/spark/mllib/regression/LogisticRegression.scala b/mllib/src/main/scala/spark/mllib/regression/LogisticRegression.scala
index 448ab9dce9..e4db7bb9b7 100644
--- a/mllib/src/main/scala/spark/mllib/regression/LogisticRegression.scala
+++ b/mllib/src/main/scala/spark/mllib/regression/LogisticRegression.scala
@@ -150,7 +150,7 @@ object LogisticRegression {
System.exit(1)
}
val sc = new SparkContext(args(0), "LogisticRegression")
- val data = MLUtils.loadData(sc, args(1))
+ val data = MLUtils.loadLabeledData(sc, args(1))
val model = LogisticRegression.train(data, args(3).toInt, args(2).toDouble)
sc.stop()
diff --git a/mllib/src/main/scala/spark/mllib/regression/LogisticRegressionGenerator.scala b/mllib/src/main/scala/spark/mllib/regression/LogisticRegressionGenerator.scala
index 9f6abab70b..6e7c023bac 100644
--- a/mllib/src/main/scala/spark/mllib/regression/LogisticRegressionGenerator.scala
+++ b/mllib/src/main/scala/spark/mllib/regression/LogisticRegressionGenerator.scala
@@ -35,7 +35,7 @@ object LogisticRegressionGenerator {
(y, x)
}
- MLUtils.saveData(data, outputPath)
+ MLUtils.saveLabeledData(data, outputPath)
sc.stop()
}
}
diff --git a/mllib/src/main/scala/spark/mllib/regression/RidgeRegression.scala b/mllib/src/main/scala/spark/mllib/regression/RidgeRegression.scala
index f66025bc0b..5f813df402 100644
--- a/mllib/src/main/scala/spark/mllib/regression/RidgeRegression.scala
+++ b/mllib/src/main/scala/spark/mllib/regression/RidgeRegression.scala
@@ -187,7 +187,7 @@ object RidgeRegression {
System.exit(1)
}
val sc = new SparkContext(args(0), "RidgeRegression")
- val data = MLUtils.loadData(sc, args(1))
+ val data = MLUtils.loadLabeledData(sc, args(1))
val model = RidgeRegression.train(data, 0, 1000)
sc.stop()
}
diff --git a/mllib/src/main/scala/spark/mllib/regression/RidgeRegressionGenerator.scala b/mllib/src/main/scala/spark/mllib/regression/RidgeRegressionGenerator.scala
index c9ac4a8b07..b83f505d8e 100644
--- a/mllib/src/main/scala/spark/mllib/regression/RidgeRegressionGenerator.scala
+++ b/mllib/src/main/scala/spark/mllib/regression/RidgeRegressionGenerator.scala
@@ -49,7 +49,7 @@ object RidgeRegressionGenerator {
}
}
- MLUtils.saveData(data, outputPath)
+ MLUtils.saveLabeledData(data, outputPath)
sc.stop()
}
}
diff --git a/mllib/src/main/scala/spark/mllib/util/MLUtils.scala b/mllib/src/main/scala/spark/mllib/util/MLUtils.scala
index 0a4a037c71..08a031dded 100644
--- a/mllib/src/main/scala/spark/mllib/util/MLUtils.scala
+++ b/mllib/src/main/scala/spark/mllib/util/MLUtils.scala
@@ -19,7 +19,7 @@ object MLUtils {
* @return An RDD of tuples. For each tuple, the first element is the label, and the second
* element represents the feature values (an array of Double).
*/
- def loadData(sc: SparkContext, dir: String): RDD[(Double, Array[Double])] = {
+ def loadLabeledData(sc: SparkContext, dir: String): RDD[(Double, Array[Double])] = {
sc.textFile(dir).map { line =>
val parts = line.split(",")
val label = parts(0).toDouble
@@ -28,7 +28,7 @@ object MLUtils {
}
}
- def saveData(data: RDD[(Double, Array[Double])], dir: String) {
+ def saveLabeledData(data: RDD[(Double, Array[Double])], dir: String) {
val dataStr = data.map(x => x._1 + "," + x._2.mkString(" "))
dataStr.saveAsTextFile(dir)
}