Mercurial > octave-nkf

diff liboctave/dMatrix.h @ 5275:23b37da9fd5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-04-08 16:07:35 by jwe]
author jwe
date Fri, 08 Apr 2005 16:07:37 +0000
parents e35b034d3523
children 4c8a2e4e0717
line wrap: on
line diff
--- a/liboctave/dMatrix.h	Thu Apr 07 21:51:37 2005 +0000
+++ b/liboctave/dMatrix.h	Fri Apr 08 16:07:37 2005 +0000
@@ -38,9 +38,9 @@
 
   Matrix (void) : MArray2<double> () { }
 
-  Matrix (int r, int c) : MArray2<double> (r, c) { }
+  Matrix (octave_idx_type r, octave_idx_type c) : MArray2<double> (r, c) { }
 
-  Matrix (int r, int c, double val) : MArray2<double> (r, c, val) { }
+  Matrix (octave_idx_type r, octave_idx_type c, double val) : MArray2<double> (r, c, val) { }
 
   Matrix (const Matrix& a) : MArray2<double> (a) { }
 
@@ -69,13 +69,13 @@
 
   // destructive insert/delete/reorder operations
 
-  Matrix& insert (const Matrix& a, int r, int c);
-  Matrix& insert (const RowVector& a, int r, int c);
-  Matrix& insert (const ColumnVector& a, int r, int c);
-  Matrix& insert (const DiagMatrix& a, int r, int c);
+  Matrix& insert (const Matrix& a, octave_idx_type r, octave_idx_type c);
+  Matrix& insert (const RowVector& a, octave_idx_type r, octave_idx_type c);
+  Matrix& insert (const ColumnVector& a, octave_idx_type r, octave_idx_type c);
+  Matrix& insert (const DiagMatrix& a, octave_idx_type r, octave_idx_type c);
 
   Matrix& fill (double val);
-  Matrix& fill (double val, int r1, int c1, int r2, int c2);
+  Matrix& fill (double val, octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2);
 
   Matrix append (const Matrix& a) const;
   Matrix append (const RowVector& a) const;
@@ -94,21 +94,21 @@
 
   // resize is the destructive equivalent for this one
 
-  Matrix extract (int r1, int c1, int r2, int c2) const;
+  Matrix extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const;
 
-  Matrix extract_n (int r1, int c1, int nr, int nc) const;
+  Matrix extract_n (octave_idx_type r1, octave_idx_type c1, octave_idx_type nr, octave_idx_type nc) const;
 
   // extract row or column i.
 
-  RowVector row (int i) const;
+  RowVector row (octave_idx_type i) const;
   RowVector row (char *s) const;
 
-  ColumnVector column (int i) const;
+  ColumnVector column (octave_idx_type i) const;
   ColumnVector column (char *s) const;
 
   Matrix inverse (void) const;
-  Matrix inverse (int& info) const;
-  Matrix inverse (int& info, double& rcond, int force = 0, 
+  Matrix inverse (octave_idx_type& info) const;
+  Matrix inverse (octave_idx_type& info, double& rcond, int force = 0, 
 		  int calc_cond = 1) const;
 
   Matrix pseudo_inverse (double tol = 0.0) const;
@@ -120,52 +120,52 @@
   ComplexMatrix ifourier2d (void) const;
 
   DET determinant (void) const;
-  DET determinant (int& info) const;
-  DET determinant (int& info, double& rcond, int calc_cond = 1) const;
+  DET determinant (octave_idx_type& info) const;
+  DET determinant (octave_idx_type& info, double& rcond, int calc_cond = 1) const;
 
   Matrix solve (const Matrix& b) const;
-  Matrix solve (const Matrix& b, int& info) const;
-  Matrix solve (const Matrix& b, int& info, double& rcond) const;
-  Matrix solve (const Matrix& b, int& info, double& rcond,
+  Matrix solve (const Matrix& b, octave_idx_type& info) const;
+  Matrix solve (const Matrix& b, octave_idx_type& info, double& rcond) const;
+  Matrix solve (const Matrix& b, octave_idx_type& info, double& rcond,
 		solve_singularity_handler sing_handler) const;
 
   ComplexMatrix solve (const ComplexMatrix& b) const;
-  ComplexMatrix solve (const ComplexMatrix& b, int& info) const;
-  ComplexMatrix solve (const ComplexMatrix& b, int& info, double& rcond) const;
-  ComplexMatrix solve (const ComplexMatrix& b, int& info, double& rcond,
+  ComplexMatrix solve (const ComplexMatrix& b, octave_idx_type& info) const;
+  ComplexMatrix solve (const ComplexMatrix& b, octave_idx_type& info, double& rcond) const;
+  ComplexMatrix solve (const ComplexMatrix& b, octave_idx_type& info, double& rcond,
 		       solve_singularity_handler sing_handler) const;
 
   ColumnVector solve (const ColumnVector& b) const;
-  ColumnVector solve (const ColumnVector& b, int& info) const;
-  ColumnVector solve (const ColumnVector& b, int& info, double& rcond) const;
-  ColumnVector solve (const ColumnVector& b, int& info, double& rcond,
+  ColumnVector solve (const ColumnVector& b, octave_idx_type& info) const;
+  ColumnVector solve (const ColumnVector& b, octave_idx_type& info, double& rcond) const;
+  ColumnVector solve (const ColumnVector& b, octave_idx_type& info, double& rcond,
 		      solve_singularity_handler sing_handler) const;
 
   ComplexColumnVector solve (const ComplexColumnVector& b) const;
-  ComplexColumnVector solve (const ComplexColumnVector& b, int& info) const;
-  ComplexColumnVector solve (const ComplexColumnVector& b, int& info,
+  ComplexColumnVector solve (const ComplexColumnVector& b, octave_idx_type& info) const;
+  ComplexColumnVector solve (const ComplexColumnVector& b, octave_idx_type& info,
 			     double& rcond) const;
-  ComplexColumnVector solve (const ComplexColumnVector& b, int& info,
+  ComplexColumnVector solve (const ComplexColumnVector& b, octave_idx_type& info,
 			     double& rcond,
 			     solve_singularity_handler sing_handler) const;
 
   Matrix lssolve (const Matrix& b) const;
-  Matrix lssolve (const Matrix& b, int& info) const;
-  Matrix lssolve (const Matrix& b, int& info, int& rank) const;
+  Matrix lssolve (const Matrix& b, octave_idx_type& info) const;
+  Matrix lssolve (const Matrix& b, octave_idx_type& info, octave_idx_type& rank) const;
 
   ComplexMatrix lssolve (const ComplexMatrix& b) const;
-  ComplexMatrix lssolve (const ComplexMatrix& b, int& info) const;
-  ComplexMatrix lssolve (const ComplexMatrix& b, int& info,
-			 int& rank) const;
+  ComplexMatrix lssolve (const ComplexMatrix& b, octave_idx_type& info) const;
+  ComplexMatrix lssolve (const ComplexMatrix& b, octave_idx_type& info,
+			 octave_idx_type& rank) const;
 
   ColumnVector lssolve (const ColumnVector& b) const;
-  ColumnVector lssolve (const ColumnVector& b, int& info) const;
-  ColumnVector lssolve (const ColumnVector& b, int& info, int& rank) const;
+  ColumnVector lssolve (const ColumnVector& b, octave_idx_type& info) const;
+  ColumnVector lssolve (const ColumnVector& b, octave_idx_type& info, octave_idx_type& rank) const;
 
   ComplexColumnVector lssolve (const ComplexColumnVector& b) const;
-  ComplexColumnVector lssolve (const ComplexColumnVector& b, int& info) const;
-  ComplexColumnVector lssolve (const ComplexColumnVector& b, int& info,
-			       int& rank) const;
+  ComplexColumnVector lssolve (const ComplexColumnVector& b, octave_idx_type& info) const;
+  ComplexColumnVector lssolve (const ComplexColumnVector& b, octave_idx_type& info,
+			       octave_idx_type& rank) const;
 
   Matrix expm (void) const;
 
@@ -204,19 +204,19 @@
   Matrix abs (void) const;
 
   ColumnVector diag (void) const;
-  ColumnVector diag (int k) const;
+  ColumnVector diag (octave_idx_type k) const;
 
   ColumnVector row_min (void) const;
   ColumnVector row_max (void) const;
 
-  ColumnVector row_min (Array<int>& index) const;
-  ColumnVector row_max (Array<int>& index) const;
+  ColumnVector row_min (Array<octave_idx_type>& index) const;
+  ColumnVector row_max (Array<octave_idx_type>& index) const;
 
   RowVector column_min (void) const;
   RowVector column_max (void) const;
 
-  RowVector column_min (Array<int>& index) const;
-  RowVector column_max (Array<int>& index) const;
+  RowVector column_min (Array<octave_idx_type>& index) const;
+  RowVector column_max (Array<octave_idx_type>& index) const;
 
   // i/o
 
@@ -227,7 +227,7 @@
 
 private:
 
-  Matrix (double *d, int r, int c) : MArray2<double> (d, r, c) { }
+  Matrix (double *d, octave_idx_type r, octave_idx_type c) : MArray2<double> (d, r, c) { }
 };
 
 extern Matrix Givens (double, double);