Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / profile-property-access.ly

diff --git a/input/regression/profile-property-access.ly b/input/regression/profile-property-access.ly
index 641c24fe70c092138b4bc1f9749819ef972684cc..0d31849fc84fd3329381be13c370e65c9c75d249 100644 (file)
--- a/input/regression/profile-property-access.ly
+++ b/input/regression/profile-property-access.ly
@@ -1,3 +1,5 @@
+% -*- Scheme -*-
+
 \header {
   texidoc = "This file profiles property accesses; the log file shows the top properties examined."
 }
@@ -5,18 +7,24 @@
 
 #(ly:set-option 'profile-property-accesses #t)
 
-\version "2.10.8"
+\version "2.11.51"
 
-%\include "../../input/typography-demo.ly"
-\book { \score { {c4 } } }
+\include "../../input/typography-demo.ly"
+%\book { \score { {c4 } } }
 
-#(define (prop-stats>?  x y) (> (cdr x) (cdr y)))
+#(define (prop-stats>?  x y)
+  (cond
+   ((> (cdr x) (cdr y)) #t)
+   ((= (cdr x) (cdr y))
+    (symbol<? (car x) (car y)))
+   (else #f)))
 
 #(define (display-stats what)
   (let*
    ((count 50)
     (rnd 10)
-    (alist (hash-table->alist (ly:property-lookup-stats what)))
+    (round-to (lambda (x) (* rnd (inexact->exact (round (/ x rnd))))))
+    (alist (map (lambda (entry) (cons (car entry) (round-to (cdr entry)))) (hash-table->alist (ly:property-lookup-stats what))))
     (total (apply + (map cdr alist)))
    )
 
@@ -25,8 +33,8 @@
   (ly:progress "\n\n~A properties, top ~a rounded to ~a\n\n~a"
    what count rnd
    (string-join
-    (map (lambda (x) (format "~30a: ~6@a" (car x) (* rnd (inexact->exact (round (/ (cdr x) rnd))))))
-     (take 
+    (map (lambda (x) (format "~30a: ~6@a" (car x) (cdr x)))
+     (ly:truncate-list! 
     (sort alist prop-stats>?) count))
     "\n"))))