diff options
| author | krasimir <krasimir@chalmers.se> | 2008-10-20 08:42:39 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2008-10-20 08:42:39 +0000 |
| commit | eb0fefec28cf9c089c55f1ef5de9c772faa61786 (patch) | |
| tree | 8d9a8c88ea3bd7c6e5191c79a7722a0fdf76c1b6 /src/PGF/Generate.hs | |
| parent | 96bea5a0bbdf749ea6fc50b97e4740e44a56e814 (diff) | |
preparation for dep. types. The -cat option can take any type instead of just a category. The PGF API is generalized as well.
Diffstat (limited to 'src/PGF/Generate.hs')
| -rw-r--r-- | src/PGF/Generate.hs | 8 |
1 files changed, 4 insertions, 4 deletions
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 |