comparison src/ov-perm.cc @ 8910:6e9f26506804

optimize diag -> sparse and perm -> sparse conversions
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 05 Mar 2009 08:34:52 +0100
parents d077c590eb88
children eb63fbe60fab
comparison
equal deleted inserted replaced
8909:52596fe9f178 8910:6e9f26506804
210 octave_perm_matrix::PREFIX ## _value (bool frc_str_conv) const \ 210 octave_perm_matrix::PREFIX ## _value (bool frc_str_conv) const \
211 { \ 211 { \
212 return to_dense ().PREFIX ## _value (frc_str_conv); \ 212 return to_dense ().PREFIX ## _value (frc_str_conv); \
213 } 213 }
214 214
215 SparseMatrix
216 octave_perm_matrix::sparse_matrix_value (bool) const
217 {
218 return SparseMatrix (matrix);
219 }
220
221 SparseComplexMatrix
222 octave_perm_matrix::sparse_complex_matrix_value (bool) const
223 {
224 return SparseComplexMatrix (sparse_matrix_value ());
225 }
226
215 FORWARD_MATRIX_VALUE (Matrix, matrix) 227 FORWARD_MATRIX_VALUE (Matrix, matrix)
216 FORWARD_MATRIX_VALUE (FloatMatrix, float_matrix) 228 FORWARD_MATRIX_VALUE (FloatMatrix, float_matrix)
217 FORWARD_MATRIX_VALUE (ComplexMatrix, complex_matrix) 229 FORWARD_MATRIX_VALUE (ComplexMatrix, complex_matrix)
218 FORWARD_MATRIX_VALUE (FloatComplexMatrix, float_complex_matrix) 230 FORWARD_MATRIX_VALUE (FloatComplexMatrix, float_complex_matrix)
219 231
222 FORWARD_MATRIX_VALUE (ComplexNDArray, complex_array) 234 FORWARD_MATRIX_VALUE (ComplexNDArray, complex_array)
223 FORWARD_MATRIX_VALUE (FloatComplexNDArray, float_complex_array) 235 FORWARD_MATRIX_VALUE (FloatComplexNDArray, float_complex_array)
224 236
225 FORWARD_MATRIX_VALUE (boolNDArray, bool_array) 237 FORWARD_MATRIX_VALUE (boolNDArray, bool_array)
226 FORWARD_MATRIX_VALUE (charNDArray, char_array) 238 FORWARD_MATRIX_VALUE (charNDArray, char_array)
227
228 FORWARD_MATRIX_VALUE (SparseMatrix, sparse_matrix)
229 FORWARD_MATRIX_VALUE (SparseComplexMatrix, sparse_complex_matrix)
230 239
231 idx_vector 240 idx_vector
232 octave_perm_matrix::index_vector (void) const 241 octave_perm_matrix::index_vector (void) const
233 { 242 {
234 return to_dense ().index_vector (); 243 return to_dense ().index_vector ();