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

Fixed bug: Multiplication of lists now work

Browse Source
This commit is contained in:
Jens Axel Søgaard 2013-04-07 14:11:04 +02:00
parent 26af3eb5ba
commit 3b253b7aca
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bracket/bracket.rkt
View File

@ -394,7 +394,7 @@
(define/memo (simplify-times ops) (define/memo (simplify-times ops)
;(displayln (list 'simplify-times ops)) ;(displayln (list 'simplify-times ops))
; the operands os are simplified ; the operands ops are simplified
; (Times op1 op2 op ...) ; (Times op1 op2 op ...)
; - n-ary, n>=2 ; - n-ary, n>=2
; - no operands are products ; - no operands are products
@ -439,8 +439,10 @@
[(and (list-expression? u1) (list-expression? u2) [(and (list-expression? u1) (list-expression? u2)
(= (length u1) (length u2))) (= (length u1) (length u2)))
(construct (construct
'List (append-map (λ (u1i u2i) (simplify-times-rec (list u1i u2i))) 'List (map
(operands u1) (operands u2)))] (λ (u1i u2i)
(construct 'Times (simplify-times-rec (list u1i u2i))))
(operands u1) (operands u2)))]
[(and (list-expression? u1) (list-expression? u2)) [(and (list-expression? u1) (list-expression? u2))
; lists of different lengths => do nothing ; lists of different lengths => do nothing
(list u1 u2)] (list u1 u2)]
@ -895,7 +897,7 @@
(Expand-product (Expand v) (Expand-product (Expand v)
(Expand (Quotient u v)))) (Expand (Quotient u v))))
(Expand-product (Expand v) (Expand-product (Expand v)
(Expand (Quotient u v)))] (Expand (Quotient u v)))]
[(Power) [(Power)
(define base (Operand u 0)) (define base (Operand u 0))
(define exponent (Operand u 1)) (define exponent (Operand u 1))