Replace deprecated fromFunction with either tabulate or fill.

tabulate used if indexed used by function and fill otherwise.
This commit is contained in:
Ismael Juma 2011-05-26 22:12:11 +01:00
parent 0b6a862b68
commit 26000af4fa
4 changed files with 6 additions and 6 deletions

View file

@ -106,8 +106,8 @@ object LocalALS {
val R = generateR()
// Initialize m and u randomly
var ms = Array.fromFunction(_ => factory1D.random(F))(M)
var us = Array.fromFunction(_ => factory1D.random(F))(U)
var ms = Array.fill(M)(factory1D.random(F))
var us = Array.fill(U)(factory1D.random(F))
// Iteratively update movies then users
for (iter <- 1 to ITERATIONS) {

View file

@ -18,7 +18,7 @@ object LocalLR {
val x = Vector(D, _ => rand.nextGaussian + y * R)
DataPoint(x, y)
}
Array.fromFunction(generatePoint _)(N)
Array.tabulate(N)(generatePoint)
}
def main(args: Array[String]) {

View file

@ -117,8 +117,8 @@ object SparkALS {
val R = generateR()
// Initialize m and u randomly
var ms = Array.fromFunction(_ => factory1D.random(F))(M)
var us = Array.fromFunction(_ => factory1D.random(F))(U)
var ms = Array.fill(M)(factory1D.random(F))
var us = Array.fill(U)(factory1D.random(F))
// Iteratively update movies then users
val Rc = spark.broadcast(R)

View file

@ -20,7 +20,7 @@ object SparkLR {
val x = Vector(D, _ => rand.nextGaussian + y * R)
DataPoint(x, y)
}
Array.fromFunction(generatePoint _)(N)
Array.tabulate(N)(generatePoint)
}
def main(args: Array[String]) {