(math-nlfit-curve): Remove unnecessary variables.

(math-nlfit-givens): Let bind free variables.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d59206d14420f226f3ea6681cc76dbf1b52cfc30..2eaebcc0e9563110b0f4cb77841bfd8db232a68c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-05  Jay Belanger  <belanger@localhost.localdomain>
+
+       * calc/calc-nlfit.el (math-nlfit-curve):
+       Remove unnecessary variables.
+       (math-nlfit-givens): Let bind free variables.
+
 2007-08-05  Vinicius Jose Latorre  <viniciusig@ig.com.br>
 
        * printing.el: Require lpr and ps-print when loading printing package.

diff --git a/lisp/calc/calc-nlfit.el b/lisp/calc/calc-nlfit.el
index 2880ff837bd58404d6920f170a9d707720409655..489599781f65baecc849978d4d8c6ae3f7dc809d 100644 (file)
--- a/lisp/calc/calc-nlfit.el
+++ b/lisp/calc/calc-nlfit.el
@@ -373,7 +373,8 @@
                 (math-nlfit-set-elt d j dj))))
           (setq i (1+ i))))
       (setq j (1+ j)))
-    (let ((i n))
+    (let ((i n)
+          s)
       (while (>= i 1)
         (math-nlfit-set-elt r i 0)
         (setq s (math-nlfit-get-elt d i))
@@ -408,7 +409,8 @@
                                        (calcFunc-sqrt
                                         (math-sub 1 (math-mul gamma gamma)))))))
             (let ((ri (math-nlfit-get-elt r i))
-                  (rj (math-nlfit-get-elt r j)))
+                  (rj (math-nlfit-get-elt r j))
+                  h)
               (setq h (math-add (math-mul gamma rj)
                          (math-mul sigma ri)))
               (setq ri (math-sub
@@ -672,8 +674,6 @@
                      (mapcar (lambda (x) (math-get-sdev x t)) ydata)
                    nil))
           (ydata (mapcar (lambda (x) (math-get-value x)) ydata))
-          (zzz (progn (setq j1 xdata j2 ydata j3 sdata) 1))
-
           (calc-curve-varnames nil)
           (calc-curve-coefnames nil)
           (calc-curve-nvars 1)