octave: libinterp/octave-value/ov-base-mat.h annotate

annotate libinterp/octave-value/ov-base-mat.h @ 28641:2c15231c3154

new typedefs for octave_value matrix and scalar types * ov-base-mat.h (octave_base_matrix<T>::object_type): New typedef. * ov-base-scalar.h (octave_base_scalar<T>::object_type): Likewise.

author	John W. Eaton <jwe@octave.org>
date	Wed, 19 Aug 2020 23:42:05 -0400
parents	bd51beb6205e
children	853e60367cb6

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 1998-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	25
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19697 diff changeset	26 #if ! defined (octave_ov_base_mat_h)
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17787 diff changeset	27 #define octave_ov_base_mat_h 1
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	28
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	29 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	30
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	31 #include <cstdlib>
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	32
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	33 #include <iosfwd>
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	34 #include <string>
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	35
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	36 #include "mx-base.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	37 #include "str-vec.h"
6376 0eac3484e8df [project @ 2007-03-02 02:18:37 by jwe] jwe parents: 5900 diff changeset	38 #include "MatrixType.h"
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	39
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	40 #include "error.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20791 diff changeset	41 #include "ovl.h"
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	42 #include "ov-base.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	43 #include "ov-typeinfo.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	44
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	45 // Real matrix values.
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	46
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	47 template <typename MT>
3223 3ee04ff37b3e [project @ 1998-11-20 19:34:15 by jwe] jwe parents: 3221 diff changeset	48 class
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	49 octave_base_matrix : public octave_base_value
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	50 {
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	51 public:
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	52
28641 2c15231c3154 new typedefs for octave_value matrix and scalar types John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	53 typedef MT object_type;
2c15231c3154 new typedefs for octave_value matrix and scalar types John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	54
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	55 octave_base_matrix (void)
11584 cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11523 diff changeset	56 : octave_base_value (), matrix (), typ (), idx_cache () { }
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	57
6376 0eac3484e8df [project @ 2007-03-02 02:18:37 by jwe] jwe parents: 5900 diff changeset	58 octave_base_matrix (const MT& m, const MatrixType& t = MatrixType ())
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	59 : octave_base_value (), matrix (m),
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23588 diff changeset	60 typ (t.is_known () ? new MatrixType (t) : nullptr), idx_cache ()
4676 c0aa75a64635 [project @ 2003-12-16 16:47:52 by jwe] jwe parents: 4661 diff changeset	61 {
c0aa75a64635 [project @ 2003-12-16 16:47:52 by jwe] jwe parents: 4661 diff changeset	62 if (matrix.ndims () == 0)
c0aa75a64635 [project @ 2003-12-16 16:47:52 by jwe] jwe parents: 4661 diff changeset	63 matrix.resize (dim_vector (0, 0));
c0aa75a64635 [project @ 2003-12-16 16:47:52 by jwe] jwe parents: 4661 diff changeset	64 }
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	65
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	66 octave_base_matrix (const octave_base_matrix& m)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	67 : octave_base_value (), matrix (m.matrix),
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23588 diff changeset	68 typ (m.typ ? new MatrixType (*m.typ) : nullptr),
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23588 diff changeset	69 idx_cache (m.idx_cache ? new idx_vector (*m.idx_cache) : nullptr)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	70 { }
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	71
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	72 ~octave_base_matrix (void) { clear_cached_info (); }
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	73
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4676 diff changeset	74 size_t byte_size (void) const { return matrix.byte_size (); }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4676 diff changeset	75
5147 47e4c91e5799 [project @ 2005-02-16 21:06:19 by jwe] jwe parents: 5105 diff changeset	76 octave_value squeeze (void) const { return MT (matrix.squeeze ()); }
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4513 diff changeset	77
8458 d254a21e0120 reimplement full as method of octave_base_value Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	78 octave_value full_value (void) const { return matrix; }
d254a21e0120 reimplement full as method of octave_base_value Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	79
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8458 diff changeset	80 void maybe_economize (void) { matrix.maybe_economize (); }
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8458 diff changeset	81
26916 9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	82 // We don't need to override all three forms of subsref. The using
9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	83 // declaration will avoid warnings about partially-overloaded virtual
9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	84 // functions.
9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	85 using octave_base_value::subsref;
9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	86
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	87 octave_value subsref (const std::string& type,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	88 const std::list<octave_value_list>& idx);
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	89
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7620 diff changeset	90 octave_value_list subsref (const std::string& type,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	91 const std::list<octave_value_list>& idx, int)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	92 { return subsref (type, idx); }
4271 be631c1720ea [project @ 2003-01-03 19:36:04 by jwe] jwe parents: 4247 diff changeset	93
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	94 octave_value subsasgn (const std::string& type,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	95 const std::list<octave_value_list>& idx,
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	96 const octave_value& rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	97
5885 bd3041e30d97 [project @ 2006-07-14 20:29:35 by jwe] jwe parents: 5785 diff changeset	98 octave_value do_index_op (const octave_value_list& idx,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	99 bool resize_ok = false);
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	100
21333 c4690d9ff566 avoid warnings about overloading virtual functions from a base class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	101 // FIXME: should we import the functions from the base class and
c4690d9ff566 avoid warnings about overloading virtual functions from a base class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	102 // overload them here, or should we use a different name so we don't
c4690d9ff566 avoid warnings about overloading virtual functions from a base class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	103 // have to do this? Without the using declaration or a name change,
c4690d9ff566 avoid warnings about overloading virtual functions from a base class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	104 // the base class functions will be hidden. That may be OK, but it
c4690d9ff566 avoid warnings about overloading virtual functions from a base class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	105 // can also cause some confusion.
c4690d9ff566 avoid warnings about overloading virtual functions from a base class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	106 using octave_base_value::assign;
c4690d9ff566 avoid warnings about overloading virtual functions from a base class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	107
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3523 diff changeset	108 void assign (const octave_value_list& idx, const MT& rhs);
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3523 diff changeset	109
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	110 void assign (const octave_value_list& idx, typename MT::element_type rhs);
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	111
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7651 diff changeset	112 void delete_elements (const octave_value_list& idx);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7651 diff changeset	113
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4271 diff changeset	114 dim_vector dims (void) const { return matrix.dims (); }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4271 diff changeset	115
8994 a8d30dc1beec cellfun optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	116 octave_idx_type numel (void) const { return matrix.numel (); }
a8d30dc1beec cellfun optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	117
10653 ec5fa46e0e45 override ndims and numel for scalars and matrices Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	118 int ndims (void) const { return matrix.ndims (); }
ec5fa46e0e45 override ndims and numel for scalars and matrices Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	119
5602 dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5307 diff changeset	120 octave_idx_type nnz (void) const { return matrix.nnz (); }
dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5307 diff changeset	121
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	122 octave_value reshape (const dim_vector& new_dims) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	123 { return MT (matrix.reshape (new_dims)); }
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	124
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4567 diff changeset	125 octave_value permute (const Array<int>& vec, bool inv = false) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	126 { return MT (matrix.permute (vec, inv)); }
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4567 diff changeset	127
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5602 diff changeset	128 octave_value resize (const dim_vector& dv, bool fill = false) const;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4901 diff changeset	129
4017 0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 4015 diff changeset	130 octave_value all (int dim = 0) const { return matrix.all (dim); }
0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 4015 diff changeset	131 octave_value any (int dim = 0) const { return matrix.any (dim); }
3221 eba59b8c64dc [project @ 1998-11-19 20:31:46 by jwe] jwe parents: 3220 diff changeset	132
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	133 MatrixType matrix_type (void) const { return typ ? *typ : MatrixType (); }
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	134 MatrixType matrix_type (const MatrixType& _typ) const;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5759 diff changeset	135
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7463 diff changeset	136 octave_value diag (octave_idx_type k = 0) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	137 { return octave_value (matrix.diag (k)); }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7463 diff changeset	138
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	139 octave_value diag (octave_idx_type m, octave_idx_type n) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	140 { return octave_value (matrix.diag (m, n)); }
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	141
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7433 diff changeset	142 octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	143 { return octave_value (matrix.sort (dim, mode)); }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	144 octave_value sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	145 sortmode mode = ASCENDING) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	146 { return octave_value (matrix.sort (sidx, dim, mode)); }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	147
23588 0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23586 diff changeset	148 sortmode issorted (sortmode mode = UNSORTED) const
0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23586 diff changeset	149 { return matrix.issorted (mode); }
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	150
8733 3ef774603887 rename all uses of sortrows_idx to sort_rows_idx John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	151 Array<octave_idx_type> sort_rows_idx (sortmode mode = ASCENDING) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	152 { return matrix.sort_rows_idx (mode); }
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	153
8734 767ed8cc6634 rename internal issorted and issorted_rows functions to is_sorted and is_sorted_rows John W. Eaton <jwe@octave.org> parents: 8733 diff changeset	154 sortmode is_sorted_rows (sortmode mode = UNSORTED) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	155 { return matrix.is_sorted_rows (mode); }
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	156
3221 eba59b8c64dc [project @ 1998-11-19 20:31:46 by jwe] jwe parents: 3220 diff changeset	157 bool is_matrix_type (void) const { return true; }
eba59b8c64dc [project @ 1998-11-19 20:31:46 by jwe] jwe parents: 3220 diff changeset	158
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23502 diff changeset	159 bool isnumeric (void) const { return true; }
3221 eba59b8c64dc [project @ 1998-11-19 20:31:46 by jwe] jwe parents: 3220 diff changeset	160
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	161 bool is_defined (void) const { return true; }
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	162
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	163 bool is_constant (void) const { return true; }
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	164
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	165 bool is_true (void) const;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	166
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4593 diff changeset	167 bool print_as_scalar (void) const;
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	168
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 17870 diff changeset	169 void print (std::ostream& os, bool pr_as_read_syntax = false);
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	170
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	171 void print_info (std::ostream& os, const std::string& prefix) const;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	172
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	173 void short_disp (std::ostream& os) const;
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17822 diff changeset	174
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24643 diff changeset	175 float_display_format get_edit_display_format (void) const;
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24643 diff changeset	176
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24643 diff changeset	177 std::string edit_display (const float_display_format& fmt,
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24643 diff changeset	178 octave_idx_type i, octave_idx_type j) const;
24643 78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	179
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9358 diff changeset	180 MT& matrix_ref (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	181 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	182 clear_cached_info ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	183 return matrix;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	184 }
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9358 diff changeset	185
10665 0f310fce905d implement octave_base_matrix::matrix_ref const Jaroslav Hajek <highegg@gmail.com> parents: 10653 diff changeset	186 const MT& matrix_ref (void) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	187 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	188 return matrix;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	189 }
10665 0f310fce905d implement octave_base_matrix::matrix_ref const Jaroslav Hajek <highegg@gmail.com> parents: 10653 diff changeset	190
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10665 diff changeset	191 octave_value
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10665 diff changeset	192 fast_elem_extract (octave_idx_type n) const;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10665 diff changeset	193
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10665 diff changeset	194 bool
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10665 diff changeset	195 fast_elem_insert (octave_idx_type n, const octave_value& x);
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10665 diff changeset	196
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	197 protected:
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	198
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	199 MT matrix;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5759 diff changeset	200
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	201 idx_vector set_idx_cache (const idx_vector& idx) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	202 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	203 delete idx_cache;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23588 diff changeset	204 idx_cache = (idx ? new idx_vector (idx) : nullptr);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	205 return idx;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	206 }
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	207
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	208 void clear_cached_info (void) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	209 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23588 diff changeset	210 delete typ; typ = nullptr;
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23588 diff changeset	211 delete idx_cache; idx_cache = nullptr;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	212 }
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	213
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	214 mutable MatrixType *typ;
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 8994 diff changeset	215 mutable idx_vector *idx_cache;
12153 e0e50f48df37 Explicitly disallow copying in some classes Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	216
e0e50f48df37 Explicitly disallow copying in some classes Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	217 private:
e0e50f48df37 Explicitly disallow copying in some classes Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	218
e0e50f48df37 Explicitly disallow copying in some classes Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	219 // No assignment.
e0e50f48df37 Explicitly disallow copying in some classes Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	220
e0e50f48df37 Explicitly disallow copying in some classes Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	221 octave_base_matrix& operator = (const octave_base_matrix&);
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	222 };
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	223
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	224 #endif

Mercurial > octave

annotate libinterp/octave-value/ov-base-mat.h @ 28641:2c15231c3154