Mercurial > hg > octave-nkf
view libinterp/octave-value/ov-re-sparse.h @ 19318:995df67fc912
Flip arrays - ND support for fliplr and flipud, and replace flipdim with flip.
* fliplr.m, flipud.m: add support for N-dimensional arrays by making use
of flip(). Added new tests for ND arrays and defaults.
* flipdim.m: deprecate in favour of new function flip() which has exactly the
same syntax and is part of Matlab since R2014a.
* flip.m: new function copied from flipdim. Added tests for ND arrays and
defaults.
* matrix.txi: replace flipdim DOCSTRINg with flip.
* rot90.m, rotdim.m, del2.m: replace flipdim() with flip()
* NEWS: note deprecation of flip(), new function flipdim(), and ND support
for flipud() and fliplr().
author | Carnë Draug <carandraug+dev@gmail.com> |
---|---|
date | Sun, 21 Sep 2014 18:49:08 +0100 |
parents | e473c4853afc |
children | 76478d2da117 |
line wrap: on
line source
/* Copyright (C) 2004-2013 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_ov_re_sparse_h) #define octave_ov_re_sparse_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h" #include "error.h" #include "oct-stream.h" #include "ov-base.h" #include "ov-typeinfo.h" #include "dSparse.h" #include "MatrixType.h" #include "ov-base-sparse.h" #include "ov-cx-sparse.h" class octave_value_list; class tree_walker; class OCTINTERP_API octave_sparse_matrix : public octave_base_sparse<SparseMatrix> { public: octave_sparse_matrix (void) : octave_base_sparse<SparseMatrix> () { } octave_sparse_matrix (const Matrix& m) : octave_base_sparse<SparseMatrix> (SparseMatrix (m)) { } octave_sparse_matrix (const NDArray& m) : octave_base_sparse<SparseMatrix> (SparseMatrix (m)) { } octave_sparse_matrix (const SparseMatrix& m) : octave_base_sparse<SparseMatrix> (m) { } octave_sparse_matrix (const SparseMatrix& m, const MatrixType& t) : octave_base_sparse<SparseMatrix> (m, t) { } octave_sparse_matrix (const MSparse<double>& m) : octave_base_sparse<SparseMatrix> (m) { } octave_sparse_matrix (const MSparse<double>& m, const MatrixType& t) : octave_base_sparse<SparseMatrix> (m, t) { } octave_sparse_matrix (const Sparse<double>& m) : octave_base_sparse<SparseMatrix> (SparseMatrix (m)) { } octave_sparse_matrix (const Sparse<double>& m, const MatrixType& t) : octave_base_sparse<SparseMatrix> (SparseMatrix (m), t) { } octave_sparse_matrix (const octave_sparse_matrix& m) : octave_base_sparse<SparseMatrix> (m) { } ~octave_sparse_matrix (void) { } octave_base_value *clone (void) const { return new octave_sparse_matrix (*this); } octave_base_value *empty_clone (void) const { return new octave_sparse_matrix (); } octave_base_value *try_narrowing_conversion (void); idx_vector index_vector (bool require_integers = false) const; builtin_type_t builtin_type (void) const { return btyp_double; } bool is_real_matrix (void) const { return true; } bool is_real_type (void) const { return true; } bool is_double_type (void) const { return true; } bool is_float_type (void) const { return true; } double double_value (bool = false) const; double scalar_value (bool frc_str_conv = false) const { return double_value (frc_str_conv); } Matrix matrix_value (bool = false) const; Complex complex_value (bool = false) const; boolNDArray bool_array_value (bool warn = false) const; charNDArray char_array_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; NDArray array_value (bool = false) const; SparseMatrix sparse_matrix_value (bool = false) const { return matrix; } SparseComplexMatrix sparse_complex_matrix_value (bool = false) const { return SparseComplexMatrix (matrix); } SparseBoolMatrix sparse_bool_matrix_value (bool warn = false) const; octave_value convert_to_str_internal (bool pad, bool force, char type) const; #if 0 int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, int skip, oct_mach_info::float_format flt_fmt) const { return os.write (matrix, block_size, output_type, skip, flt_fmt); } #endif bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif mxArray *as_mxArray (void) const; octave_value map (unary_mapper_t umap) const; private: octave_value map (double (*fcn) (double)) const; DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif