Mercurial > octave-nkf

diff src/ov-re-sparse.cc @ 5351:05adf9de7657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-05-16 20:07:36 by dbateman]
author dbateman
date Mon, 16 May 2005 20:07:36 +0000
parents 68eae0f668c4
children 2857357f9d3c
line wrap: on
line diff
--- a/src/ov-re-sparse.cc	Thu May 12 18:13:34 2005 +0000
+++ b/src/ov-re-sparse.cc	Mon May 16 20:07:36 2005 +0000
@@ -399,7 +399,7 @@
   hid_t space_hid = -1, data_hid = -1;
   bool retval = true;
   SparseMatrix m = sparse_matrix_value ();
-  int tmp;
+  octave_idx_type tmp;
   hsize_t hdims[2];
 
   space_hid = H5Screate_simple (0, hdims, (hsize_t*) 0);
@@ -409,7 +409,7 @@
       return false;
     }
 
-  data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_INT, space_hid, 
+  data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, 
 			H5P_DEFAULT);
   if (data_hid < 0) 
     {
@@ -419,7 +419,7 @@
     }
   
   tmp = m.rows ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT,
 		     (void*) &tmp) >= 0;
   H5Dclose (data_hid);
   if (!retval)
@@ -429,7 +429,7 @@
       return false;
     }    
 
-  data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_INT, space_hid, 
+  data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, 
 			H5P_DEFAULT);
   if (data_hid < 0) 
     {
@@ -439,7 +439,7 @@
     }
   
   tmp = m.cols ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT,
 		     (void*) &tmp) >= 0;
   H5Dclose (data_hid);
   if (!retval)
@@ -449,7 +449,7 @@
       return false;
     }    
 
-  data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_INT, space_hid, 
+  data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, 
 			H5P_DEFAULT);
   if (data_hid < 0) 
     {
@@ -459,7 +459,7 @@
     }
   
   tmp = m.nnz ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT,
 		     (void*) &tmp) >= 0;
   H5Dclose (data_hid);
   if (!retval)
@@ -482,7 +482,7 @@
       return false;
     }
 
-  data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_INT, space_hid, 
+  data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, 
 			H5P_DEFAULT);
   if (data_hid < 0) 
     {
@@ -491,8 +491,8 @@
       return false;
     }
   
-  int * itmp = m.xcidx ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+  octave_idx_type * itmp = m.xcidx ();
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT,
 		     (void*) itmp) >= 0;
   H5Dclose (data_hid);
   if (!retval)
@@ -515,7 +515,7 @@
       return false;
     }
 
-  data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_INT, space_hid, 
+  data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, 
 			H5P_DEFAULT);
   if (data_hid < 0) 
     {
@@ -525,7 +525,7 @@
     }
   
   itmp = m.xridx ();
-  retval = H5Dwrite (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+  retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT,
 		     (void*) itmp) >= 0;
   H5Dclose (data_hid);
   if (!retval)
@@ -582,7 +582,7 @@
 octave_sparse_matrix::load_hdf5 (hid_t loc_id, const char *name,
 				      bool /* have_h5giterate_bug */)
 {
-  int nr, nc, nz;
+  octave_idx_type nr, nc, nz;
   hid_t group_hid, data_hid, space_hid;
   hsize_t rank;
   
@@ -607,7 +607,7 @@
       return false;
     }
 
-  if (H5Dread (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, 
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, 
 	       H5P_DEFAULT, (void *) &nr) < 0)
     { 
       H5Dclose (data_hid);
@@ -628,7 +628,7 @@
       return false;
     }
 
-  if (H5Dread (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, 
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, 
 	       H5P_DEFAULT, (void *) &nc) < 0)
     { 
       H5Dclose (data_hid);
@@ -649,7 +649,7 @@
       return false;
     }
 
-  if (H5Dread (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, 
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, 
 	       H5P_DEFAULT, (void *) &nz) < 0)
     { 
       H5Dclose (data_hid);
@@ -689,8 +689,8 @@
       return false;
     }
 
-  int *itmp = m.xcidx ();
-  if (H5Dread (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, 
+  octave_idx_type *itmp = m.xcidx ();
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, 
 	       H5P_DEFAULT, (void *) itmp) < 0) 
     {
       H5Sclose (space_hid);
@@ -725,7 +725,7 @@
     }
 
   itmp = m.xridx ();
-  if (H5Dread (data_hid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, 
+  if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, 
 	       H5P_DEFAULT, (void *) itmp) < 0) 
     {
       H5Sclose (space_hid);