changes necessary to get the new chameneosredux onto shootout.alioth.debian.org .

it's now there: http://shootout.alioth.debian.org/u32q/benchmark.php?test=chameneosredux&lang=all&box=1!

R=r, rsc
CC=golang-dev
https://golang.org/cl/167043

diff --git a/test/bench/chameneosredux.go b/test/bench/chameneosredux.go
index 6fa89e49cf6058afa4e63b689e2fefb6992685a8..ce464dc2bcc13e5cb033838611b534566e6705fe 100644 (file)
--- a/test/bench/chameneosredux.go
+++ b/test/bench/chameneosredux.go
@@ -101,13 +101,13 @@ func main() {
                        fmt.Printf("%s + %s -> %s\n", colname[c0], colname[c1], colname[complement[c0|c1<<2]])
                }
        }
+       fmt.Print("\n");
 
        pallmall([]int{blue, red, yellow});
        pallmall([]int{blue, red, yellow, red, yellow, blue, red, yellow, red, blue});
 }
 
 func pallmall(cols []int) {
-       fmt.Print("\n");
 
        // invariant: meetingplace always contains a value unless a creature
        // is currently dealing with it (whereupon it must put it back).
@@ -126,9 +126,9 @@ func pallmall(cols []int) {
        for _ = range (cols) {
                result := <-ended;
                tot += result.met;
-               fmt.Println(result.met, spell(result.same, true));
+               fmt.Printf("%v%v\n", result.met, spell(result.same, true));
        }
-       fmt.Println(spell(tot, true));
+       fmt.Printf("%v\n\n", spell(tot, true));
 }
 
 // in this function, variables ending in 0 refer to the local creature,

diff --git a/test/bench/chameneosredux.txt b/test/bench/chameneosredux.txt
index cf7147723b19145539eddcbb51bc9d0aee4630a0..6016d59a8c9e65ce1b99a1763e24015e0158f19d 100644 (file)
--- a/test/bench/chameneosredux.txt
+++ b/test/bench/chameneosredux.txt
@@ -26,3 +26,4 @@ yellow + yellow -> yellow
 120 zero
 120 zero
  one two zero zero
+