From b5ff89d417c73d74a42a1756cb3ecd99b7a3e7f4 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Wed, 12 Mar 2014 02:17:25 +1100 Subject: Removed some superfluous lambdas in intermediate functions --- Library/TermNet.hs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Library/TermNet.hs') diff --git a/Library/TermNet.hs b/Library/TermNet.hs index 6d87aa9..16b5446 100644 --- a/Library/TermNet.hs +++ b/Library/TermNet.hs @@ -33,7 +33,8 @@ import qualified Library.Stack as Stack -data TermNet = Leaf [(Theorem, Node)] | Branch [(String, TermNet)] deriving (Eq, Show) +data TermNet = Leaf [(Theorem, Node)] | Branch [(String, TermNet)] + deriving (Eq, Show) @@ -72,12 +73,15 @@ getBranchList net = genThm :: PGraph -> Node -> Theorem genThm graph node = - let gen = (\g n num -> let edge = filter (\x -> (fst . thd3 $ x) == num) (Graph.out g n) - node = (snd3 . head $ edge) - listing = write g node - in fromJust (((\(a,_,_,_) -> a) . fromJust $ (eval listing)) `at` 0)) + let gen g n num = + let edge = filter (\x -> (fst . thd3 $ x) == num) (Graph.out g n) + node = (snd3 . head $ edge) + listing = write g node + in fromJust (((\(a,_,_,_) -> a) . fromJust $ (eval listing)) `at` 0) + hypList = map (fromJust . objTerm) (fromJust . objList $ (gen graph node 2)) con = fromJust . objTerm $ (gen graph node 1) + in Theorem (Set.fromList hypList) con @@ -102,7 +106,7 @@ termToTermString term = thmToTermString :: Theorem -> [String] thmToTermString theorem = let hypList = Set.toList (thmHyp theorem) - f = (\soFar hyp -> soFar ++ ["hyp"] ++ (termToTermString hyp)) + f soFar hyp = soFar ++ ["hyp"] ++ (termToTermString hyp) in (foldl' f [] hypList) ++ ["con"] ++ (termToTermString . thmCon $ theorem) -- cgit