From d343170831a7dd32e9a6e04fb686939cdcbb93d8 Mon Sep 17 00:00:00 2001 From: Felix Martin Date: Fri, 13 Nov 2020 11:38:23 -0500 Subject: [PATCH] Add tests to 2.58 --- ex-2_53-xx.scm => ex-2_53-58.scm | 32 ++++++++++++++++++++++---------- ex-2_59-xx.scm | 6 ++++++ 2 files changed, 28 insertions(+), 10 deletions(-) rename ex-2_53-xx.scm => ex-2_53-58.scm (91%) create mode 100644 ex-2_59-xx.scm diff --git a/ex-2_53-xx.scm b/ex-2_53-58.scm similarity index 91% rename from ex-2_53-xx.scm rename to ex-2_53-58.scm index f3f7a53..69368d1 100644 --- a/ex-2_53-xx.scm +++ b/ex-2_53-58.scm @@ -222,18 +222,30 @@ (else (go-multiplicand (cddr s))))) (lift (go-multiplicand s))) +(define s '(a * b * (c * e) + d)) +(define p '(a * b * (c + e) * d)) + +; some tests +(assert (sum? p) #f) +(assert (sum? s) #t) +(assert (product? p) #t) +(assert (product? s) #f) +(assert (multiplier p) 'a) +(assert (multiplicand p) '(b * (c + e) * d)) +(assert (addend s) '(a * b * (c * e))) +(assert (augend s) 'd) +(assert (product? '(x * x + x)) #f) +(assert (multiplier '(x * x * x)) 'x) +(assert (multiplicand '(x * x * x)) '(x * x)) +(assert (addend '(a + b)) 'a) +(assert (augend '(a + b)) 'b) +(assert (multiplier '(a * b)) 'a) +(assert (multiplicand '(a * b)) 'b) +(assert (product? '(x * x + x)) #f) +(assert (sum? '(x * x + x)) #t) + (define x-infix '(x + 3 * (x + y + 2))) -;(display (sum? x-infix)) (newline) -;(display (product? x-infix)) (newline) -;(display (addend x-infix)) (newline) -;(display (augend x-infix)) (newline) -;(display (multiplier x-infix)) (newline) -;(display (multiplicand x-infix)) (newline) (display x-infix) (newline) (display (deriv x-infix 'x)) (newline) -(display "\nex-2.59") (newline) - - -(display "\nex-2.60") (newline) diff --git a/ex-2_59-xx.scm b/ex-2_59-xx.scm new file mode 100644 index 0000000..b2f80f9 --- /dev/null +++ b/ex-2_59-xx.scm @@ -0,0 +1,6 @@ +(load "util.scm") + +(display "\nex-2.59") (newline) + + +(display "\nex-2.60") (newline)