msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

bottom-up and top-down filtering do not need fix point iteration.

Browse Source
This commit is contained in:
bringert
2007-06-27 17:46:34 +00:00
parent af36dcf13d
commit af45f33d51
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ cfgToFA opts s = minimize $ compileAutomaton start $ makeSimpleRegular opts s
makeSimpleRegular :: Options -> StateGrammar -> CFRules makeSimpleRegular :: Options -> StateGrammar -> CFRules
makeSimpleRegular opts s = makeRegular $ preprocess $ cfgToCFRules s makeSimpleRegular opts s = makeRegular $ preprocess $ cfgToCFRules s
where start = getStartCatCF opts s where start = getStartCatCF opts s
preprocess = fix (topDownFilter start . bottomUpFilter) preprocess = topDownFilter start . bottomUpFilter
. removeCycles . removeCycles

4
src/GF/Speech/SRG.hs
View File

@@ -93,10 +93,10 @@ makeSimpleSRG opt s = makeSRG preprocess opt s
. mergeIdentical . mergeIdentical
. traceStats "After removeLeftRecursion" . traceStats "After removeLeftRecursion"
. removeLeftRecursion origStart . removeLeftRecursion origStart
. fix (traceStats "After topDownFilter" . traceStats "After topDownFilter"
. topDownFilter origStart . topDownFilter origStart
. traceStats "After bottomUpFilter" . traceStats "After bottomUpFilter"
. bottomUpFilter) . bottomUpFilter
. traceStats "After removeCycles" . traceStats "After removeCycles"
. removeCycles . removeCycles
. traceStats "Inital CFG" . traceStats "Inital CFG"

1
src/GF/Speech/TransformCFG.hs
View File

@@ -109,7 +109,6 @@ bottomUpFilter gr = fix grow Map.empty
okSym g = symbol (`elem` allCats g) (const True) okSym g = symbol (`elem` allCats g) (const True)
-- | Removes categories which are not reachable from the start category. -- | Removes categories which are not reachable from the start category.
-- Only does one pass through the grammar.
topDownFilter :: Cat_ -> CFRules -> CFRules topDownFilter :: Cat_ -> CFRules -> CFRules
topDownFilter start rules = filterCFRulesCats (isRelatedTo uses start) rules topDownFilter start rules = filterCFRulesCats (isRelatedTo uses start) rules
where where