diff --git a/02.hs b/02.hs index 538fd47..6f396a0 100644 --- a/02.hs +++ b/02.hs @@ -104,13 +104,23 @@ nextExprsLists' newExprs oldExprs = let listNewExprs = [ e | e <- newExprs, type [concat [[e :+: e' | e <- listNewExprs, e' <- listNewExprs], [e :+: e' | e <- listNewExprs, e' <- listOldExprs], [e :+: e' | e <- listOldExprs, e' <- listNewExprs]], - concat [[SubList e from to | e <- listNewExprs, from <- intNewExprs, to <- intNewExprs], - [SubList e from to | e <- listOldExprs, from <- intNewExprs, to <- intNewExprs], - [SubList e from to | e <- listNewExprs, from <- intOldExprs, to <- intNewExprs], - [SubList e from to | e <- listNewExprs, from <- intNewExprs, to <- intOldExprs], - [SubList e from to | e <- listOldExprs, from <- intOldExprs, to <- intNewExprs], - [SubList e from to | e <- listOldExprs, from <- intNewExprs, to <- intOldExprs], - [SubList e from to | e <- listNewExprs, from <- intOldExprs, to <- intOldExprs]]] + concat [ + -- [SubList e from to | e <- listNewExprs, from <- intNewExprs, to <- intNewExprs], + -- [SubList e from to | e <- listOldExprs, from <- intNewExprs, to <- intNewExprs], + -- [SubList e from to | e <- listNewExprs, from <- intOldExprs, to <- intNewExprs], + -- [SubList e from to | e <- listNewExprs, from <- intNewExprs, to <- intOldExprs], + -- [SubList e from to | e <- listOldExprs, from <- intOldExprs, to <- intNewExprs], + -- [SubList e from to | e <- listOldExprs, from <- intNewExprs, to <- intOldExprs], + [SubList InList from to | -- e <- listNewExprs, + from <- intNewExprs, + to <- intNewExprs], + [SubList InList from to | -- e <- listNewExprs, + from <- intNewExprs, + to <- intOldExprs], + [SubList InList from to | -- e <- listNewExprs, + from <- intOldExprs, + to <- intNewExprs] + ]] nextExprs' :: [Expr] -> [Expr] -> [Expr] nextExprs' newExprs oldExprs = concatShuffle $ nextExprsLists' newExprs oldExprs