Mercurial > hg > octave-lyh
diff src/ov-bool-sparse.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 20 Jan 2011 17:24:59 -0500 |
| parents | fd0a3ac60b0e |
| children | 72c96de7a403 |
line wrap: on
line diff
--- a/src/ov-bool-sparse.cc +++ b/src/ov-bool-sparse.cc @@ -160,7 +160,7 @@ return ComplexNDArray (ComplexMatrix (matrix.matrix_value ())); } -NDArray +NDArray octave_sparse_bool_matrix::array_value (bool) const { return NDArray (Matrix(matrix.matrix_value ())); @@ -180,32 +180,32 @@ return retval; } -boolMatrix +boolMatrix octave_sparse_bool_matrix::bool_matrix_value (bool) const -{ - return matrix.matrix_value (); +{ + return matrix.matrix_value (); } -boolNDArray +boolNDArray octave_sparse_bool_matrix::bool_array_value (bool) const -{ - return boolNDArray (matrix.matrix_value ()); +{ + return boolNDArray (matrix.matrix_value ()); } -SparseMatrix +SparseMatrix octave_sparse_bool_matrix::sparse_matrix_value (bool) const { return SparseMatrix (this->matrix); } -SparseComplexMatrix +SparseComplexMatrix octave_sparse_bool_matrix::sparse_complex_matrix_value (bool) const { return SparseComplexMatrix (this->matrix); } -bool +bool octave_sparse_bool_matrix::save_binary (std::ostream& os, bool&) { dim_vector d = this->dims (); @@ -221,31 +221,31 @@ int32_t itmp; // Use negative value for ndims to be consistent with other formats - itmp= -2; + itmp= -2; os.write (reinterpret_cast<char *> (&itmp), 4); - - itmp= nr; + + itmp= nr; os.write (reinterpret_cast<char *> (&itmp), 4); - + itmp= nc; os.write (reinterpret_cast<char *> (&itmp), 4); - + itmp= nz; os.write (reinterpret_cast<char *> (&itmp), 4); // add one to the printed indices to go from // zero-based to one-based arrays - for (int i = 0; i < nc+1; i++) + for (int i = 0; i < nc+1; i++) { octave_quit (); itmp = matrix.cidx(i); os.write (reinterpret_cast<char *> (&itmp), 4); } - for (int i = 0; i < nz; i++) + for (int i = 0; i < nz; i++) { octave_quit (); - itmp = matrix.ridx(i); + itmp = matrix.ridx(i); os.write (reinterpret_cast<char *> (&itmp), 4); } @@ -253,7 +253,7 @@ for (int i = 0; i < nz; i++) htmp[i] = (matrix.data (i) ? 1 : 0); - + os.write (htmp, nz); return true; @@ -293,7 +293,7 @@ static_cast<octave_idx_type> (nc), static_cast<octave_idx_type> (nz)); - for (int i = 0; i < nc+1; i++) + for (int i = 0; i < nc+1; i++) { octave_quit (); if (! is.read (reinterpret_cast<char *> (&tmp), 4)) @@ -303,7 +303,7 @@ m.cidx(i) = tmp; } - for (int i = 0; i < nz; i++) + for (int i = 0; i < nz; i++) { octave_quit (); if (! is.read (reinterpret_cast<char *> (&tmp), 4)) @@ -323,7 +323,7 @@ for (int i = 0; i < nz; i++) m.data(i) = (htmp[i] ? 1 : 0); - + if (! m.indices_ok ()) return false; @@ -359,7 +359,7 @@ hsize_t hdims[2]; space_hid = H5Screate_simple (0, hdims, 0); - if (space_hid < 0) + if (space_hid < 0) { H5Gclose (group_hid); return false; @@ -371,13 +371,13 @@ data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, H5P_DEFAULT); #endif - if (data_hid < 0) + if (data_hid < 0) { H5Sclose (space_hid); H5Gclose (group_hid); return false; } - + tmp = m.rows (); retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); @@ -386,7 +386,7 @@ H5Sclose (space_hid); H5Gclose (group_hid); return false; - } + } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, @@ -395,13 +395,13 @@ data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, H5P_DEFAULT); #endif - if (data_hid < 0) + if (data_hid < 0) { H5Sclose (space_hid); H5Gclose (group_hid); return false; } - + tmp = m.cols (); retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; @@ -411,22 +411,22 @@ H5Sclose (space_hid); H5Gclose (group_hid); return false; - } + } #if HAVE_HDF5_18 - data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, + data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else - data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, + data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, H5P_DEFAULT); #endif - if (data_hid < 0) + if (data_hid < 0) { H5Sclose (space_hid); H5Gclose (group_hid); return false; } - + tmp = m.nnz (); retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; @@ -445,26 +445,26 @@ space_hid = H5Screate_simple (2, hdims, 0); - if (space_hid < 0) + if (space_hid < 0) { H5Gclose (group_hid); return false; } #if HAVE_HDF5_18 - data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, + data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else - data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, + data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, H5P_DEFAULT); #endif - if (data_hid < 0) + if (data_hid < 0) { H5Sclose (space_hid); H5Gclose (group_hid); return false; } - + octave_idx_type * itmp = m.xcidx (); retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) >= 0; @@ -474,7 +474,7 @@ H5Sclose (space_hid); H5Gclose (group_hid); return false; - } + } H5Sclose (space_hid); @@ -483,26 +483,26 @@ space_hid = H5Screate_simple (2, hdims, 0); - if (space_hid < 0) + if (space_hid < 0) { H5Gclose (group_hid); return false; } #if HAVE_HDF5_18 - data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, + data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else - data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, + data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, H5P_DEFAULT); #endif - if (data_hid < 0) + if (data_hid < 0) { H5Sclose (space_hid); H5Gclose (group_hid); return false; } - + itmp = m.xridx (); retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) >= 0; @@ -515,20 +515,20 @@ } #if HAVE_HDF5_18 - data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, + data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else - data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, + data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, H5P_DEFAULT); #endif - if (data_hid < 0) + if (data_hid < 0) { H5Sclose (space_hid); H5Gclose (group_hid); return false; } - OCTAVE_LOCAL_BUFFER (hbool_t, htmp, m.nnz ()); + OCTAVE_LOCAL_BUFFER (hbool_t, htmp, m.nnz ()); for (int i = 0; i < m.nnz (); i++) htmp[i] = m.xdata(i); @@ -547,7 +547,7 @@ octave_idx_type nr, nc, nz; hid_t group_hid, data_hid, space_hid; hsize_t rank; - + dim_vector dv; int empty = load_hdf5_empty (loc_id, name, dv); if (empty > 0) @@ -571,14 +571,14 @@ rank = H5Sget_simple_extent_ndims (space_hid); if (rank != 0) - { + { H5Dclose (data_hid); H5Gclose (group_hid); return false; } if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nr) < 0) - { + { H5Dclose (data_hid); H5Gclose (group_hid); return false; @@ -595,14 +595,14 @@ rank = H5Sget_simple_extent_ndims (space_hid); if (rank != 0) - { + { H5Dclose (data_hid); H5Gclose (group_hid); return false; } if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nc) < 0) - { + { H5Dclose (data_hid); H5Gclose (group_hid); return false; @@ -619,14 +619,14 @@ rank = H5Sget_simple_extent_ndims (space_hid); if (rank != 0) - { + { H5Dclose (data_hid); H5Gclose (group_hid); return false; } if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nz) < 0) - { + { H5Dclose (data_hid); H5Gclose (group_hid); return false; @@ -669,7 +669,7 @@ } octave_idx_type *itmp = m.xcidx (); - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) < 0) { H5Sclose (space_hid); H5Dclose (data_hid); @@ -709,7 +709,7 @@ itmp = m.xridx (); if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, itmp) < 0) + H5P_DEFAULT, itmp) < 0) { H5Sclose (space_hid); H5Dclose (data_hid); @@ -774,7 +774,7 @@ octave_sparse_bool_matrix::as_mxArray (void) const { mwSize nz = nzmax (); - mxArray *retval = new mxArray (mxLOGICAL_CLASS, rows (), columns (), + mxArray *retval = new mxArray (mxLOGICAL_CLASS, rows (), columns (), nz, mxREAL); bool *pr = static_cast<bool *> (retval->get_data ()); mwIndex *ir = retval->get_ir ();