Interleaved warm-up and measurement phases for adapters.

Author: Dragos Manolescu

src/main/scala/com/microWorkflow/jsonScalaPerftest/Category.scala

@@ -25,10 +25,14 @@ case class Category(directoryName: String, name: String) {
     sb.toString()
   }
 
-  def measure(adaptor: LibraryAdaptor, doMap: Boolean, iterations: Int): HashMap[String, Measurement] = {
+  def measure(adaptor: LibraryAdaptor, doMap: Boolean, iterations: Int, warmUp: Int): HashMap[String, Measurement] = {
     datasets.foldLeft(new HashMap[String, Measurement])((m,d) => {
+      print("Warming up... ")
+      adaptor.measure(d, doMap, warmUp)
       adaptor.resetTimers()
+      print(" Measuring...")
       adaptor.measure(d, doMap, iterations)
+      println(" Completed")
       m + (d.name -> Measurement.takeMeasurement(adaptor.timerName))
     })
   }

src/main/scala/com/microWorkflow/jsonScalaPerftest/Experiment.scala

@@ -29,27 +29,24 @@ case class Experiment(warmUpIterations: Int=5) {
     def run(iterations: Int, libraryAdaptors: Seq[LibraryAdaptor]): Array[(String, HashMap[String, Measurement])] = {
 
       categories.flatMap(category => (libraryAdaptors.map {
-        adaptor => (category.name -> category.measure(adaptor, false, iterations))
+        adaptor => (category.name -> category.measure(adaptor, false, iterations, warmUpIterations))
       }))
     }
-    println("Parsing warm up (%d iterations)...".format(warmUpIterations))
-    run(warmUpIterations, allAdaptors.toSeq)
-    println("Parsing measurement (%d iterations)...".format(iterations))
+
+    println("Parsing measurement (%d warmup, %d iterations)...".format(warmUpIterations, iterations))
     run(iterations, allAdaptors.toSeq)
   }
 
   def measureMapping(iterations: Int): Array[(String, HashMap[String, Measurement])] = {
     def run(iterations: Int, libraryAdaptors: Seq[LibraryAdaptor]): Array[(String, HashMap[String, Measurement])] = {
 
       categories.flatMap(category => (libraryAdaptors.map {
-        adaptor => (category.name -> category.measure(adaptor, true, iterations))
+        adaptor => (category.name -> category.measure(adaptor, true, iterations, warmUpIterations))
       }))
     }
 
     val targetAdaptors = allAdaptors.filter(_.hasMap)
-    println("Mapping warm up (%d iterations)...".format(warmUpIterations))
-    run(warmUpIterations, targetAdaptors)
-    println("Mapping measurement (%d iterations)...".format(iterations))
+    println("Mapping measurement (%d warmup, %d iterations)...".format(warmUpIterations, iterations))
     run(iterations, targetAdaptors)
   }