Mercurial > octave-nkf

changeset 6242:64bad7c6a607

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-01-16 07:03:51 by jwe]
author jwe
date Tue, 16 Jan 2007 07:03:52 +0000
parents b84b59b614c5
children 7924a9086c08
files liboctave/ChangeLog liboctave/dSparse.cc liboctave/oct-fftw.h src/ChangeLog src/DLD-FUNCTIONS/__pchip_deriv__.cc src/DLD-FUNCTIONS/fftw.cc
diffstat 6 files changed, 43 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Thu Jan 11 07:35:52 2007 +0000
+++ b/liboctave/ChangeLog	Tue Jan 16 07:03:52 2007 +0000
@@ -1,3 +1,10 @@
+2007-01-16  John W. Eaton  <jwe@octave.org>
+
+	* dSparse.cc: Fix dgbtrf decl for --enable-64.
+	(SparseMatrix::bsolve): Fix call to dgbtrf for --enable-64
+
+	* oct-fftw.h (fftw_planner): Provide decl.
+
 2007-01-11  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* Makefile.in (LINK_DEPS): Include $(CAMD_LIBS) in the list.
--- a/liboctave/dSparse.cc	Thu Jan 11 07:35:52 2007 +0000
+++ b/liboctave/dSparse.cc	Tue Jan 16 07:03:52 2007 +0000
@@ -59,8 +59,10 @@
 extern "C"
 {
   F77_RET_T
-  F77_FUNC (dgbtrf, DGBTRF) (const octave_idx_type&, const int&, const octave_idx_type&, 
-			     const octave_idx_type&, double*, const octave_idx_type&, octave_idx_type*, octave_idx_type&);
+  F77_FUNC (dgbtrf, DGBTRF) (const octave_idx_type&, const octave_idx_type&,
+			     const octave_idx_type&, const octave_idx_type&,
+			     double*, const octave_idx_type&,
+			     octave_idx_type*, octave_idx_type&);
 
   F77_RET_T
   F77_FUNC (dgbtrs, DGBTRS) (F77_CONST_CHAR_ARG_DECL, const octave_idx_type&,
@@ -4536,9 +4538,9 @@
       if (typ == MatrixType::Banded)
 	{
 	  // Create the storage for the banded form of the sparse matrix
-	  int n_upper = mattype.nupper ();
-	  int n_lower = mattype.nlower ();
-	  int ldm = n_upper + 2 * n_lower + 1;
+	  octave_idx_type n_upper = mattype.nupper ();
+	  octave_idx_type n_lower = mattype.nlower ();
+	  octave_idx_type ldm = n_upper + 2 * n_lower + 1;
 
 	  Matrix m_band (ldm, nc);
 	  double *tmp_data = m_band.fortran_vec ();
@@ -4692,8 +4694,8 @@
 
       if (typ == MatrixType::Banded_Hermitian)
 	{
-	  int n_lower = mattype.nlower ();
-	  int ldm = n_lower + 1;
+	  octave_idx_type n_lower = mattype.nlower ();
+	  octave_idx_type ldm = n_lower + 1;
 
 	  Matrix m_band (ldm, nc);
 	  double *tmp_data = m_band.fortran_vec ();
@@ -5206,9 +5208,9 @@
       if (typ == MatrixType::Banded)
 	{
 	  // Create the storage for the banded form of the sparse matrix
-	  int n_upper = mattype.nupper ();
-	  int n_lower = mattype.nlower ();
-	  int ldm = n_upper + 2 * n_lower + 1;
+	  octave_idx_type n_upper = mattype.nupper ();
+	  octave_idx_type n_lower = mattype.nlower ();
+	  octave_idx_type ldm = n_upper + 2 * n_lower + 1;
 
 	  Matrix m_band (ldm, nc);
 	  double *tmp_data = m_band.fortran_vec ();
@@ -5390,8 +5392,8 @@
 
       if (typ == MatrixType::Banded_Hermitian)
 	{
-	  int n_lower = mattype.nlower ();
-	  int ldm = n_lower + 1;
+	  octave_idx_type n_lower = mattype.nlower ();
+	  octave_idx_type ldm = n_lower + 1;
 
 	  Matrix m_band (ldm, nc);
 	  double *tmp_data = m_band.fortran_vec ();
@@ -5584,9 +5586,9 @@
       if (typ == MatrixType::Banded)
 	{
 	  // Create the storage for the banded form of the sparse matrix
-	  int n_upper = mattype.nupper ();
-	  int n_lower = mattype.nlower ();
-	  int ldm = n_upper + 2 * n_lower + 1;
+	  octave_idx_type n_upper = mattype.nupper ();
+	  octave_idx_type n_lower = mattype.nlower ();
+	  octave_idx_type ldm = n_upper + 2 * n_lower + 1;
 
 	  Matrix m_band (ldm, nc);
 	  double *tmp_data = m_band.fortran_vec ();
--- a/liboctave/oct-fftw.h	Thu Jan 11 07:35:52 2007 +0000
+++ b/liboctave/oct-fftw.h	Tue Jan 16 07:03:52 2007 +0000
@@ -104,6 +104,9 @@
   bool rsimd_align;
 };
 
+// FIXME -- maybe octave_fftw_planner should be a singleton object?
+extern octave_fftw_planner fftw_planner;
+
 class
 octave_fftw
 {
--- a/src/ChangeLog	Thu Jan 11 07:35:52 2007 +0000
+++ b/src/ChangeLog	Tue Jan 16 07:03:52 2007 +0000
@@ -1,3 +1,10 @@
+2007-01-16  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/__pchip_deriv__.cc: Fix dpchim decl for --enable-64.
+	(F__pchip_deriv__): Fix call to dpchim for --enable-64.
+
+	* DLD-FUNCTIONS/fftw.cc: Delete decl for fftw_planner.
+
 2007-01-11  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* load-path.h (class load_path): Tag with OCTINTERP_API.
--- a/src/DLD-FUNCTIONS/__pchip_deriv__.cc	Thu Jan 11 07:35:52 2007 +0000
+++ b/src/DLD-FUNCTIONS/__pchip_deriv__.cc	Tue Jan 16 07:03:52 2007 +0000
@@ -34,9 +34,10 @@
 
 extern "C"
 {
-  extern int F77_FUNC (dpchim, DPCHIM)
-    (const int &n, double *x, double *f, double *d, const int &incfd,
-     int *ierr);
+  F77_RET_T
+  F77_FUNC (dpchim, DPCHIM) (const octave_idx_type& n, double *x, double *f,
+			     double *d, const octave_idx_type &incfd,
+			     octave_idx_type *ierr);
 }
 
 DEFUN_DLD(__pchip_deriv__, args, ,
@@ -54,9 +55,9 @@
       ColumnVector xvec (args(0).vector_value ());
       Matrix ymat (args(1).matrix_value ());
 
-      int nx = xvec.length ();
-      int nyr = ymat.rows ();
-      int nyc = ymat.columns ();
+      octave_idx_type nx = xvec.length ();
+      octave_idx_type nyr = ymat.rows ();
+      octave_idx_type nyc = ymat.columns ();
 
       if (nx != nyr)
         {
@@ -67,8 +68,8 @@
       ColumnVector dvec (nx), yvec (nx);
       Matrix dmat (nyr, nyc);
 
-      int ierr;
-      const int incfd = 1;
+      octave_idx_type ierr;
+      const octave_idx_type incfd = 1;
       for (int c = 0; c < nyc; c++)
         {
           for (int r = 0; r < nx; r++)
--- a/src/DLD-FUNCTIONS/fftw.cc	Thu Jan 11 07:35:52 2007 +0000
+++ b/src/DLD-FUNCTIONS/fftw.cc	Tue Jan 16 07:03:52 2007 +0000
@@ -34,8 +34,6 @@
 #include "oct-fftw.h"
 #endif
 
-extern octave_fftw_planner fftw_planner;
-
 DEFUN_DLD (fftw, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{method} =} fftw ('planner')\n\