raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Drop the -1 in pi range instead

Browse source
This commit is contained in:
Peter Vlugter 2011-04-08 16:46:29 +12:00
parent 63357fe3a8
commit 07e428cc34
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
View file

@ -62,7 +62,7 @@ object Pi extends App {
/*
// FIXME tail-recursive fun instead
val calculatePiFor = (arg: Int, nrOfElements: Int) => {
val range = (arg * nrOfElements) to ((arg + 1) * nrOfElements - 1)
val range = (arg * nrOfElements) until ((arg + 1) * nrOfElements)
var acc = 0.0D
range foreach (i => acc += 4 * math.pow(-1, i) / (2 * i + 1))
acc
@ -71,9 +71,9 @@ object Pi extends App {
}
*/
def calculatePiFor(arg: Int, nrOfElements: Int): Double = {
val end = (arg + 1) * nrOfElements - 1
val end = (arg + 1) * nrOfElements
@tailrec def doCalculatePiFor(cursor: Int, acc: Double): Double = {
if (cursor > end) acc
if (cursor == end) acc
else doCalculatePiFor(cursor + 1, acc + (4 * math.pow(-1, cursor) / (2 * cursor + 1)))
}
doCalculatePiFor(arg * nrOfElements, 0.0D)