From 0b6a862b6846a08ee0de8c53d5c657d05798e74d Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Thu, 26 May 2011 22:06:36 +0100
Subject: [PATCH] Use math instead of Math as the latter is deprecated.
---
core/src/main/scala/spark/BitTorrentBroadcast.scala | 4 ++--
core/src/main/scala/spark/ChainedBroadcast.scala | 2 +-
examples/src/main/scala/spark/examples/LocalFileLR.scala | 2 +-
examples/src/main/scala/spark/examples/LocalLR.scala | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/src/main/scala/spark/BitTorrentBroadcast.scala b/core/src/main/scala/spark/BitTorrentBroadcast.scala
index 887f6e5178..126e61dc7d 100644
--- a/core/src/main/scala/spark/BitTorrentBroadcast.scala
+++ b/core/src/main/scala/spark/BitTorrentBroadcast.scala
@@ -203,7 +203,7 @@ extends Broadcast[T] with Logging {
var blockID = 0
for (i <- 0 until (byteArray.length, blockSize)) {
- val thisBlockSize = Math.min (blockSize, byteArray.length - i)
+ val thisBlockSize = math.min (blockSize, byteArray.length - i)
var tempByteArray = new Array[Byte] (thisBlockSize)
val hasRead = bais.read (tempByteArray, 0, thisBlockSize)
@@ -435,7 +435,7 @@ extends Broadcast[T] with Logging {
while (hasBlocks < totalBlocks) {
var numThreadsToCreate =
- Math.min (listOfSources.size, BitTorrentBroadcast.MaxTxPeers) -
+ math.min (listOfSources.size, BitTorrentBroadcast.MaxTxPeers) -
threadPool.getActiveCount
while (hasBlocks < totalBlocks && numThreadsToCreate > 0) {
diff --git a/core/src/main/scala/spark/ChainedBroadcast.scala b/core/src/main/scala/spark/ChainedBroadcast.scala
index 8021f5da06..6f2cc3f6f0 100644
--- a/core/src/main/scala/spark/ChainedBroadcast.scala
+++ b/core/src/main/scala/spark/ChainedBroadcast.scala
@@ -166,7 +166,7 @@ extends Broadcast[T] with Logging {
var blockID = 0
for (i <- 0 until (byteArray.length, blockSize)) {
- val thisBlockSize = Math.min (blockSize, byteArray.length - i)
+ val thisBlockSize = math.min (blockSize, byteArray.length - i)
var tempByteArray = new Array[Byte] (thisBlockSize)
val hasRead = bais.read (tempByteArray, 0, thisBlockSize)
diff --git a/examples/src/main/scala/spark/examples/LocalFileLR.scala b/examples/src/main/scala/spark/examples/LocalFileLR.scala
index cc14aa7090..2e94ccbec2 100644
--- a/examples/src/main/scala/spark/examples/LocalFileLR.scala
+++ b/examples/src/main/scala/spark/examples/LocalFileLR.scala
@@ -27,7 +27,7 @@ object LocalFileLR {
println("On iteration " + i)
var gradient = Vector.zeros(D)
for (p <- points) {
- val scale = (1 / (1 + Math.exp(-p.y * (w dot p.x))) - 1) * p.y
+ val scale = (1 / (1 + math.exp(-p.y * (w dot p.x))) - 1) * p.y
gradient += scale * p.x
}
w -= gradient
diff --git a/examples/src/main/scala/spark/examples/LocalLR.scala b/examples/src/main/scala/spark/examples/LocalLR.scala
index 3fd3f88fa8..96cda80277 100644
--- a/examples/src/main/scala/spark/examples/LocalLR.scala
+++ b/examples/src/main/scala/spark/examples/LocalLR.scala
@@ -32,7 +32,7 @@ object LocalLR {
println("On iteration " + i)
var gradient = Vector.zeros(D)
for (p <- data) {
- val scale = (1 / (1 + Math.exp(-p.y * (w dot p.x))) - 1) * p.y
+ val scale = (1 / (1 + math.exp(-p.y * (w dot p.x))) - 1) * p.y
gradient += scale * p.x
}
w -= gradient
--
GitLab