Skip to content

Commit 9f82b3e

Browse files
authored
Merge pull request #1137 from armanbilge/topic/bye-bye-fastfor
Rename `fastFor` back to `cfor`
2 parents f717e9d + 9049572 commit 9f82b3e

File tree

16 files changed

+54
-748
lines changed

16 files changed

+54
-748
lines changed

benchmark/src/main/scala-2/spire/benchmark/CForBenchmark.scala renamed to benchmark/src/main/scala/spire/benchmark/CForBenchmark.scala

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import scala.util.Random
2424
import Random._
2525

2626
import spire.syntax.cfor._
27-
import spire.syntax.fastFor._
2827

2928
import Arrays.init
3029

@@ -372,62 +371,4 @@ class CForBenchmarks {
372371
arr2
373372
}
374373

375-
@Benchmark
376-
def doFastForOr: Long = {
377-
var t: Long = 0L
378-
val len = size - 1
379-
fastFor(0)(_ < len, _ + 1) { i => t = t ^ or(arr(i), arr(i + 1)) }
380-
381-
val len2 = size / 2
382-
fastFor(0)(_ < len2, _ + 1) { i => t = t ^ or(arr(i + 3), arr(i + 2)) }
383-
384-
val len3 = size / 3
385-
fastFor(0)(_ < len3, _ + 1) { i => t = t ^ or(arr(i + 1), arr(i + 2)) }
386-
387-
t
388-
}
389-
390-
@Benchmark
391-
def doFastForMin: Long = {
392-
var t: Long = 0L
393-
val len = size - 1
394-
fastFor(0)(_ < len, _ + 1) { i => t = t ^ min(arr(i), arr(i + 1)) }
395-
396-
val len2 = size / 2
397-
fastFor(0)(_ < len2, _ + 1) { i => t = t ^ min(arr(i + 3), arr(i + 2)) }
398-
399-
val len3 = size / 3
400-
fastFor(0)(_ < len3, _ + 1) { i => t = t ^ min(arr(i + 1), arr(i + 2)) }
401-
402-
t
403-
}
404-
405-
@Benchmark
406-
def doFastForGcd: Long = {
407-
var t: Long = 0L
408-
val len = size - 1
409-
fastFor(0)(_ < len, _ + 1) { i => t = t ^ gcd(arr(i), arr(i + 1)) }
410-
411-
val len2 = size / 2
412-
fastFor(0)(_ < len2, _ + 1) { i => t = t ^ gcd(arr(i + 3), arr(i + 2)) }
413-
414-
val len3 = size / 3
415-
fastFor(0)(_ < len3, _ + 1) { i => t = t ^ gcd(arr(i + 1), arr(i + 2)) }
416-
417-
t
418-
}
419-
420-
@Benchmark
421-
def doFastForIntArrayMultiply: Array[Long] = {
422-
val arr2 = arr.clone
423-
val len = size
424-
fastFor(0)(_ < len, _ + 1) { i =>
425-
{
426-
val value = arr2(i)
427-
arr2(i) = value * 2
428-
}
429-
}
430-
arr2
431-
}
432-
433374
}

0 commit comments

Comments
 (0)