Changeset 5833 in project

Timestamp:

08/31/07 08:58:48 (12 years ago)

Author:

Ivan Raikov

Message:

Removed m from method definition structure.

File:

• nordsieck/trunk/nordsieck.scm (modified) (4 diffs)

nordsieck/trunk/nordsieck.scm

@@ -51 +51 @@
 (define-matrix-map f64)
 
-(define-record nordsieck-def order Ainv A B C V Econst d dhist dhistlen p1 p2 m n) 
+(define-record nordsieck-def order Ainv A B C V Econst d dhist dhistlen p1 p2 n) 
 
 (define-record-printer (nordsieck-def x out)
-  (fprintf out "#(nordsieck order=~A Ainv=~S A=~S B=~S C=~S V=~S Econst=~S d=~S dhist=~S p1=~S p2=~S m=~S n=~S)"
+  (fprintf out "#(nordsieck order=~A Ainv=~S A=~S B=~S C=~S V=~S Econst=~S d=~S dhist=~S p1=~S p2=~S n=~S)"
            (if (= blas:RowMajor (nordsieck-def-order x))
                "row" "col")
@@ -199 +199 @@
 
 (define (nordsieck-form order Econst a b . rest)
-  (let-optionals rest ((va #f) (vb #f) (dhistlen 3) (m 1))
+  (let-optionals rest ((va #f) (vb #f) (dhistlen 3))
     (let* ((implicit? (and va vb))
            (p1  (- (f64vector-length a) 1))
@@ -227 +227 @@
                     (print "C = " C)
                     (print "V = " V)
-                    (make-nordsieck-def order Ainv A B C V Econst d (list) dhistlen p1 p2 m n))))))))))
+                    (make-nordsieck-def order Ainv A B C V Econst d (list) dhistlen p1 p2 n))))))))))
 
   
 (define (nordsieck-step def h prev frhs)
   (let ((order (nordsieck-def-order def))
-        (m     (nordsieck-def-m def))
+        (p2     (nordsieck-def-p2 def))
         (n     (nordsieck-def-n def))
         (C     (nordsieck-def-C def))
@@ -238 +238 @@
   (let ((y0  (let ((v (matrix-zeros n 1)))
                (blas:dgemv! blas:NoTrans n n 1.0 C prev 0.0 v))))
-    (let loop ((i 0) (m m) (ym (list y0)))
-      (if (fx<= m 1)  ym
+    (let loop ((i 0) (m p2) (ym (list y0)))
+      (if (fx<= m 0)  ym
           (let ((yi  (let ((fy  (fp- (fp* h (frhs (f64vector-ref (car ym) 0))) 
                                      (fp* h (f64vector-ref (car ym) 1)))))