Fixed bug re: case sensitive library names; updated to sbt 0.12.4 and Scala 2.10.2

Author: Dragos Manolescu

build.sbt

@@ -26,7 +26,7 @@ scmInfo := Some(
 // organizationName := "My Company"
 
 /* scala versions and options */
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.2"
 
 // crossScalaVersions := Seq("2.9.1")
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.1
+sbt.version=0.12.4

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

@@ -10,7 +10,7 @@ import collection.immutable.{Set, HashMap}
 
 case class Experiment(exclude: Set[String], warmUpIterations: Int=5) {
 
-  val adaptorsToTest = Experiment.allAdaptors.filterNot(s => exclude.contains(s.getName))
+  val adaptorsToTest = Experiment.allAdaptors.filterNot(s => exclude.contains(s.getName.toLowerCase))
 
   val categories = Category
     .getFilesMatching("data", f => f.isDirectory)
@@ -19,9 +19,9 @@ case class Experiment(exclude: Set[String], warmUpIterations: Int=5) {
   def measureParsing(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, doMap = false, iterations, warmUpIterations))
-      }))
+      categories.flatMap(category => libraryAdaptors.map {
+        adaptor => category.name -> category.measure(adaptor, doMap = false, iterations, warmUpIterations)
+      })
     }
 
     println("Parsing measurement (%d warmup, %d iterations on %s)...".format(warmUpIterations, iterations, adaptorsToTest.map(_.getName).mkString(", ")))
@@ -31,9 +31,9 @@ case class Experiment(exclude: Set[String], warmUpIterations: Int=5) {
   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, doMap = true, iterations, warmUpIterations))
-      }))
+      categories.flatMap(category => libraryAdaptors.map {
+        adaptor => category.name -> category.measure(adaptor, doMap = true, iterations, warmUpIterations)
+      })
     }
 
     val targetAdaptors = adaptorsToTest.filter(_.hasMap)

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

@@ -11,9 +11,7 @@ import scala.collection.immutable.HashSet
 import com.microWorkflow.jsonScalaPerftest.output.{ConsoleReporter, ChartReporter}
 
 
-object Main {
-
-  def main(args: Array[String]) {
+object Main extends App {
     val argParser = new OptionParser()
     val listOpt = argParser.accepts("list", "List known JSON libraries.")
     val iterationsOpt = argParser
@@ -74,5 +72,4 @@ object Main {
       reporter.printResults()
     }
     sys.exit()
-  }
 }