From ce600b6aec7773150205fbfed8ff342adb84291f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Tue, 11 Mar 2008 21:58:50 -0500
Subject: [PATCH] Fix benchmarks

---
 extra/benchmark/crc32/crc32.factor         |  4 ++--
 extra/benchmark/mandel/mandel.factor       | 16 ++++++++--------
 extra/benchmark/random/random.factor       |  4 ++--
 extra/benchmark/raytracer/raytracer.factor |  6 +++---
 extra/benchmark/sort/sort.factor           |  6 ++++--
 5 files changed, 19 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 extra/benchmark/crc32/crc32.factor
 mode change 100644 => 100755 extra/benchmark/random/random.factor
 mode change 100644 => 100755 extra/benchmark/raytracer/raytracer.factor
 mode change 100644 => 100755 extra/benchmark/sort/sort.factor

diff --git a/extra/benchmark/crc32/crc32.factor b/extra/benchmark/crc32/crc32.factor
old mode 100644
new mode 100755
index 7dad272296..ec424e89c9
--- a/extra/benchmark/crc32/crc32.factor
+++ b/extra/benchmark/crc32/crc32.factor
@@ -1,10 +1,10 @@
-USING: io.crc32 io.files kernel math ;
+USING: io.crc32 io.encodings.ascii io.files kernel math ;
 IN: benchmark.crc32
 
 : crc32-primes-list ( -- )
     10 [
         "extra/math/primes/list/list.factor" resource-path
-        file-contents crc32 drop
+        ascii file-contents crc32 drop
     ] times ;
 
 MAIN: crc32-primes-list
diff --git a/extra/benchmark/mandel/mandel.factor b/extra/benchmark/mandel/mandel.factor
index 0f8c81da75..b890fdc8e8 100755
--- a/extra/benchmark/mandel/mandel.factor
+++ b/extra/benchmark/mandel/mandel.factor
@@ -1,7 +1,7 @@
 IN: benchmark.mandel
-USING: arrays io kernel math namespaces sequences strings sbufs
-math.functions math.parser io.files colors.hsv
-io.encodings.ascii ;
+USING: arrays io kernel math namespaces sequences
+byte-arrays byte-vectors math.functions math.parser io.files
+colors.hsv io.encodings.binary ;
 
 : max-color 360 ; inline
 : zoom-fact 0.8 ; inline
@@ -54,18 +54,18 @@ SYMBOL: cols
 : ppm-header ( w h -- )
     "P6\n" % swap # " " % # "\n255\n" % ;
 
-: sbuf-size width height * 3 * 100 + ;
+: buf-size width height * 3 * 100 + ;
 
-: mandel ( -- string )
+: mandel ( -- data )
     [
-        sbuf-size <sbuf> building set
+        buf-size <byte-vector> building set
         width height ppm-header
         nb-iter max-color min <color-map> cols set
         render
-        building get >string
+        building get >byte-array
     ] with-scope ;
 
 : mandel-main ( -- )
-    mandel "mandel.ppm" temp-file ascii set-file-contents ;
+    mandel "mandel.ppm" temp-file binary set-file-contents ;
 
 MAIN: mandel-main
diff --git a/extra/benchmark/random/random.factor b/extra/benchmark/random/random.factor
old mode 100644
new mode 100755
index 95c797cddd..775595709a
--- a/extra/benchmark/random/random.factor
+++ b/extra/benchmark/random/random.factor
@@ -1,10 +1,10 @@
-USING: io.files random math.parser io math ;
+USING: io.files io.encodings.ascii random math.parser io math ;
 IN: benchmark.random
 
 : random-numbers-path "random-numbers.txt" temp-file ;
 
 : write-random-numbers ( n -- )
-    random-numbers-path [
+    random-numbers-path ascii [
         [ 200 random 100 - number>string print ] times
     ] with-file-writer ;
 
diff --git a/extra/benchmark/raytracer/raytracer.factor b/extra/benchmark/raytracer/raytracer.factor
old mode 100644
new mode 100755
index 4bb8c30383..dbd1f5131b
--- a/extra/benchmark/raytracer/raytracer.factor
+++ b/extra/benchmark/raytracer/raytracer.factor
@@ -3,7 +3,7 @@
 
 USING: float-arrays compiler generic io io.files kernel math
 math.functions math.vectors math.parser namespaces sequences
-sequences.private words io.encodings.ascii ;
+sequences.private words io.encodings.binary ;
 IN: benchmark.raytracer
 
 ! parameters
@@ -167,9 +167,9 @@ DEFER: create ( level c r -- scene )
     levels { 0.0 -1.0 0.0 } 1.0 create ray-trace [
         size size pgm-header
         [ [ oversampling sq / pgm-pixel ] each ] each
-    ] "" make ;
+    ] B{ } make ;
 
 : raytracer-main
-    run "raytracer.pnm" temp-file ascii set-file-contents ;
+    run "raytracer.pnm" temp-file binary set-file-contents ;
 
 MAIN: raytracer-main
diff --git a/extra/benchmark/sort/sort.factor b/extra/benchmark/sort/sort.factor
old mode 100644
new mode 100755
index a54480692a..cd6189fe22
--- a/extra/benchmark/sort/sort.factor
+++ b/extra/benchmark/sort/sort.factor
@@ -1,8 +1,10 @@
 USING: kernel sequences sorting benchmark.random math.parser
-io.files ;
+io.files io.encodings.ascii ;
 IN: benchmark.sort
 
 : sort-benchmark
-    random-numbers-path file-lines [ string>number ] map natural-sort drop ;
+    random-numbers-path
+    ascii file-lines [ string>number ] map
+    natural-sort drop ;
 
 MAIN: sort-benchmark