From c954154b379c5bd444d527298c33142fb150711b Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 29 Aug 2011 19:14:55 -0400 Subject: [PATCH] Clean up some hLint warnings. --- src/Cube.hs | 2 +- src/Everything.hs | 37 +++++++++++++------------------------ src/Misc.hs | 4 ++-- src/Values.hs | 2 +- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/src/Cube.hs b/src/Cube.hs index 6263d2e..3f1669b 100644 --- a/src/Cube.hs +++ b/src/Cube.hs @@ -283,7 +283,7 @@ tetrahedron8 c = v1' = center (back_face c) v2' = Face.v0 (back_face c) v3' = Face.v1 (back_face c) - fv' = rotate cwy $ rotate cwy $ (Tetrahedron.fv (tetrahedron0 c)) + fv' = rotate cwy $ rotate cwy $ Tetrahedron.fv (tetrahedron0 c) tetrahedron9 :: Cube -> Tetrahedron tetrahedron9 c = diff --git a/src/Everything.hs b/src/Everything.hs index 096d18f..e25e724 100644 --- a/src/Everything.hs +++ b/src/Everything.hs @@ -1,29 +1,18 @@ -- | This module just imports the others. Useful in GHCi sessions. module Everything ( - module Cardinal, - module Comparisons, - module Cube, - module Examples, - module Face, - module FunctionValues, - module Grid, - module Misc, - module Point, - module RealFunction, - module Tetrahedron, - module Values + module X ) where -import Cardinal -import Comparisons -import Cube hiding (h) -import Examples -import Face hiding (v0,v1,v2,v3) -import FunctionValues -import Grid -import Misc -import Point -import RealFunction -import Tetrahedron hiding (fv) -import Values +import Cardinal as X +import Comparisons as X +import Cube as X hiding (h) +import Examples as X +import Face as X hiding (v0,v1,v2,v3) +import FunctionValues as X +import Grid as X +import Misc as X +import Point as X +import RealFunction as X +import Tetrahedron as X hiding (fv) +import Values as X diff --git a/src/Misc.hs b/src/Misc.hs index d3c7162..6b5a84d 100644 --- a/src/Misc.hs +++ b/src/Misc.hs @@ -46,8 +46,8 @@ transpose_xz m = | z <- [0..zsize]] where zsize = (length m) - 1 - ysize = (length (m !! 0))- 1 - xsize = (length ((m !! 0) !! 0)) - 1 + ysize = (length $ head m)- 1 + xsize = (length $ head $ head m) - 1 -- | Takes a list, and returns True if its elements are pairwise -- equal. Returns False otherwise. diff --git a/src/Values.hs b/src/Values.hs index dc45a3f..2efd80b 100644 --- a/src/Values.hs +++ b/src/Values.hs @@ -51,7 +51,7 @@ instance Arbitrary Values1D where read_values_1d :: FilePath -> IO Values1D -read_values_1d path = readVectorFromTextFile path +read_values_1d = readVectorFromTextFile read_values_3d :: DIM3 -> FilePath -> IO Values3D -- 2.43.2