diff options
| author | bringert <bringert@cs.chalmers.se> | 2005-12-29 16:29:21 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2005-12-29 16:29:21 +0000 |
| commit | f4f1f04123d7dc33e9be65dd8c929bd4a21e193a (patch) | |
| tree | 394da7ba400ec719120ba5575221e72178a0960f /src/GF/Speech/CFGToFiniteState.hs | |
| parent | 5ad1ca8827064776bac896bdbd95c5efaaca7b69 (diff) | |
Finite state networks: replace some lookup tables with maps. Rewrite closure for speed.
Diffstat (limited to 'src/GF/Speech/CFGToFiniteState.hs')
| -rw-r--r-- | src/GF/Speech/CFGToFiniteState.hs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/GF/Speech/CFGToFiniteState.hs b/src/GF/Speech/CFGToFiniteState.hs index 25790786a..5f8e3a093 100644 --- a/src/GF/Speech/CFGToFiniteState.hs +++ b/src/GF/Speech/CFGToFiniteState.hs @@ -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 |