From eb0fefec28cf9c089c55f1ef5de9c772faa61786 Mon Sep 17 00:00:00 2001 From: krasimir Date: Mon, 20 Oct 2008 08:42:39 +0000 Subject: preparation for dep. types. The -cat option can take any type instead of just a category. The PGF API is generalized as well. --- src/PGF/Generate.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/PGF/Generate.hs') diff --git a/src/PGF/Generate.hs b/src/PGF/Generate.hs index 518c2c71b..94be66245 100644 --- a/src/PGF/Generate.hs +++ b/src/PGF/Generate.hs @@ -8,8 +8,8 @@ import qualified Data.Map as M import System.Random -- generate an infinite list of trees exhaustively -generate :: PGF -> CId -> Maybe Int -> [Tree] -generate pgf cat dp = concatMap (\i -> gener i cat) depths +generate :: PGF -> Type -> Maybe Int -> [Tree] +generate pgf (DTyp _ cat _) dp = concatMap (\i -> gener i cat) depths where gener 0 c = [Fun f [] | (f, ([],_)) <- fns c] gener i c = [ @@ -24,8 +24,8 @@ generate pgf cat dp = concatMap (\i -> gener i cat) depths depths = maybe [0 ..] (\d -> [0..d]) dp -- generate an infinite list of trees randomly -genRandom :: StdGen -> PGF -> CId -> [Tree] -genRandom gen pgf cat = genTrees (randomRs (0.0, 1.0 :: Double) gen) cat where +genRandom :: StdGen -> PGF -> Type -> [Tree] +genRandom gen pgf (DTyp _ cat _) = genTrees (randomRs (0.0, 1.0 :: Double) gen) cat where timeout = 47 -- give up -- cgit v1.2.3