Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a009949f151de028c4bdea85780552117f5d0845 >--------------------------------------------------------------- commit a009949f151de028c4bdea85780552117f5d0845 Author: Ian Lynagh <[email protected]> Date: Wed Oct 10 17:59:03 2012 +0100 Whitespace only in dph/diophantine >--------------------------------------------------------------- tests/dph/diophantine/Main.hs | 43 ++++++++++++++--------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tests/dph/diophantine/DiophantineVect.hs b/tests/dph/diophantine/DiophantineVect.hs index 5851eb5..981b9ad 100644 diff --git a/tests/dph/diophantine/Main.hs b/tests/dph/diophantine/Main.hs index e3130f0..571566e 100644 --- a/tests/dph/diophantine/Main.hs +++ b/tests/dph/diophantine/Main.hs @@ -10,34 +10,33 @@ import Data.Array.Parallel.Prelude -- Solution for the 108th Euler problem. -- From the Haskell Wiki solution1 - = let primes = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73] - series _ 1 = [[0]] - series xs n = [x:ps | x <- xs, ps <- series [0..x] (n-1) ] - distinct = product . map (+1) - sumpri x = product $ zipWith (^) primes x + = let primes = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73] + series _ 1 = [[0]] + series xs n = [x:ps | x <- xs, ps <- series [0..x] (n-1) ] + distinct = product . map (+1) + sumpri x = product $ zipWith (^) primes x - prob x y = minimum [ (sumpri m ,m) - | m <- series [1..3] x - , (>y) $ distinct $ map (*2) m] - in prob 5 200 + prob x y = minimum [ (sumpri m ,m) + | m <- series [1..3] x + , (>y) $ distinct $ map (*2) m] + in prob 5 200 solution2 - = let primes = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73] - series _ 1 = [[0]] - series xs n = [x:ps | x <- xs, ps <- series [0..x] (n-1) ] - distinct xx = product [ x + 1 | x <- xx ] - sumpri xx = product $ zipWith (^) primes xx + = let primes = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73] + series _ 1 = [[0]] + series xs n = [x:ps | x <- xs, ps <- series [0..x] (n-1) ] + distinct xx = product [ x + 1 | x <- xx ] + sumpri xx = product $ zipWith (^) primes xx - prob x y = minimum [ (sumpri m ,m) - | m <- series [1..3] x - , (distinct $ map (*2) m) > y ] - in prob 5 200 + prob x y = minimum [ (sumpri m ,m) + | m <- series [1..3] x + , (distinct $ map (*2) m) > y ] + in prob 5 200 main - = do print solution1 - print solution2 - print solution3 + = do print solution1 + print solution2 + print solution3 - \ No newline at end of file _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
