worked thru parts of 1.3.4

diff --git a/src/sicp/ch1_3.clj b/src/sicp/ch1_3.clj
index ebf7a20d770d811b10a2bfee98efed89c5397e1f..5aaf159db314c146bdf1e862fb278a5a787acc45 100644 (file)
--- a/src/sicp/ch1_3.clj
+++ b/src/sicp/ch1_3.clj
@@ -92,4 +92,41 @@
 ;;;=> 3.162277660168379
 (mysqrt 4)
 ;;;=> 2.000000000000002
-)
\ No newline at end of file
+)
+
+;; section 1.3.4
+(defn average-damp [f]
+  (fn [x] (average x (f x))))
+
+(defn new-sqrt [x]
+  (fixed-point (average-damp (fn [y] (/ x y)))
+              1.0))
+
+(defn new-cuberoot [x]
+  (fixed-point (average-damp (fn [y] (/ x (square y))))
+              1.0))
+
+;; newton's method of root finding
+;; values of x for which g(x) = 0 is the same as
+;; fixed point of f(x) where f(x) = x - g(x)/Dg(x)
+;; where Dg(x) is the derivative of g(x)
+
+(def dx 0.00001)
+
+(defn deriv [g]
+  (fn [x] (/ (- (g (+ x dx))
+               (g x))
+            dx)))
+
+(defn newton-transform [g]
+  (fn [x] (- x
+            (/ (g x)
+               ((deriv g) x)))))
+
+(defn newton-method [g guess]
+  (fixed-point (newton-transform g)
+              1.0))
+
+(defn newton-sqrt [x]
+  (newton-method (fn [y] (- (square y) x))
+                1.0))
\ No newline at end of file

diff --git a/src/sicp/utils.clj b/src/sicp/utils.clj
index 3ab538c21ee69c20fc21d67698a5fbe9cd257d16..f5c3e9c6f04397a2466d1b7dc9760ad1d41e4ed1 100644 (file)
--- a/src/sicp/utils.clj
+++ b/src/sicp/utils.clj
@@ -35,8 +35,9 @@
     a
     (gcd b (rem a b))))
 
-(defn average [a b]
-  (/ (+ a b) 2.0))
+(defn average [ & coll]
+  (/ (reduce + coll)
+     (float (count coll))))
 
 (defmacro microbench
   " Evaluates the expression n number of times, returning the average