diff options
| author | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2012-01-16 13:01:16 +1100 |
|---|---|---|
| committer | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2012-01-16 13:01:16 +1100 |
| commit | db6d9cd7c4af39887394ea1145c1a2c3307e764a (patch) | |
| tree | 002ff7e03114cc7d871a4b0e458e67658ddaa9ea /testsuite/tests/dph/quickhull | |
| parent | 5601845d54bb0181f64bd807d6a6a8fc0a2c4f02 (diff) | |
| download | haskell-db6d9cd7c4af39887394ea1145c1a2c3307e764a.tar.gz | |
Adapt DPH tests to classes in the DPH library
Diffstat (limited to 'testsuite/tests/dph/quickhull')
| -rw-r--r-- | testsuite/tests/dph/quickhull/QuickHullVect.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/dph/quickhull/QuickHullVect.hs b/testsuite/tests/dph/quickhull/QuickHullVect.hs index 29aaa4a823..e0ad75858d 100644 --- a/testsuite/tests/dph/quickhull/QuickHullVect.hs +++ b/testsuite/tests/dph/quickhull/QuickHullVect.hs @@ -6,14 +6,14 @@ module QuickHullVect (quickhull) where import Types import Data.Array.Parallel -import Data.Array.Parallel.Prelude.Double +import Data.Array.Parallel.Prelude.Double as D import qualified Data.Array.Parallel.Prelude.Int as Int import qualified Prelude as P distance :: Point -> Line -> Double distance (xo, yo) ((x1, y1), (x2, y2)) - = (x1-xo) * (y2 - yo) - (y1 - yo) * (x2 - xo) + = (x1 D.- xo) D.* (y2 D.- yo) D.- (y1 D.- yo) D.* (x2 D.- xo) hsplit :: [:Point:] -> Line -> [:Point:] hsplit points line@(p1, p2) @@ -22,7 +22,7 @@ hsplit points line@(p1, p2) = concatP [: hsplit packed ends | ends <- [:(p1, pm), (pm, p2):] :] where cross = [: distance p line | p <- points :] - packed = [: p | (p,c) <- zipP points cross, c > 0.0 :] + packed = [: p | (p,c) <- zipP points cross, c D.> 0.0 :] pm = points !: maxIndexP cross quickHull' :: [:Point:] -> [:Point:] |