Mercurial > octave-nkf

changeset 4566:30ba814d6700

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-10-29 15:06:29 by jwe]
author jwe
date Wed, 29 Oct 2003 15:06:29 +0000
parents 1db951a4fcd5
children fc30061d01da
files src/ChangeLog src/DLD-FUNCTIONS/balance.cc src/DLD-FUNCTIONS/qz.cc
diffstat 3 files changed, 16 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Oct 29 13:49:31 2003 +0000
+++ b/src/ChangeLog	Wed Oct 29 15:06:29 2003 +0000
@@ -1,5 +1,9 @@
 2003-10-29  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* DLD-FUNCTIONS/balance.cc: lscale and rscale args for dggbak are
+	const.  Use data() instead of fortran_vec where possible.
+	* DLD-FUNCTIONS/qz.cc: Likewise.
+
 	* data.cc (fill_matrix): Remove trailing singletons before
 	allocating the result matrix.
 
--- a/src/DLD-FUNCTIONS/balance.cc	Wed Oct 29 13:49:31 2003 +0000
+++ b/src/DLD-FUNCTIONS/balance.cc	Wed Oct 29 15:06:29 2003 +0000
@@ -55,8 +55,8 @@
   F77_FUNC (dggbak, DGGBAK) (F77_CONST_CHAR_ARG_DECL,
 			     F77_CONST_CHAR_ARG_DECL,
 			     const int& N, const int& ILO,
-			     const int& IHI, double* LSCALE,
-			     double* RSCALE, int& M,	double* V,
+			     const int& IHI, const double* LSCALE,
+			     const double* RSCALE, int& M, double* V,
 			     const int& LDV, int& INFO
 			     F77_CHAR_ARG_LEN_DECL
 			     F77_CHAR_ARG_LEN_DECL);
--- a/src/DLD-FUNCTIONS/qz.cc	Wed Oct 29 13:49:31 2003 +0000
+++ b/src/DLD-FUNCTIONS/qz.cc	Wed Oct 29 15:06:29 2003 +0000
@@ -73,8 +73,8 @@
   F77_FUNC (dggbak, DGGBAK) (F77_CONST_CHAR_ARG_DECL,
 			     F77_CONST_CHAR_ARG_DECL,
 			     const int& N, const int& ILO,
-			     const int& IHI, double* LSCALE,
-			     double* RSCALE, int& M, double* V,
+			     const int& IHI, const double* LSCALE,
+			     const double* RSCALE, int& M, double* V,
 			     const int& LDV, int& INFO
 			     F77_CHAR_ARG_LEN_DECL
 			     F77_CHAR_ARG_LEN_DECL);
@@ -471,9 +471,8 @@
       F77_XFCN (dggbak, DGGBAK,
 		(F77_CONST_CHAR_ARG2 (&bal_job, 1),
 		 F77_CONST_CHAR_ARG2 ("L", 1),
-		 nn, ilo, ihi, lscale.fortran_vec (),
-		 rscale.fortran_vec (), nn, QQ.fortran_vec (),
-		 nn, info
+		 nn, ilo, ihi, lscale.data (), rscale.data (),
+		 nn, QQ.fortran_vec (), nn, info
 		 F77_CHAR_ARG_LEN (1)
 		 F77_CHAR_ARG_LEN (1)));
 
@@ -495,9 +494,8 @@
       F77_XFCN (dggbak, DGGBAK,
 		(F77_CONST_CHAR_ARG2 (&bal_job, 1),
 		 F77_CONST_CHAR_ARG2 ("R", 1),
-		 nn, ilo, ihi, lscale.fortran_vec (),
-		 rscale.fortran_vec (), nn, ZZ.fortran_vec (),
-		 nn, info
+		 nn, ilo, ihi, lscale.data (), rscale.data (),
+		 nn, ZZ.fortran_vec (), nn, info
 		 F77_CHAR_ARG_LEN (1)
 		 F77_CHAR_ARG_LEN (1)));
 
@@ -662,8 +660,7 @@
 
 	  F77_XFCN (xdlange, XDLANGE,
 		    (F77_CONST_CHAR_ARG2 ("I", 1),
-		     nn, nn, aa.fortran_vec (), nn,
-		     work.fortran_vec (), inf_norm
+		     nn, nn, aa.data (), nn, work.fortran_vec (), inf_norm
 		     F77_CHAR_ARG_LEN (1)));
 
 	  double eps = DBL_EPSILON*inf_norm*nn;
@@ -759,6 +756,9 @@
 		    }
 #endif
 
+		  // XXX FIXME XXX -- probably should be using
+		  // fortran_vec instead of &aa(jj,jj) here.
+
 		  double scale1, scale2, wr1, wr2, wi;
 		  F77_XFCN (dlag2, DLAG2,
 			    (&aa(jj,jj), nn, &bb(jj,jj), nn, safmin,