Commit abef4026 authored by sof's avatar sof
Browse files

[project @ 1998-05-05 11:34:20 by sof]

Misc changes to make .std{out,err} files compat with 3.02 output
parent bde010e3
This diff is collapsed.
[1, 1, 1, 2, 4, 8, 17, 39, 89, 211, 507, 1238, 3057, 7639, 19241, 48865, 124906, 321198]
[0, 1, 0, 1, 0, 3, 0, 10, 0, 36, 0, 153, 0, 780, 0, 4005, 0]
[1, 0, 1, 1, 3, 2, 9, 8, 35, 39, 159, 202, 802, 1078, 4347, 6354, 24894]
[1, 1, 1, 2, 3, 5, 9, 18, 35, 75, 159, 355, 802, 1858, 4347, 10359, 24894]
[1,1,1,2,4,8,17,39,89,211,507,1238,3057,7639,19241,48865,124906,321198]
[0,1,0,1,0,3,0,10,0,36,0,153,0,780,0,4005,0]
[1,0,1,1,3,2,9,8,35,39,159,202,802,1078,4347,6354,24894]
[1,1,1,2,3,5,9,18,35,75,159,355,802,1858,4347,10359,24894]
[("Simon", [("Gold", (74, [19, 34, 21])), ("Gold", (102, [35, 27, 40]))]), ("Hans", [("Gold", (70, [45, 17, 8])), ("Bronze", (52, [23, 19, 10]))]), ("Phil", [("Gold", (70, [1, 35, 34])), ("Silver", (60, [18, 21, 21])), ("Bronze", (55, [20, 19, 16]))]), ("Kevin", [("Gold", (72, [9, 54, 9])), ("Gold", (72, [17, 41, 14])), ("Bronze", (59, [23, 18, 18]))])]
[("Simon",[("Gold",(74,[19,34,21])),("Gold",(102,[35,27,40]))]),("Hans",[("Gold",(70,[45,17,8])),("Bronze",(52,[23,19,10]))]),("Phil",[("Gold",(70,[1,35,34])),("Silver",(60,[18,21,21])),("Bronze",(55,[20,19,16]))]),("Kevin",[("Gold",(72,[9,54,9])),("Gold",(72,[17,41,14])),("Bronze",(59,[23,18,18]))])]
YesIts 113994 [('w', 16), ('r', 17), ('o', 11), ('m', 17), ('l', 11), ('x', 2), ('n', 11), ('i', 4), ('f', 10), ('h', 3), ('g', 0), ('t', 5), ('d', 0), ('a', 0), ('s', 2), ('c', 0), ('e', 1)]
\ No newline at end of file
YesIts 113994 [('w',16),('r',17),('o',11),('m',17),('l',11),('x',2),('n',11),('i',4),('f',10),('h',3),('g',0),('t',5),('d',0),('a',0),('s',2),('c',0),('e',1)]
\ No newline at end of file
......@@ -6,7 +6,7 @@ Tree:
-[a ]
Labelled graph:
[(0, "a", [])]
[(0,"a",[])]
Simplified tree:
-[0:a ]
......@@ -21,8 +21,8 @@ Tree:
`-[a ]
Labelled graph:
[(0, "+", [2, 2]),
(2, "a", [])]
[(0,"+",[2,2]),
(2,"a",[])]
Simplified tree:
-[0:+ ]-+-[2:a ]
......@@ -43,10 +43,10 @@ Tree:
`-[b ]
Labelled graph:
[(0, "+", [4, 4]),
(4, "*", [5, 6]),
(5, "a", []),
(6, "b", [])]
[(0,"+",[4,4]),
(4,"*",[5,6]),
(5,"a",[]),
(6,"b",[])]
Simplified tree:
-[0:+ ]-+-[4:* ]-+-[5:a ]
......@@ -71,12 +71,12 @@ Tree:
`-[b ]
Labelled graph:
[(0, "+", [1, 6]),
(1, "*", [6, 5]),
(5, "c", []),
(6, "+", [7, 8]),
(7, "a", []),
(8, "b", [])]
[(0,"+",[1,6]),
(1,"*",[6,5]),
(5,"c",[]),
(6,"+",[7,8]),
(7,"a",[]),
(8,"b",[])]
Simplified tree:
-[0:+ ]-+-[1:* ]-+-[6:+ ]-+-[7:a ]
......@@ -123,16 +123,16 @@ Tree:
`-[d ]
Labelled graph:
[(0, "X", [21, 20, 19, 18, 17]),
(17, "+", [18, 25]),
(18, "+", [19, 24]),
(19, "+", [20, 23]),
(20, "+", [21, 22]),
(21, "0", []),
(22, "a", []),
(23, "b", []),
(24, "c", []),
(25, "d", [])]
[(0,"X",[21,20,19,18,17]),
(17,"+",[18,25]),
(18,"+",[19,24]),
(19,"+",[20,23]),
(20,"+",[21,22]),
(21,"0",[]),
(22,"a",[]),
(23,"b",[]),
(24,"c",[]),
(25,"d",[])]
Simplified tree:
-[0:X ]-+-[21:0]
......@@ -189,16 +189,16 @@ Tree:
`-[0 ]
Labelled graph:
[(0, "X", [1, 10, 17, 22, 25]),
(1, "+", [2, 10]),
(2, "a", []),
(10, "+", [11, 17]),
(11, "b", []),
(17, "+", [18, 22]),
(18, "c", []),
(22, "+", [23, 25]),
(23, "d", []),
(25, "0", [])]
[(0,"X",[1,10,17,22,25]),
(1,"+",[2,10]),
(2,"a",[]),
(10,"+",[11,17]),
(11,"b",[]),
(17,"+",[18,22]),
(18,"c",[]),
(22,"+",[23,25]),
(23,"d",[]),
(25,"0",[])]
Simplified tree:
-[0:X ]-+-[1:+ ]-+-[2:a ]
......
......@@ -110,4 +110,11 @@ corner = nonet corner2 side2 side2 (rot side2) u (rot t) (rot side2) (rot t)
(rot q)
squarelimit = cycle' corner
main = putStrLn (show (pseudolimit (0, 0) (640, 0) (0,640)))
-- sof: to make it easier to compare outputs, format the vector pairs on sep. lines
fmt [] = "[]"
fmt (x:xs) = (showString "[\n" . showsPrec 0 x . showl xs) ""
where
showl [] = showChar ']'
showl (x:xs) = showString ",\n" . showsPrec 0 x . showl xs
main = putStrLn (fmt (pseudolimit (0, 0) (640, 0) (0,640)))
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment