diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-17 22:31:54 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-17 22:31:54 +0000 |
| commit | 24d0e78582cacadeb56a0e0efdd41ce5ff3a9354 (patch) | |
| tree | 7951b428f5aad10c800f7cc6b106e3a6ca4c3175 /src/interp/guess.boot | |
| parent | 16106617d450060382974643a59ecd481efe5bca (diff) | |
| download | open-axiom-24d0e78582cacadeb56a0e0efdd41ce5ff3a9354.tar.gz | |
more cleanup
Diffstat (limited to 'src/interp/guess.boot')
| -rw-r--r-- | src/interp/guess.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/guess.boot b/src/interp/guess.boot index 8aae3f5a..d247f49c 100644 --- a/src/interp/guess.boot +++ b/src/interp/guess.boot @@ -288,8 +288,8 @@ canForgeWord(word,entry) == forge(word,w,W,entry,e,E,n) == w > W => e > E => n - QSPLUS(E-e,n) + 1 - e > E => QSPLUS(W-w,n) + 1 + E-e + n + 1 + e > E => 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,n + 1) word.w=entry.(e+1) => @@ -302,12 +302,12 @@ forge(word,w,W,entry,e,E,n) == deltaW >= deltaE and (k := or/[j for j in (w+2)..(W-1) | word.j = entry.e]) and word.(k+1) = entry.(e+1) => - forge(word,k+2,W,entry,e+2,E,QSPLUS(k-w,n)) + forge(word,k+2,W,entry,e+2,E,k-w + n) deltaW <= deltaE and --if word is short, can we insert chars so as to match 2 consecutive chars (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+2,W,entry,k+2,E,n + k-e) 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,n + 1) |