diff --git a/core/src/main/scala/spark/BitTorrentBroadcast.scala b/core/src/main/scala/spark/BitTorrentBroadcast.scala index 887f6e51786a39afb68f55f997b7ecaa17aae4bd..126e61dc7da2b7d148cb9f13cdc6296e55704751 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 8021f5da068a81d0e186661a68a6dfbf1062617c..6f2cc3f6f0809641a1858ac63331e60835a684e9 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 cc14aa7090308f060cfaa3edbc744b3871a2206c..2e94ccbec2c6f4f573640a7cc09c0470b2227bb4 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 3fd3f88fa8384a0d1efde0d2401b88225e0ce331..96cda802770c14689fccbf076418f8c83079d162 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