suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction to default probability calculation.

Browse Source 
More tweaking of the profj grammars

svn: r7032
This commit is contained in:
Kathy Gray 2007-08-06 15:17:19 +00:00
parent aa871e90bd
commit dbe82ab7d7
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
collects/combinator-parser/private-combinator/combinator.scm
View File

@ -391,14 +391,12 @@
#;(when (pair? look-back) #;(when (pair? look-back)
(printf "look-back is a pair~n")) (printf "look-back is a pair~n"))
#;(when (res? look-back) #;(when (res? look-back)
(printf "lookbac is a res, ~a~n" (fail-type? (res-possible-error look-back)))) (printf "lookback is a res, ~a~n" (fail-type? (res-possible-error look-back))))
(let* ([seq-fail-maker (let* ([seq-fail-maker
(lambda (fail) (lambda (fail)
(let-values ([(kind expected found) (get-fail-info fail)]) (let-values ([(kind expected found) (get-fail-info fail)])
(make-sequence-fail (make-sequence-fail
(cond (compute-chance len seen-len used alts (fail-type-chance fail))
[(= 0 used) (fail-type-chance fail)]
[else (compute-chance len seen-len used alts (fail-type-chance fail))])
(fail-type-src fail) (fail-type-src fail)
name used name used
(+ used (fail-type-may-use fail) next-used) (+ used (fail-type-may-use fail) next-used)
@ -419,18 +417,20 @@
seq-fail))))])))) seq-fail))))]))))
(define (compute-chance expected-length seen-length used-toks num-alts sub-chance) (define (compute-chance expected-length seen-length used-toks num-alts sub-chance)
(let* ([revised-expectation (+ (- used-toks seen-length) expected-length)] (if (zero? used-toks)
[probability-with-sub (* (/ (add1 used-toks) revised-expectation) (/ 1 num-alts))] (* (* (/ 1 expected-length) (/ 1 num-alts)) sub-chance)
[probability-without-sub (* (/ used-toks revised-expectation) (/ 1 num-alts))] (let* ([revised-expectation (+ (- used-toks seen-length) expected-length)]
[expected-sub probability-with-sub] [probability-with-sub (* (/ (add1 used-toks) revised-expectation) (/ 1 num-alts))]
[expected-no-sub probability-without-sub] [probability-without-sub (* (/ used-toks revised-expectation) (/ 1 num-alts))]
[probability (/ (* expected-sub sub-chance) (+ (* expected-sub sub-chance) [expected-sub probability-with-sub]
(* expected-no-sub (- 1 sub-chance))))]) [expected-no-sub probability-without-sub]
#;(printf "compute-chance: args ~a ~a ~a ~a ~a~n" [probability (/ (* expected-sub sub-chance) (+ (* expected-sub sub-chance)
expected-length seen-length used-toks num-alts sub-chance) (* expected-no-sub (- 1 sub-chance))))])
#;(printf "compute-chance: intermediate values: ~a ~a ~a ~a ~a~n" #;(printf "compute-chance: args ~a ~a ~a ~a ~a~n"
revised-expectation probability-with-sub probability-without-sub expected-sub expected-no-sub) expected-length seen-length used-toks num-alts sub-chance)
probability)) #;(printf "compute-chance: intermediate values: ~a ~a ~a ~a ~a~n"
revised-expectation probability-with-sub probability-without-sub expected-sub expected-no-sub)
probability)))
;greedy-repeat: (list 'a) -> result -> (list 'a) -> result ;greedy-repeat: (list 'a) -> result -> (list 'a) -> result
(define (repeat-greedy sub) (define (repeat-greedy sub)

10
collects/profj/comb-parsers/parser-units.scm
View File

@ -777,7 +777,15 @@
(repeat-greedy (choose (class interface) "class or interface")))) (repeat-greedy (choose (class interface) "class or interface"))))
(define interact (define interact
(choose (field (statement-c #t) expression) "interactive program")) (choose (field
(if-s (block #t) #f)
(return-s #t)
(assignment
(choose (identifier
(sequence (unique-base (repeat unique-end) field-access-end) id))
"assignee") EQUAL)
(block #t)
expression) "interactive program"))
) )