math: use sorted-histogram values in a few places.

diff --git a/basis/math/matrices/matrices-tests.factor b/basis/math/matrices/matrices-tests.factor
index 02139fb856b1e2091ba717a94ef65848f6277bea..6d34bb8f937ee2e9c607e5adb4bfd8638cdea2c8 100644 (file)
--- a/basis/math/matrices/matrices-tests.factor
+++ b/basis/math/matrices/matrices-tests.factor
@@ -675,7 +675,7 @@ PRIVATE>
     { 0 1 2 }
     { 3 4 5 }
     { 6 7 8 }
-} matrix-except-all dup flatten sorted-histogram [ second ] map
+} matrix-except-all dup flatten sorted-histogram values
     { [ length 9 = ] [ [ 4 = ] all? ] }
     1&&
 ] unit-test
@@ -690,7 +690,7 @@ PRIVATE>
     { 4 5 6 7 }
     { 8 9 10 11 }
     { 12 13 14 15 }
-} matrix-except-all flatten sorted-histogram [ second ] map
+} matrix-except-all flatten sorted-histogram values
     { [ length 16 = ] [ [ 9 = ] all? ] }
     1&&
 ] unit-test

diff --git a/extra/benchmark/knucleotide/knucleotide.factor b/extra/benchmark/knucleotide/knucleotide.factor
index 67f563849cae27cd34caed1e896a9c42aa3dfe8a..34d5010f5de6cc33f98259e722dd8ac2981dfc61 100644 (file)
--- a/extra/benchmark/knucleotide/knucleotide.factor
+++ b/extra/benchmark/knucleotide/knucleotide.factor
@@ -19,7 +19,7 @@ CONSTANT: knucleotide-in "vocab:benchmark/knucleotide/knucleotide-input.txt"
 
 : handle-table ( inputs n -- )
     clump
-    [ histogram sort-values reverse ] [ length ] bi
+    [ sorted-histogram reverse ] [ length ] bi
     '[
         [ first write bl ]
         [ second 100 * _ /f "%.3f" printf nl ] bi