diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-04 01:58:13 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-04 01:58:13 +0000 |
| commit | 03ab6db167d40e2448dee7de702dc77a62e57617 (patch) | |
| tree | ce17fdb8da1be75b2ed9a1454d6320443deb342f /src/interp/guess.boot | |
| parent | e2618c92315f6b544e41c9b7d4cad92adcf98655 (diff) | |
| download | open-axiom-03ab6db167d40e2448dee7de702dc77a62e57617.tar.gz | |
cleanu up
Diffstat (limited to 'src/interp/guess.boot')
| -rw-r--r-- | src/interp/guess.boot | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interp/guess.boot b/src/interp/guess.boot index 16eaef47..7b59d6e4 100644 --- a/src/interp/guess.boot +++ b/src/interp/guess.boot @@ -288,14 +288,14 @@ canForgeWord(word,entry) == forge(word,w,W,entry,e,E,n) == w > W => e > E => n - QSADD1 QSPLUS(E-e,n) - e > E => QSADD1 QSPLUS(W-w,n) + QSPLUS(E-e,n) + 1 + e > E => QSPLUS(W-w,n) + 1 word.w = entry.e => forge(word,w+1,W,entry,e+1,E,n) - w=W or e=E => forge(word,w+1,W,entry,e+1,E,QSADD1 n) + w=W or e=E => forge(word,w+1,W,entry,e+1,E,n + 1) word.w=entry.(e+1) => - word.(w+1) = entry.e => forge(word,w+2,W,entry,e+2,E,QSADD1 n) - forge(word,w+1,W,entry,e+2,E,QSADD1 n) - word.(w+1)=entry.e => forge(word,w+2,W,entry,e+1,E,QSADD1 n) + word.(w+1) = entry.e => forge(word,w+2,W,entry,e+2,E,n + 1) + forge(word,w+1,W,entry,e+2,E,n + 1) + word.(w+1)=entry.e => forge(word,w+2,W,entry,e+1,E,n + 1) (deltaW := W-w) > 1 and (deltaE := E-e) > 1 => --if word is long, can we delete chars to match 2 consective chars @@ -308,9 +308,9 @@ forge(word,w,W,entry,e,E,n) == (k := or/[j for j in (e+2)..(E-1) | word.w = entry.j]) and word.(w+1) = entry.(k+1) => forge(word,w+2,W,entry,k+2,E,QSPLUS(n,k-e)) - forge(word,w+1,W,entry,e+1,E,QSADD1 n) + forge(word,w+1,W,entry,e+1,E,n + 1) --check for two consecutive matches down the line - forge(word,w+1,W,entry,e+1,E,QSADD1 n) + forge(word,w+1,W,entry,e+1,E,n + 1) --+ DO NOT REMOVE DEFINITIONS BELOW which explain the algorithm --+ canForgeWord(word,entry) ==-- |