GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-01 15:22:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Finite state networks: replace some lookup tables with maps. Rewrite closure for speed.

Browse Source
This commit is contained in:
bringert
2005-12-29 16:29:21 +00:00
parent 999cb3bc07
commit 72c2289857
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/GF/Speech/CFGToFiniteState.hs
View File

@@ -130,8 +130,10 @@ make_fa c@(g,ns) q0 alpha q1 fa =
fa''' = foldl (\f (CFRule c (Cat d:xs) _) -> make_fa_ (getState d) xs (getState c) f) fa'' rs
in newTransition (getState a) q1 Nothing fa'''
where
(fa',ss) = addStatesForCats ni fa
getState x = lookup' x ss
(fa',stateMap) = addStatesForCats ni fa
getState x = Map.findWithDefault
(error $ "CFGToFiniteState: No state for " ++ x)
x stateMap
-- a is not recursive
Nothing -> let rs = catRules g a
in foldl (\fa -> \ (CFRule _ b _) -> make_fa_ q0 b q1 fa) fa rs
@@ -140,9 +142,10 @@ make_fa c@(g,ns) q0 alpha q1 fa =
where
make_fa_ = make_fa c
addStatesForCats :: [Cat_] -> NFA Token -> (NFA Token, [(Cat_,State)])
addStatesForCats cs fa = (fa', zip cs (map fst ns))
addStatesForCats :: [Cat_] -> NFA Token -> (NFA Token, Map Cat_ State)
addStatesForCats cs fa = (fa', m)
where (fa', ns) = newStates (replicate (length cs) ()) fa
m = Map.fromList (zip cs (map fst ns))
ruleIsNonRecursive :: Set Cat_ -> CFRule_ -> Bool
ruleIsNonRecursive cs = noCatsInSet cs . ruleRhs