changeset 3754:e63a3a6d7797

[project @ 2000-12-14 21:57:14 by jwe]
author jwe
date Thu, 14 Dec 2000 21:57:15 +0000
parents f751e43de300
children 4c230f72b1d2
files libcruft/ChangeLog libcruft/lapack/dgelss.f libcruft/lapack/zgelss.f liboctave/dMatrix.cc scripts/ChangeLog scripts/polynomial/deconv.m
diffstat 6 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/ChangeLog	Thu Dec 14 03:01:24 2000 +0000
+++ b/libcruft/ChangeLog	Thu Dec 14 21:57:15 2000 +0000
@@ -1,3 +1,9 @@
+2000-12-14  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* lapack/dgelss.f (DGELSS): Use correct leading dimension for
+	workspace array passed to dgemm and dlacpy.
+	(ZGELSS): Likewise, for calls to zgemm and zlacpy.
+
 2000-07-18  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (DISTSUBDIRS): New macro.
--- a/libcruft/lapack/dgelss.f	Thu Dec 14 03:01:24 2000 +0000
+++ b/libcruft/lapack/dgelss.f	Thu Dec 14 21:57:15 2000 +0000
@@ -491,8 +491,8 @@
             DO 40 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
                CALL DGEMM( 'T', 'N', M, BL, M, ONE, WORK( IL ), LDWORK,
-     $                     B( 1, I ), LDB, ZERO, WORK( IWORK ), N )
-               CALL DLACPY( 'G', M, BL, WORK( IWORK ), N, B( 1, I ),
+     $                     B( 1, I ), LDB, ZERO, WORK( IWORK ), M )
+               CALL DLACPY( 'G', M, BL, WORK( IWORK ), M, B( 1, I ),
      $                      LDB )
    40       CONTINUE
          ELSE
--- a/libcruft/lapack/zgelss.f	Thu Dec 14 03:01:24 2000 +0000
+++ b/libcruft/lapack/zgelss.f	Thu Dec 14 21:57:15 2000 +0000
@@ -512,8 +512,8 @@
             DO 40 I = 1, NRHS, CHUNK
                BL = MIN( NRHS-I+1, CHUNK )
                CALL ZGEMM( 'C', 'N', M, BL, M, CONE, WORK( IL ), LDWORK,
-     $                     B( 1, I ), LDB, CZERO, WORK( IWORK ), N )
-               CALL ZLACPY( 'G', M, BL, WORK( IWORK ), N, B( 1, I ),
+     $                     B( 1, I ), LDB, CZERO, WORK( IWORK ), M )
+               CALL ZLACPY( 'G', M, BL, WORK( IWORK ), M, B( 1, I ),
      $                      LDB )
    40       CONTINUE
          ELSE
--- a/liboctave/dMatrix.cc	Thu Dec 14 03:01:24 2000 +0000
+++ b/liboctave/dMatrix.cc	Thu Dec 14 21:57:15 2000 +0000
@@ -1186,7 +1186,7 @@
       double *tmp_data = atmp.fortran_vec ();
 
       int nrr = m > n ? m : n;
-      Matrix result (nrr, nrhs);
+      Matrix result (nrr, nrhs, 0.0);
 
       for (int j = 0; j < nrhs; j++)
 	for (int i = 0; i < m; i++)
--- a/scripts/ChangeLog	Thu Dec 14 03:01:24 2000 +0000
+++ b/scripts/ChangeLog	Thu Dec 14 21:57:15 2000 +0000
@@ -1,3 +1,8 @@
+2000-12-13   Teemu Ikonen  <tpikonen@pcu.helsinki.fi>
+
+        * polynomial/deconv.m: For compatibility with Matlab, don't reduce
+	  result polynomials.
+
 2000-12-07  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* image/saveimage.m: Don't try to create rawbit image.
--- a/scripts/polynomial/deconv.m	Thu Dec 14 03:01:24 2000 +0000
+++ b/scripts/polynomial/deconv.m	Thu Dec 14 21:57:15 2000 +0000
@@ -57,8 +57,6 @@
     b = 0;
   endif
 
-  b = polyreduce (b);
-
   lc = la + length (b) - 1;
   if (ly == lc)
     r = y - conv (a, b);
@@ -66,6 +64,4 @@
     r = [(zeros (1, lc - ly)), y] - conv (a, b);
   endif
 
-  r = polyreduce (r);
-
 endfunction