suzanne.soy/scribble-math
1
0
Fork 0
Code Issues 8 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Bugfix: simplify-times-rec now handles non-list*list correctly.

Browse Source
This commit is contained in:
Jens Axel Søgaard 2013-04-07 14:50:44 +02:00
parent a55fe0370a
commit c3acce9bab
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bracket/bracket.rkt
View File

@ -452,16 +452,23 @@
(construct (construct
'List 'List
(map (λ (u1i) (map (λ (u1i)
(construct 'Times (let ([us (simplify-times-rec (cons u2 (list u1i)))])
(simplify-times-rec (cons u2 (list u1i))))) ; If length(us)>=2 wrap with Times
(operands u1)))] (if (empty? (rest us))
(first us)
(construct 'Times us))))
(operands u1)))]
[(list-expression? u2) [(list-expression? u2)
(construct (construct
'List 'List
(map (λ (u2i) (map
(construct 'Times (λ (u2i)
(simplify-times-rec (cons u1 (list u2i))))) (let ([us (simplify-times-rec (cons u1 (list u2i)))])
(operands u2)))] ; If length(us)>=2 wrap with Times
(if (empty? (rest us))
(first us)
(construct 'Times us))))
(operands u2)))]
[(equal? (base u1) (base u2)) [(equal? (base u1) (base u2))
(define s (simplify-plus (list (exponent u1) (exponent u2)))) (define s (simplify-plus (list (exponent u1) (exponent u2))))
(define p (simplify-power (list (base u1) s))) (define p (simplify-power (list (base u1) s)))
@ -1342,6 +1349,8 @@
(check-equal? (Plus 3 (List 1 x)) (List 4 (Plus x 3))) (check-equal? (Plus 3 (List 1 x)) (List 4 (Plus x 3)))
(check-equal? (Plus y (List 1 x)) (List (Plus 1 y) (Plus x y))) (check-equal? (Plus y (List 1 x)) (List (Plus 1 y) (Plus x y)))
(check-equal? (Times (List 1 x)) (List 1 x)) (check-equal? (Times (List 1 x)) (List 1 x))
(check-equal? (Times (List 1 x) 4) (List 4 (Times 4 x)))
(check-equal? (Times 4 (List 1 x)) (List 4 (Times 4 x)))
(check-equal? (Times (List 1 2) (List 4 5)) (List 4 10)) (check-equal? (Times (List 1 2) (List 4 5)) (List 4 10))
(check-equal? (Power (List 3 x) 2) (List 9 (Power x 2))) (check-equal? (Power (List 3 x) 2) (List 9 (Power x 2)))
; No threading when lists are of different lenghts ; No threading when lists are of different lenghts