Mercurial > hg > octave-lyh
annotate src/oct-obj.h @ 8580:188d38a553c7
further indexing optimization touches
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 23 Jan 2009 13:13:39 +0100 |
| parents | 7e0f36dfefbe |
| children | eb63fbe60fab |
| rev | line source |
|---|---|
| 498 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2002, 2003, 2004, |
| 4 2005, 2006, 2007 John W. Eaton | |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
5 Copyright (C) 2009 VZLU Prague |
| 498 | 6 |
| 7 This file is part of Octave. | |
| 8 | |
| 9 Octave is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 7016 | 11 Free Software Foundation; either version 3 of the License, or (at your |
| 12 option) any later version. | |
| 498 | 13 |
| 14 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 7016 | 20 along with Octave; see the file COPYING. If not, see |
| 21 <http://www.gnu.org/licenses/>. | |
| 498 | 22 |
| 23 */ | |
| 24 | |
| 504 | 25 #if !defined (octave_oct_obj_h) |
| 26 #define octave_oct_obj_h 1 | |
| 27 | |
| 1968 | 28 #include <string> |
| 4591 | 29 #include <vector> |
| 1968 | 30 |
| 2970 | 31 #include "oct-alloc.h" |
| 2943 | 32 #include "str-vec.h" |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
33 #include "Array.h" |
| 498 | 34 |
| 2369 | 35 #include "ov.h" |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
36 #include "Cell.h" |
| 498 | 37 |
| 737 | 38 class |
| 6109 | 39 OCTINTERP_API |
| 2872 | 40 octave_value_list |
| 508 | 41 { |
| 42 public: | |
| 43 | |
| 2086 | 44 octave_value_list (void) |
| 2872 | 45 : data () { } |
| 1968 | 46 |
| 5275 | 47 octave_value_list (octave_idx_type n, const octave_value& val) |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
48 : data (dim_vector (1, n), val) { } |
| 511 | 49 |
| 2086 | 50 octave_value_list (const octave_value& tc) |
| 2872 | 51 : data (1, tc) { } |
| 1968 | 52 |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
53 octave_value_list (const Array<octave_value>& d) |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
54 : data (d.reshape (dim_vector (1, d.numel ()))) { } |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
55 |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
56 octave_value_list (const Cell& tc) |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
57 : data (tc.reshape (dim_vector (1, tc.numel ()))) { } |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
58 |
| 2086 | 59 octave_value_list (const octave_value_list& obj) |
| 4150 | 60 : data (obj.data), names (obj.names) { } |
| 508 | 61 |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
62 // Concatenation constructor. |
|
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
63 octave_value_list (const std::list<octave_value_list>&); |
|
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
64 |
| 4189 | 65 ~octave_value_list (void) { } |
| 66 | |
| 2970 | 67 void *operator new (size_t size) |
| 68 { return allocator.alloc (size); } | |
| 69 | |
| 4280 | 70 void operator delete (void *p, size_t size) |
| 71 { allocator.free (p, size); } | |
| 72 | |
| 5775 | 73 // FIXME -- without this, I have errors with the stack of |
| 4214 | 74 // octave_value_list objects in ov-usr-fcn.h. Why? |
| 75 void *operator new (size_t size, void *p) | |
| 76 { return ::operator new (size, p); } | |
| 77 | |
| 4280 | 78 void operator delete (void *p, void *) |
| 4352 | 79 { |
| 80 #if defined (HAVE_PLACEMENT_DELETE) | |
| 81 ::operator delete (p, static_cast<void *> (0)); | |
| 82 #else | |
| 83 ::operator delete (p); | |
| 84 #endif | |
| 85 } | |
| 2970 | 86 |
| 2086 | 87 octave_value_list& operator = (const octave_value_list& obj) |
| 508 | 88 { |
| 1968 | 89 if (this != &obj) |
| 4150 | 90 { |
| 91 data = obj.data; | |
| 92 names = obj.names; | |
| 93 } | |
| 1968 | 94 |
| 508 | 95 return *this; |
| 96 } | |
| 97 | |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
98 Array<octave_value> array_value (void) const { return data; } |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
99 |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
100 Cell cell_value (void) const { return array_value (); } |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
101 |
| 2872 | 102 // Assignment will resize on range errors. |
| 508 | 103 |
| 5275 | 104 octave_value& operator () (octave_idx_type n) { return elem (n); } |
| 1968 | 105 |
| 5275 | 106 octave_value operator () (octave_idx_type n) const { return elem (n); } |
| 526 | 107 |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
108 octave_idx_type length (void) const { return data.length (); } |
| 2872 | 109 |
| 2951 | 110 bool empty (void) const { return length () == 0; } |
| 111 | |
| 5275 | 112 void resize (octave_idx_type n) { data.resize (n); } |
| 2872 | 113 |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
114 void resize (octave_idx_type n, const octave_value& val) |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
115 { data.resize (n, val); } |
| 2872 | 116 |
| 117 octave_value_list& prepend (const octave_value& val); | |
| 118 | |
| 119 octave_value_list& append (const octave_value& val); | |
| 120 | |
| 121 octave_value_list& append (const octave_value_list& lst); | |
| 122 | |
| 123 octave_value_list& reverse (void); | |
| 124 | |
| 6335 | 125 octave_value_list |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
126 slice (octave_idx_type offset, octave_idx_type len) const |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
127 { return data.index (idx_vector (offset, offset + len)); } |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
128 |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
129 octave_value_list |
| 6335 | 130 splice (octave_idx_type offset, octave_idx_type len, |
| 131 const octave_value_list& lst = octave_value_list ()) const; | |
| 3195 | 132 |
| 2872 | 133 bool all_strings_p (void) const; |
| 1968 | 134 |
|
8455
fd11a08a9b31
disallow invalid {}-indexed assigments
Jaroslav Hajek <highegg@gmail.com>
parents:
8437
diff
changeset
|
135 bool all_scalars (void) const; |
|
fd11a08a9b31
disallow invalid {}-indexed assigments
Jaroslav Hajek <highegg@gmail.com>
parents:
8437
diff
changeset
|
136 |
| 5846 | 137 bool has_magic_colon (void) const; |
| 138 | |
|
8034
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
139 string_vector make_argv (const std::string& = std::string()) const; |
| 526 | 140 |
| 2943 | 141 void stash_name_tags (const string_vector& nm) { names = nm; } |
| 142 | |
| 143 string_vector name_tags (void) const { return names; } | |
| 144 | |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8455
diff
changeset
|
145 void make_storable_values (void); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8034
diff
changeset
|
146 |
| 526 | 147 private: |
| 508 | 148 |
| 2970 | 149 static octave_allocator allocator; |
| 150 | |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
151 Array<octave_value> data; |
| 2872 | 152 |
| 2943 | 153 // This list of strings can be used to tag each element of data with |
| 154 // a name. By default, it is empty. | |
| 155 string_vector names; | |
| 156 | |
| 2872 | 157 // This constructor is private with no definition to keep statements |
| 158 // like | |
| 159 // | |
| 160 // octave_value_list foo = 5; | |
| 161 // octave_value_list foo = 5.0; | |
| 162 // | |
| 163 // from doing different things. Instead, you have to use the | |
| 164 // constructor | |
| 165 // | |
| 166 // octave_value_list (n, val); | |
| 167 // | |
| 168 // and supply a default value to create a vector-valued | |
| 169 // octave_value_list. | |
| 565 | 170 |
| 5275 | 171 octave_value_list (octave_idx_type n); |
| 565 | 172 |
| 5275 | 173 octave_value& elem (octave_idx_type n) |
| 1968 | 174 { |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
175 if (n >= length ()) |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
176 resize (n + 1); |
| 4591 | 177 |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
178 return data(n); |
| 1968 | 179 } |
| 180 | |
| 5275 | 181 octave_value elem (octave_idx_type n) const |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
182 { return data(n); } |
| 508 | 183 }; |
| 498 | 184 |
| 504 | 185 #endif |
| 186 | |
| 498 | 187 /* |
| 188 ;;; Local Variables: *** | |
| 189 ;;; mode: C++ *** | |
| 190 ;;; End: *** | |
| 191 */ |