Mercurial > hg > octave-nkf
annotate src/Cell.h @ 14348:95c43fc8dbe1 stable rc-3-6-1-0
3.6.1 release candidate 0
* configure.ac (AC_INIT): Version is now 3.6.1-rc0.
(OCTAVE_RELEASE_DATE): Now 2012-02-07.
* liboctave/Makefile.am: Bump liboctave revision version.
* src/Makefile.am: Bump liboctave revision version.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 09 Feb 2012 11:25:04 -0500 |
parents | 72c96de7a403 |
children | e8e86ae3abbc |
rev | line source |
---|---|
3353 | 1 /* |
2 | |
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
3 Copyright (C) 1999-2012 John W. Eaton |
11523 | 4 Copyright (C) 2009-2010 VZLU Prague |
3353 | 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. | |
3353 | 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/>. | |
3353 | 21 |
22 */ | |
23 | |
24 #if !defined (Cell_h) | |
25 #define Cell_h 1 | |
26 | |
27 #include <string> | |
28 | |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
29 #include "Array.h" |
3353 | 30 #include "oct-alloc.h" |
31 #include "str-vec.h" | |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
32 #include "ov.h" |
3353 | 33 |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
34 class octave_value_list; |
3353 | 35 |
36 class | |
6169 | 37 OCTINTERP_API |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
38 Cell : public Array<octave_value> |
3353 | 39 { |
40 public: | |
41 | |
42 Cell (void) | |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
43 : Array<octave_value> (dim_vector (0, 0)) { } |
3928 | 44 |
45 Cell (const octave_value& val) | |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
46 : Array<octave_value> (dim_vector (1, 1), val) { } |
4513 | 47 |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8333
diff
changeset
|
48 Cell (const octave_value_list& ovl); |
3353 | 49 |
7209 | 50 Cell (octave_idx_type n, octave_idx_type m, |
10313 | 51 const octave_value& val = resize_fill_value ()) |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
52 : Array<octave_value> (dim_vector (n, m), val) { } |
3353 | 53 |
4587 | 54 Cell (const dim_vector& dv, const octave_value& val = resize_fill_value ()) |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
55 : Array<octave_value> (dv, val) { } |
3354 | 56 |
4567 | 57 Cell (const Array<octave_value>& c) |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
58 : Array<octave_value> (c) { } |
4567 | 59 |
5275 | 60 Cell (const Array<octave_value>& c, octave_idx_type nr, octave_idx_type nc) |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
61 : Array<octave_value> (c, dim_vector (nr, nc)) { } |
3933 | 62 |
5805 | 63 Cell (const string_vector& sv, bool trim = false); |
4216 | 64 |
11037
e7864673c31f
new Cell (std::list<std::string>&) constructor
John W. Eaton <jwe@octave.org>
parents:
10757
diff
changeset
|
65 Cell (const std::list<std::string>& lst); |
e7864673c31f
new Cell (std::list<std::string>&) constructor
John W. Eaton <jwe@octave.org>
parents:
10757
diff
changeset
|
66 |
8732 | 67 Cell (const Array<std::string>& sa); |
68 | |
6116 | 69 Cell (const dim_vector& dv, const string_vector& sv, bool trim = false); |
70 | |
3353 | 71 Cell (const Cell& c) |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
72 : Array<octave_value> (c) { } |
4513 | 73 |
6116 | 74 bool is_cellstr (void) const; |
75 | |
10065
64a06079cae4
improve cellstr cache implementation
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
76 Array<std::string> cellstr_value (void) const; |
64a06079cae4
improve cellstr cache implementation
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
77 |
10649
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
78 using Array<octave_value>::index; |
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
79 |
4513 | 80 Cell index (const octave_value_list& idx, bool resize_ok = false) const; |
81 | |
10649
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
82 using Array<octave_value>::delete_elements; |
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
83 |
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
84 void delete_elements (const octave_value_list& idx); |
8175
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
85 |
10649
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
86 using Array<octave_value>::assign; |
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
87 |
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
88 void assign (const octave_value_list& idx, const Cell& rhs, |
64472dd48517
cosmetic changes in Cell interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10521
diff
changeset
|
89 const octave_value& fill_val = resize_fill_value ()); |
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8175
diff
changeset
|
90 |
4901 | 91 Cell reshape (const dim_vector& new_dims) const |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
92 { return Array<octave_value>::reshape (new_dims); } |
4901 | 93 |
5602 | 94 octave_idx_type nnz (void) const; |
95 | |
5570 | 96 Cell column (octave_idx_type i) const; |
97 | |
5775 | 98 // FIXME |
4932 | 99 boolMatrix all (int /* dim */ = 0) const { return boolMatrix (); } |
3933 | 100 |
5775 | 101 // FIXME |
4932 | 102 boolMatrix any (int /* dim */ = 0) const { return boolMatrix (); } |
3933 | 103 |
5275 | 104 Cell concat (const Cell& rb, const Array<octave_idx_type>& ra_idx); |
4915 | 105 |
5275 | 106 Cell& insert (const Cell& a, octave_idx_type r, octave_idx_type c); |
107 Cell& insert (const Cell& a, const Array<octave_idx_type>& ra_idx); | |
4806 | 108 |
5775 | 109 // FIXME |
8626
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8579
diff
changeset
|
110 bool any_element_is_nan (void) const { return false; } |
3933 | 111 bool is_true (void) const { return false; } |
112 | |
4219 | 113 static octave_value resize_fill_value (void) { return Matrix (); } |
7530
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
114 |
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7618
diff
changeset
|
115 Cell diag (octave_idx_type k = 0) const; |
7618
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
116 |
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
117 Cell xisalnum (void) const { return map (&octave_value::xisalnum); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
118 Cell xisalpha (void) const { return map (&octave_value::xisalpha); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
119 Cell xisascii (void) const { return map (&octave_value::xisascii); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
120 Cell xiscntrl (void) const { return map (&octave_value::xiscntrl); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
121 Cell xisdigit (void) const { return map (&octave_value::xisdigit); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
122 Cell xisgraph (void) const { return map (&octave_value::xisgraph); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
123 Cell xislower (void) const { return map (&octave_value::xislower); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
124 Cell xisprint (void) const { return map (&octave_value::xisprint); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
125 Cell xispunct (void) const { return map (&octave_value::xispunct); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
126 Cell xisspace (void) const { return map (&octave_value::xisspace); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
127 Cell xisupper (void) const { return map (&octave_value::xisupper); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
128 Cell xisxdigit (void) const { return map (&octave_value::xisxdigit); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
129 Cell xtoascii (void) const { return map (&octave_value::xtoascii); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
130 Cell xtolower (void) const { return map (&octave_value::xtolower); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
131 Cell xtoupper (void) const { return map (&octave_value::xtoupper); } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
132 |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
133 private: |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
134 |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
135 typedef octave_value (octave_value::*ctype_mapper) (void) const; |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
136 |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
137 Cell map (ctype_mapper) const; |
3353 | 138 }; |
139 | |
10757
1cc44f3ec814
templated extractors for maps and cells
Jaroslav Hajek <highegg@gmail.com>
parents:
10649
diff
changeset
|
140 template<> |
1cc44f3ec814
templated extractors for maps and cells
Jaroslav Hajek <highegg@gmail.com>
parents:
10649
diff
changeset
|
141 inline Cell octave_value_extract<Cell> (const octave_value& v) |
1cc44f3ec814
templated extractors for maps and cells
Jaroslav Hajek <highegg@gmail.com>
parents:
10649
diff
changeset
|
142 { return v.cell_value (); } |
1cc44f3ec814
templated extractors for maps and cells
Jaroslav Hajek <highegg@gmail.com>
parents:
10649
diff
changeset
|
143 |
3353 | 144 #endif |