Mercurial > hg > octave-lojdl
annotate libinterp/octave-value/ov-base-mat.h @ 16442:302157614308
deprecate symbol_table::varref functions
* ov-usr-fcn.h (octave_user_function::argn_varref,
octave_user_function::nargin_varref,
octave_user_function::nargout_varref,
octave_user_function::varargin_varref): Delete unused variables.
* symtab.h (symbol_table::symbol_record::symbol_record_ref::assign,
symbol_table::symbol_record::symbol_record_ref::do_non_const_unary_op,
symbol_table::symbol_record::do_non_const_unary_op,
(symbol_table::symbol_record::is_undefined,
symbol_table::symbol_record::assign, symbol_table::assign,
symbol_table::force_assign, symbol_table::global_assign,
symbol_table::persistent_assign, symbol_table::top_level_assign,
symbol_table::do_assign, symbol_table::do_persistent_assign):
New functions.
(symbol_table::symbol_record::symbol_record_ref::varref):
Avoid calls to deprecated functions.
(symbol_table::varref, symbol_table::force_varref,
symbol_table::global_varref, symbol_table::persistent_varref,
symbol_table::top_level_varref, symbol_table::do_varref,
symbol_table::do_persistent_varref): Deprecate.
(symbol_table::symbol_reference::is_black_hole): New function.
* oct-lvalue.h, oct-lvalue.cc: Store symbol_reference instead of
pointer to octave_value object.
(octave_lvalue::value): Now const.
(octave_lvalue::object): Delete.
* pt-id.cc (tree_identifier::lvalue): Construct octave_lvalue from
sym, not sym->varref.
* ls-mat5.cc, oct-lvalue.cc, oct-lvalue.h, pt-jit.cc, error.cc,
load-save.cc, symtab.cc, symtab.h, variables.cc, ov-fcn-handle.cc,
ov-usr-fcn.cc, ov-usr-fcn.h, oct-parse.in.yy, pt-eval.cc, pt-id.h,
pt-idx.cc, mex.cc: Change all uses of varref functions to use assign
instead. Use varval instead of varref where appropriate.
* load-save.cc (install_loaded_variable): Don't manipulate
symbol_record directly.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 06 Apr 2013 11:51:23 -0400 |
| parents | 2fc554ffbc28 |
| children |
| rev | line source |
|---|---|
| 3219 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13696
diff
changeset
|
3 Copyright (C) 1998-2012 John W. Eaton |
| 11523 | 4 Copyright (C) 2009-2010 VZLU Prague |
| 3219 | 5 |
| 6 This file is part of Octave. | |
| 7 | |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 3219 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 3219 | 21 |
| 22 */ | |
| 23 | |
| 24 #if !defined (octave_base_matrix_h) | |
| 25 #define octave_base_matrix_h 1 | |
| 26 | |
| 27 #include <cstdlib> | |
| 28 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
29 #include <iosfwd> |
| 3219 | 30 #include <string> |
| 31 | |
| 32 #include "mx-base.h" | |
| 33 #include "str-vec.h" | |
| 6376 | 34 #include "MatrixType.h" |
| 3219 | 35 |
| 36 #include "error.h" | |
| 4649 | 37 #include "oct-obj.h" |
| 3219 | 38 #include "ov-base.h" |
| 39 #include "ov-typeinfo.h" | |
| 40 | |
| 41 class tree_walker; | |
| 42 | |
| 43 // Real matrix values. | |
| 44 | |
| 3223 | 45 template <class MT> |
| 46 class | |
| 3219 | 47 octave_base_matrix : public octave_base_value |
| 48 { | |
| 49 public: | |
| 50 | |
| 51 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
|
52 : octave_base_value (), matrix (), typ (), idx_cache () { } |
| 3219 | 53 |
| 6376 | 54 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
|
55 : octave_base_value (), matrix (m), |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14557
diff
changeset
|
56 typ (t.is_known () ? new MatrixType (t) : 0), idx_cache () |
| 4676 | 57 { |
| 58 if (matrix.ndims () == 0) | |
| 59 matrix.resize (dim_vector (0, 0)); | |
| 60 } | |
| 3219 | 61 |
| 62 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
|
63 : octave_base_value (), matrix (m.matrix), |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
64 typ (m.typ ? new MatrixType (*m.typ) : 0), |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
65 idx_cache (m.idx_cache ? new idx_vector (*m.idx_cache) : 0) |
|
9350
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
66 { } |
| 3219 | 67 |
|
9350
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
68 ~octave_base_matrix (void) { clear_cached_info (); } |
| 3219 | 69 |
| 4901 | 70 size_t byte_size (void) const { return matrix.byte_size (); } |
| 71 | |
| 5147 | 72 octave_value squeeze (void) const { return MT (matrix.squeeze ()); } |
| 4532 | 73 |
|
8458
d254a21e0120
reimplement full as method of octave_base_value
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
74 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
|
75 |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8458
diff
changeset
|
76 void maybe_economize (void) { matrix.maybe_economize (); } |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8458
diff
changeset
|
77 |
| 4247 | 78 octave_value subsref (const std::string& type, |
| 10313 | 79 const std::list<octave_value_list>& idx); |
| 3219 | 80 |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7620
diff
changeset
|
81 octave_value_list subsref (const std::string& type, |
| 10313 | 82 const std::list<octave_value_list>& idx, int) |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7620
diff
changeset
|
83 { return subsref (type, idx); } |
| 4271 | 84 |
| 4247 | 85 octave_value subsasgn (const std::string& type, |
| 10313 | 86 const std::list<octave_value_list>& idx, |
| 87 const octave_value& rhs); | |
| 3933 | 88 |
| 5885 | 89 octave_value do_index_op (const octave_value_list& idx, |
| 10313 | 90 bool resize_ok = false); |
| 3220 | 91 |
|
13696
d6118a2c0644
fix indexing bug for matrices inside anonymous functions
John W. Eaton <jwe@octave.org>
parents:
12153
diff
changeset
|
92 octave_value_list do_multi_index_op (int, const octave_value_list& idx) |
|
d6118a2c0644
fix indexing bug for matrices inside anonymous functions
John W. Eaton <jwe@octave.org>
parents:
12153
diff
changeset
|
93 { return do_index_op (idx); } |
|
d6118a2c0644
fix indexing bug for matrices inside anonymous functions
John W. Eaton <jwe@octave.org>
parents:
12153
diff
changeset
|
94 |
| 3928 | 95 void assign (const octave_value_list& idx, const MT& rhs); |
| 96 | |
|
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
97 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
|
98 |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7651
diff
changeset
|
99 void delete_elements (const octave_value_list& idx); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7651
diff
changeset
|
100 |
| 4513 | 101 dim_vector dims (void) const { return matrix.dims (); } |
| 102 | |
| 8994 | 103 octave_idx_type numel (void) const { return matrix.numel (); } |
| 104 | |
|
10653
ec5fa46e0e45
override ndims and numel for scalars and matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
10544
diff
changeset
|
105 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
|
106 |
| 5602 | 107 octave_idx_type nnz (void) const { return matrix.nnz (); } |
| 108 | |
| 4567 | 109 octave_value reshape (const dim_vector& new_dims) const |
| 110 { return MT (matrix.reshape (new_dims)); } | |
| 111 | |
| 4593 | 112 octave_value permute (const Array<int>& vec, bool inv = false) const |
| 113 { return MT (matrix.permute (vec, inv)); } | |
| 114 | |
| 5731 | 115 octave_value resize (const dim_vector& dv, bool fill = false) const; |
| 4915 | 116 |
| 4017 | 117 octave_value all (int dim = 0) const { return matrix.all (dim); } |
| 118 octave_value any (int dim = 0) const { return matrix.any (dim); } | |
| 3221 | 119 |
|
9350
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
120 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
|
121 MatrixType matrix_type (const MatrixType& _typ) const; |
| 5785 | 122 |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7463
diff
changeset
|
123 octave_value diag (octave_idx_type k = 0) const |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7463
diff
changeset
|
124 { return octave_value (matrix.diag (k)); } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7463
diff
changeset
|
125 |
|
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
|
126 octave_value diag (octave_idx_type m, octave_idx_type n) const |
|
e8e86ae3abbc
make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
127 { return octave_value (matrix.diag (m, n)); } |
|
e8e86ae3abbc
make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
128 |
|
7463
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
129 octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const |
| 7433 | 130 { return octave_value (matrix.sort (dim, mode)); } |
| 131 octave_value sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0, | |
| 10313 | 132 sortmode mode = ASCENDING) const |
| 7433 | 133 { return octave_value (matrix.sort (sidx, dim, mode)); } |
| 134 | |
|
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
|
135 sortmode is_sorted (sortmode mode = UNSORTED) const |
|
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8679
diff
changeset
|
136 { return matrix.is_sorted (mode); } |
|
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8679
diff
changeset
|
137 |
|
8733
3ef774603887
rename all uses of sortrows_idx to sort_rows_idx
John W. Eaton <jwe@octave.org>
parents:
8721
diff
changeset
|
138 Array<octave_idx_type> sort_rows_idx (sortmode mode = ASCENDING) const |
|
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8679
diff
changeset
|
139 { return matrix.sort_rows_idx (mode); } |
|
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8679
diff
changeset
|
140 |
|
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
|
141 sortmode is_sorted_rows (sortmode mode = UNSORTED) const |
|
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8679
diff
changeset
|
142 { return matrix.is_sorted_rows (mode); } |
|
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8679
diff
changeset
|
143 |
| 3221 | 144 bool is_matrix_type (void) const { return true; } |
| 145 | |
| 146 bool is_numeric_type (void) const { return true; } | |
| 147 | |
| 3219 | 148 bool is_defined (void) const { return true; } |
| 149 | |
| 150 bool is_constant (void) const { return true; } | |
| 151 | |
| 3220 | 152 bool is_true (void) const; |
| 153 | |
| 4604 | 154 bool print_as_scalar (void) const; |
| 3219 | 155 |
| 3523 | 156 void print (std::ostream& os, bool pr_as_read_syntax = false) const; |
| 3219 | 157 |
| 3933 | 158 void print_info (std::ostream& os, const std::string& prefix) const; |
| 159 | |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
160 MT& matrix_ref (void) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
161 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
162 clear_cached_info (); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
163 return matrix; |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
164 } |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
165 |
|
10665
0f310fce905d
implement octave_base_matrix::matrix_ref const
Jaroslav Hajek <highegg@gmail.com>
parents:
10653
diff
changeset
|
166 const MT& matrix_ref (void) const |
|
0f310fce905d
implement octave_base_matrix::matrix_ref const
Jaroslav Hajek <highegg@gmail.com>
parents:
10653
diff
changeset
|
167 { |
|
0f310fce905d
implement octave_base_matrix::matrix_ref const
Jaroslav Hajek <highegg@gmail.com>
parents:
10653
diff
changeset
|
168 return matrix; |
|
0f310fce905d
implement octave_base_matrix::matrix_ref const
Jaroslav Hajek <highegg@gmail.com>
parents:
10653
diff
changeset
|
169 } |
|
0f310fce905d
implement octave_base_matrix::matrix_ref const
Jaroslav Hajek <highegg@gmail.com>
parents:
10653
diff
changeset
|
170 |
|
10670
654fbde5dceb
make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents:
10665
diff
changeset
|
171 octave_value |
|
654fbde5dceb
make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents:
10665
diff
changeset
|
172 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
|
173 |
|
654fbde5dceb
make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents:
10665
diff
changeset
|
174 bool |
|
654fbde5dceb
make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents:
10665
diff
changeset
|
175 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
|
176 |
| 3219 | 177 protected: |
| 178 | |
| 179 MT matrix; | |
| 5785 | 180 |
|
9350
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
181 idx_vector set_idx_cache (const idx_vector& idx) const |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
182 { |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
183 delete idx_cache; |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
184 idx_cache = idx ? new idx_vector (idx) : 0; |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
185 return idx; |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
186 } |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
187 |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
188 void clear_cached_info (void) const |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
189 { |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
190 delete typ; typ = 0; |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
191 delete idx_cache; idx_cache = 0; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
192 } |
|
9350
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
193 |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
194 mutable MatrixType *typ; |
|
16a5f9e1fdb3
cache idx_vector result in matrices once used for indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8994
diff
changeset
|
195 mutable idx_vector *idx_cache; |
|
12153
e0e50f48df37
Explicitly disallow copying in some classes
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
196 |
|
e0e50f48df37
Explicitly disallow copying in some classes
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
197 private: |
|
e0e50f48df37
Explicitly disallow copying in some classes
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
198 |
|
e0e50f48df37
Explicitly disallow copying in some classes
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
199 // No assignment. |
|
e0e50f48df37
Explicitly disallow copying in some classes
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
200 |
|
e0e50f48df37
Explicitly disallow copying in some classes
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11586
diff
changeset
|
201 octave_base_matrix& operator = (const octave_base_matrix&); |
| 3219 | 202 }; |
| 203 | |
| 204 #endif |