Author: andy
Date: Fri Mar 23 22:13:48 2012
New Revision: 1304627
URL: http://svn.apache.org/viewvc?rev=1304627&view=rev
Log:
Order tests by a key
Modified:
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala
Modified:
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala
URL:
http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala?rev=1304627&r1=1304626&r2=1304627&view=diff
==============================================================================
---
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala
(original)
+++
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala
Fri Mar 23 22:13:48 2012
@@ -168,7 +168,17 @@ class ReporterAgg(stream:OutputStream) e
out.write("Query , Average ms , Number , Total ms , Min ms ,
Max ms\n")
// Sort : really needs an id.
- names.reverse.foreach( name => {
+ val idRE = "\\D*(\\d+)(.?)"r
+ def id(x:String): Int = {
+ val idRE(a,b) = x ;
+ var z = a.toInt*100
+ if ( ! b.isEmpty() )
+ z += b.charAt(0).asDigit
+ return z ;
+ }
+ names = names.sortWith((a,b) => id(a) < id(b) )
+
+ names.foreach( name => {
val summary = mb.get(name).get
val avg = if ( summary.num == 0 ) 0.0 else (summary.total /
summary.num.asInstanceOf[Double])
out.write("%-15s , %10.2f , %6d ,".format(name, avg, summary.num))
