changeset 5526:8c56849b1509

[project @ 2005-11-01 00:54:14 by jwe]
author jwe
date Tue, 01 Nov 2005 00:54:14 +0000
parents 558c69736dc0
children ce71ed4c6da6
files liboctave/CSparse.cc liboctave/ChangeLog liboctave/dSparse.cc
diffstat 3 files changed, 45 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/CSparse.cc	Tue Nov 01 00:49:50 2005 +0000
+++ b/liboctave/CSparse.cc	Tue Nov 01 00:54:14 2005 +0000
@@ -5008,7 +5008,7 @@
 
 	  // Setup initial parameters
 	  CHOLMOD_NAME(start) (cm);
-	  cm->prefer_zomplex = FALSE;
+	  cm->prefer_zomplex = false;
 
 	  double spu = Voctave_sparse_controls.get_key ("spumoni");
 	  if (spu == 0.)
@@ -5045,8 +5045,7 @@
 #endif
 #endif
 #endif
-
-	  cm->final_ll = TRUE;
+	  cm->final_ll = true;
 
 	  cholmod_sparse Astore;
 	  cholmod_sparse *A = &Astore;
@@ -5057,8 +5056,8 @@
 	  A->p = cidx();
 	  A->i = ridx();
 	  A->nzmax = nonzero();
-	  A->packed = TRUE;
-	  A->sorted = TRUE;
+	  A->packed = true;
+	  A->sorted = true;
 	  A->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  A->itype = CHOLMOD_LONG;
@@ -5277,7 +5276,7 @@
 
 	  // Setup initial parameters
 	  CHOLMOD_NAME(start) (cm);
-	  cm->prefer_zomplex = FALSE;
+	  cm->prefer_zomplex = false;
 
 	  double spu = Voctave_sparse_controls.get_key ("spumoni");
 	  if (spu == 0.)
@@ -5315,7 +5314,7 @@
 #endif
 #endif
 
-	  cm->final_ll = TRUE;
+	  cm->final_ll = true;
 
 	  cholmod_sparse Astore;
 	  cholmod_sparse *A = &Astore;
@@ -5326,8 +5325,8 @@
 	  A->p = cidx();
 	  A->i = ridx();
 	  A->nzmax = nonzero();
-	  A->packed = TRUE;
-	  A->sorted = TRUE;
+	  A->packed = true;
+	  A->sorted = true;
 	  A->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  A->itype = CHOLMOD_LONG;
@@ -5350,8 +5349,8 @@
 	  B->p = b.cidx();
 	  B->i = b.ridx();
 	  B->nzmax = b.nonzero();
-	  B->packed = TRUE;
-	  B->sorted = TRUE;
+	  B->packed = true;
+	  B->sorted = true;
 	  B->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  B->itype = CHOLMOD_LONG;
@@ -5591,7 +5590,7 @@
 
 	  // Setup initial parameters
 	  CHOLMOD_NAME(start) (cm);
-	  cm->prefer_zomplex = FALSE;
+	  cm->prefer_zomplex = false;
 
 	  double spu = Voctave_sparse_controls.get_key ("spumoni");
 	  if (spu == 0.)
@@ -5629,7 +5628,7 @@
 #endif
 #endif
 
-	  cm->final_ll = TRUE;
+	  cm->final_ll = true;
 
 	  cholmod_sparse Astore;
 	  cholmod_sparse *A = &Astore;
@@ -5640,8 +5639,8 @@
 	  A->p = cidx();
 	  A->i = ridx();
 	  A->nzmax = nonzero();
-	  A->packed = TRUE;
-	  A->sorted = TRUE;
+	  A->packed = true;
+	  A->sorted = true;
 	  A->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  A->itype = CHOLMOD_LONG;
@@ -5838,7 +5837,7 @@
 
 	  // Setup initial parameters
 	  CHOLMOD_NAME(start) (cm);
-	  cm->prefer_zomplex = FALSE;
+	  cm->prefer_zomplex = false;
 
 	  double spu = Voctave_sparse_controls.get_key ("spumoni");
 	  if (spu == 0.)
@@ -5876,7 +5875,7 @@
 #endif
 #endif
 
-	  cm->final_ll = TRUE;
+	  cm->final_ll = true;
 
 	  cholmod_sparse Astore;
 	  cholmod_sparse *A = &Astore;
@@ -5887,8 +5886,8 @@
 	  A->p = cidx();
 	  A->i = ridx();
 	  A->nzmax = nonzero();
-	  A->packed = TRUE;
-	  A->sorted = TRUE;
+	  A->packed = true;
+	  A->sorted = true;
 	  A->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  A->itype = CHOLMOD_LONG;
@@ -5911,8 +5910,8 @@
 	  B->p = b.cidx();
 	  B->i = b.ridx();
 	  B->nzmax = b.nonzero();
-	  B->packed = TRUE;
-	  B->sorted = TRUE;
+	  B->packed = true;
+	  B->sorted = true;
 	  B->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  B->itype = CHOLMOD_LONG;
--- a/liboctave/ChangeLog	Tue Nov 01 00:49:50 2005 +0000
+++ b/liboctave/ChangeLog	Tue Nov 01 00:54:14 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-31  David Bateman  <dbateman@free.fr>
+
+	* dSparse.cc, CSparse.cc: Use C++ true/false instead of
+	preprocessor defined TRUE/FALSE.
+
 2005-10-30  John W. Eaton  <jwe@octave.org>
 
 	* mx-inlines.cc (MX_ND_REDUCTION): Iterate in direction of DIM.
--- a/liboctave/dSparse.cc	Tue Nov 01 00:49:50 2005 +0000
+++ b/liboctave/dSparse.cc	Tue Nov 01 00:54:14 2005 +0000
@@ -5227,7 +5227,7 @@
 
 	  // Setup initial parameters
 	  CHOLMOD_NAME(start) (cm);
-	  cm->prefer_zomplex = FALSE;
+	  cm->prefer_zomplex = false;
 
 	  double spu = Voctave_sparse_controls.get_key ("spumoni");
 	  if (spu == 0.)
@@ -5265,7 +5265,7 @@
 #endif
 #endif
 
-	  cm->final_ll = TRUE;
+	  cm->final_ll = true;
 
 	  cholmod_sparse Astore;
 	  cholmod_sparse *A = &Astore;
@@ -5276,8 +5276,8 @@
 	  A->p = cidx();
 	  A->i = ridx();
 	  A->nzmax = nonzero();
-	  A->packed = TRUE;
-	  A->sorted = TRUE;
+	  A->packed = true;
+	  A->sorted = true;
 	  A->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  A->itype = CHOLMOD_LONG;
@@ -5469,7 +5469,7 @@
 
 	  // Setup initial parameters
 	  CHOLMOD_NAME(start) (cm);
-	  cm->prefer_zomplex = FALSE;
+	  cm->prefer_zomplex = false;
 
 	  double spu = Voctave_sparse_controls.get_key ("spumoni");
 	  if (spu == 0.)
@@ -5507,7 +5507,7 @@
 #endif
 #endif
 
-	  cm->final_ll = TRUE;
+	  cm->final_ll = true;
 
 	  cholmod_sparse Astore;
 	  cholmod_sparse *A = &Astore;
@@ -5518,8 +5518,8 @@
 	  A->p = cidx();
 	  A->i = ridx();
 	  A->nzmax = nonzero();
-	  A->packed = TRUE;
-	  A->sorted = TRUE;
+	  A->packed = true;
+	  A->sorted = true;
 	  A->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  A->itype = CHOLMOD_LONG;
@@ -5542,8 +5542,8 @@
 	  B->p = b.cidx();
 	  B->i = b.ridx();
 	  B->nzmax = b.nonzero();
-	  B->packed = TRUE;
-	  B->sorted = TRUE;
+	  B->packed = true;
+	  B->sorted = true;
 	  B->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  B->itype = CHOLMOD_LONG;
@@ -5758,7 +5758,7 @@
 
 	  // Setup initial parameters
 	  CHOLMOD_NAME(start) (cm);
-	  cm->prefer_zomplex = FALSE;
+	  cm->prefer_zomplex = false;
 
 	  double spu = Voctave_sparse_controls.get_key ("spumoni");
 	  if (spu == 0.)
@@ -5796,7 +5796,7 @@
 #endif
 #endif
 
-	  cm->final_ll = TRUE;
+	  cm->final_ll = true;
 
 	  cholmod_sparse Astore;
 	  cholmod_sparse *A = &Astore;
@@ -5807,8 +5807,8 @@
 	  A->p = cidx();
 	  A->i = ridx();
 	  A->nzmax = nonzero();
-	  A->packed = TRUE;
-	  A->sorted = TRUE;
+	  A->packed = true;
+	  A->sorted = true;
 	  A->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  A->itype = CHOLMOD_LONG;
@@ -6020,7 +6020,7 @@
 
 	  // Setup initial parameters
 	  CHOLMOD_NAME(start) (cm);
-	  cm->prefer_zomplex = FALSE;
+	  cm->prefer_zomplex = false;
 
 	  double spu = Voctave_sparse_controls.get_key ("spumoni");
 	  if (spu == 0.)
@@ -6058,7 +6058,7 @@
 #endif
 #endif
 
-	  cm->final_ll = TRUE;
+	  cm->final_ll = true;
 
 	  cholmod_sparse Astore;
 	  cholmod_sparse *A = &Astore;
@@ -6069,8 +6069,8 @@
 	  A->p = cidx();
 	  A->i = ridx();
 	  A->nzmax = nonzero();
-	  A->packed = TRUE;
-	  A->sorted = TRUE;
+	  A->packed = true;
+	  A->sorted = true;
 	  A->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  A->itype = CHOLMOD_LONG;
@@ -6093,8 +6093,8 @@
 	  B->p = b.cidx();
 	  B->i = b.ridx();
 	  B->nzmax = b.nonzero();
-	  B->packed = TRUE;
-	  B->sorted = TRUE;
+	  B->packed = true;
+	  B->sorted = true;
 	  B->nz = NULL;
 #ifdef IDX_TYPE_LONG
 	  B->itype = CHOLMOD_LONG;