diff --git a/README.md b/README.md index 5d0c8db..39df81d 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,7 @@ To generate larger data sets for testing: To run the benchmarks: - $ sbt "test:runMain edu.luc.etl.osdi.processtree.scala.fakeps.BenchmarkFold" - $ sbt "test:runMain edu.luc.etl.osdi.processtree.scala.fakeps.BenchmarkArray" + $ sbt "test:runMain edu.luc.etl.osdi.processtree.scala.fakeps.Benchmark" $ sbt "test:runMain edu.luc.etl.osdi.processtree.scala.mutable.Benchmark" $ sbt "test:runMain edu.luc.etl.osdi.processtree.scala.groupby.Benchmark" $ sbt "test:runMain edu.luc.etl.osdi.processtree.scala.fold.Benchmark" diff --git a/src/test/scala/fakeps/Benchmark.scala b/src/test/scala/fakeps/Benchmark.scala new file mode 100644 index 0000000..08c42bd --- /dev/null +++ b/src/test/scala/fakeps/Benchmark.scala @@ -0,0 +1,21 @@ +package edu.luc.etl.osdi.processtree.scala +package fakeps + +import org.scalameter.api._ + +object Benchmark extends Bench.LocalTime { + + val sizes: Gen[Int] = Gen.exponential("processes")(10, 10000, 10) + + def measureMethod(f: Int => Iterator[(Int, Int)], label: String): Unit = + measure method label in { + using (sizes) in { n => + f(n) + } + } + + measureMethod(fakePsMutable, "fakePsMutable") + measureMethod(fakePsFold, "fakePsFold") + measureMethod(fakePsFoldSlow, "fakePsFoldSlow") + measureMethod(fakePsArray, "fakePsFoldArray") +} diff --git a/src/test/scala/fakeps/benchmarks.scala b/src/test/scala/fakeps/benchmarks.scala deleted file mode 100644 index 95d5f53..0000000 --- a/src/test/scala/fakeps/benchmarks.scala +++ /dev/null @@ -1,23 +0,0 @@ -package edu.luc.etl.osdi.processtree.scala -package fakeps - -import org.scalameter.api._ - -abstract class Benchmark(val f: Int => Iterator[(Int, Int)], val label: String) extends Bench.LocalTime { - - val sizes: Gen[Int] = Gen.exponential("processes")(10, 100000, 10) - - measure method label in { - using (sizes) in { n => - f(n) - } - } -} - -object BenchmarkMutable extends Benchmark(fakePsMutable, "fakePsMutable") - -object BenchmarkFold extends Benchmark(fakePsFold, "fakePsFold") - -object BenchmarkFoldSlow extends Benchmark(fakePsFoldSlow, "fakePsFoldSlow") - -object BenchmarkArray extends Benchmark(fakePsArray, "fakePsFoldSlow")