From f24b9140d6f74804d5599ec225717d38ca443813 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:26 -0800 Subject: Import Upstream version 2c0 --- root.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'root.scm') diff --git a/root.scm b/root.scm index 5ba78c1..3c764a6 100644 --- a/root.scm +++ b/root.scm @@ -1,5 +1,5 @@ ;;;"root.scm" Newton's and Laguerre's methods for finding roots. -;Copyright (C) 1996 Aubrey Jaffer +;Copyright (C) 1996, 1997 Aubrey Jaffer ; ;Permission to copy this software, to redistribute it, and to use it ;for any purpose is granted, subject to the following restrictions and @@ -17,6 +17,8 @@ ;promotional, or sales literature without prior written consent in ;each case. +(require 'logical) + ;;;; Newton's Method explained in: ;;; D. E. Knuth, "The Art of Computer Programming", Vol 2 / ;;; Seminumerical Algorithms, Reading Massachusetts, Addison-Wesley @@ -95,7 +97,7 @@ (let* ((df (df/dz z)) (ddf (ddf/dz^2 z)) (disc (sqrt (- (* df df) (* fz ddf))))) - (print 'disc disc) + ;;(print 'disc disc) (if (zero? disc) #f (let* ((next-z @@ -105,9 +107,9 @@ (imag-part disc)))) (- disc) disc)))) (next-delta-z (magnitude (- next-z z)))) - (print 'next-z next-z ) - (print '(f next-z) (f next-z)) - (print 'delta-z delta-z 'next-delta-z next-delta-z) + ;;(print 'next-z next-z ) + ;;(print '(f next-z) (f next-z)) + ;;(print 'delta-z delta-z 'next-delta-z next-delta-z) (cond ((zero? next-delta-z) z) ((and delta-z (>= next-delta-z delta-z)) z) (else -- cgit v1.2.3