Mercurial > forge

changeset 5661:b0a18692d685 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for 3.1.x
author adb014
date Mon, 18 May 2009 20:05:24 +0000
parents 52f21a12e35b
children b05917e0f0bb
files main/linear-algebra/DESCRIPTION main/linear-algebra/src/CmplxGSVD.cc main/linear-algebra/src/dbleGSVD.cc main/linear-algebra/src/gsvd.cc
diffstat 4 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/main/linear-algebra/DESCRIPTION	Mon May 18 19:48:50 2009 +0000
+++ b/main/linear-algebra/DESCRIPTION	Mon May 18 20:05:24 2009 +0000
@@ -1,12 +1,12 @@
 Name: Linear-Algebra
-Version: 1.0.7
-Date: 2009-05-03
+Version: 1.0.8
+Date: 2009-05-18
 Author: Various Authors
 Maintainer: The Octave Community
 Title: Linear Algebra.
 Description: Additional linear algebra code, including general SVD and matrix functions.
 Categories: Linear-Algebra
-Depends: octave (>= 2.9.7)
+Depends: octave (> 3.1.54)
 Autoload: yes
 License: GPL version 2 or later
 Url: http://octave.sf.net
--- a/main/linear-algebra/src/CmplxGSVD.cc	Mon May 18 19:48:50 2009 +0000
+++ b/main/linear-algebra/src/CmplxGSVD.cc	Mon May 18 20:05:24 2009 +0000
@@ -274,16 +274,16 @@
 	sigmaA.resize (l, l);
 	sigmaB.resize (l, l);
 	for (i = 0; i < l; i++) {
-	  sigmaA.xelem(i, i) = alpha.elem(k+i);
-	  sigmaB.xelem(i, i) = beta.elem(k+i);
+	  sigmaA.dgxelem(i) = alpha.elem(k+i);
+	  sigmaB.dgxelem(i) = beta.elem(k+i);
 	} 
       } else {
 	// Fills in C and S
 	sigmaA.resize (m-k, m-k);
 	sigmaB.resize (m-k, m-k);
 	for (i = 0; i < m-k; i++) {
-	  sigmaA.xelem(i, i) = alpha.elem(k+i);
-	  sigmaB.xelem(i, i) = beta.elem(k+i);
+	  sigmaA.dgxelem(i) = alpha.elem(k+i);
+	  sigmaB.dgxelem(i) = beta.elem(k+i);
 	}
       }
     }
--- a/main/linear-algebra/src/dbleGSVD.cc	Mon May 18 19:48:50 2009 +0000
+++ b/main/linear-algebra/src/dbleGSVD.cc	Mon May 18 20:05:24 2009 +0000
@@ -269,16 +269,16 @@
 	sigmaA.resize (l, l);
 	sigmaB.resize (l, l);
 	for (i = 0; i < l; i++) {
-	  sigmaA.xelem(i, i) = alpha.elem(k+i);
-	  sigmaB.xelem(i, i) = beta.elem(k+i);
+	  sigmaA.dgxelem(i) = alpha.elem(k+i);
+	  sigmaB.dgxelem(i) = beta.elem(k+i);
 	} 
       } else {
 	// Fills in C and S
 	sigmaA.resize (m-k, m-k);
 	sigmaB.resize (m-k, m-k);
 	for (i = 0; i < m-k; i++) {
-	  sigmaA.xelem(i, i) = alpha.elem(k+i);
-	  sigmaB.xelem(i, i) = beta.elem(k+i);
+	  sigmaA.dgxelem(i) = alpha.elem(k+i);
+	  sigmaB.dgxelem(i) = beta.elem(k+i);
 	}
       }
     }
--- a/main/linear-algebra/src/gsvd.cc	Mon May 18 19:48:50 2009 +0000
+++ b/main/linear-algebra/src/gsvd.cc	Mon May 18 20:05:24 2009 +0000
@@ -245,7 +245,7 @@
 		  DiagMatrix sigA =  result.singular_values_A ();
 		  DiagMatrix sigB =  result.singular_values_B ();
 		  for (int i = sigA.rows() - 1; i >=0; i--)
-		    sigA.xelem(i, i) /= sigB.xelem(i, i);
+		    sigA.dgxelem(i) /= sigB.dgxelem(i);
 		  retval(0) = sigA.diag();
 		}
 	      else
@@ -286,7 +286,7 @@
 		  DiagMatrix sigA =  result.singular_values_A ();
 		  DiagMatrix sigB =  result.singular_values_B ();
 		  for (int i = sigA.rows() - 1; i >=0; i--)
-		    sigA.xelem(i, i) /= sigB.xelem(i, i);
+		    sigA.dgxelem(i) /= sigB.dgxelem(i);
 		  retval(0) = sigA.diag();
 		}
 	      else