From 5fd07ddf99ebf3d174d90faf535f984019f80986 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 6 Nov 2011 21:12:55 -0500 Subject: [PATCH] Fix more hlint issues in Grid tests. --- src/Grid.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Grid.hs b/src/Grid.hs index 624dd84..6627549 100644 --- a/src/Grid.hs +++ b/src/Grid.hs @@ -363,7 +363,7 @@ prop_cube_indices_never_go_out_of_bounds g = -- in opposite directions, one of them has to have negative volume! prop_c0120_identity :: Grid -> Property prop_c0120_identity g = - and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + xsize >= 3 && ysize >= 3 && zsize >= 3 ==> c t0 0 1 2 0 ~= (c t0 1 0 2 0 + c t10 1 0 0 2) / 2 where fvs = function_values g @@ -378,7 +378,7 @@ prop_c0120_identity g = -- 'prop_c0120_identity'. prop_c0111_identity :: Grid -> Property prop_c0111_identity g = - and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + xsize >= 3 && ysize >= 3 && zsize >= 3 ==> c t0 0 1 1 1 ~= (c t0 1 0 1 1 + c t10 1 0 1 1) / 2 where fvs = function_values g @@ -393,7 +393,7 @@ prop_c0111_identity g = -- 'prop_c0120_identity'. prop_c0201_identity :: Grid -> Property prop_c0201_identity g = - and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + xsize >= 3 && ysize >= 3 && zsize >= 3 ==> c t0 0 2 0 1 ~= (c t0 1 1 0 1 + c t10 1 1 1 0) / 2 where fvs = function_values g @@ -408,7 +408,7 @@ prop_c0201_identity g = -- 'prop_c0120_identity'. prop_c0102_identity :: Grid -> Property prop_c0102_identity g = - and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + xsize >= 3 && ysize >= 3 && zsize >= 3 ==> c t0 0 1 0 2 ~= (c t0 1 0 0 2 + c t10 1 0 2 0) / 2 where fvs = function_values g @@ -423,7 +423,7 @@ prop_c0102_identity g = -- 'prop_c0120_identity'. prop_c0210_identity :: Grid -> Property prop_c0210_identity g = - and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + xsize >= 3 && ysize >= 3 && zsize >= 3 ==> c t0 0 2 1 0 ~= (c t0 1 1 1 0 + c t10 1 1 0 1) / 2 where fvs = function_values g @@ -438,7 +438,7 @@ prop_c0210_identity g = -- 'prop_c0120_identity'. prop_c0300_identity :: Grid -> Property prop_c0300_identity g = - and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + xsize >= 3 && ysize >= 3 && zsize >= 3 ==> c t0 0 3 0 0 ~= (c t0 1 2 0 0 + c t10 1 2 0 0) / 2 where fvs = function_values g -- 2.43.2