Mercurial > octave
annotate src/ov.cc @ 9661:afcf852256d2
optimize / and '\ for triangular matrices
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 23 Sep 2009 10:00:16 +0200 |
| parents | 1c76e806c2a7 |
| children | 34d6f005db4b |
| rev | line source |
|---|---|
| 2376 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, |
| 8920 | 4 2006, 2007, 2008, 2009 John W. Eaton |
| 2376 | 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. | |
| 2376 | 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/>. | |
| 2376 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 4970 | 28 #include "data-conv.h" |
| 29 #include "quit.h" | |
| 2942 | 30 #include "str-vec.h" |
| 2376 | 31 |
| 2974 | 32 #include "oct-obj.h" |
| 4944 | 33 #include "oct-stream.h" |
| 2376 | 34 #include "ov.h" |
| 35 #include "ov-base.h" | |
| 2825 | 36 #include "ov-bool.h" |
| 37 #include "ov-bool-mat.h" | |
| 3351 | 38 #include "ov-cell.h" |
| 2376 | 39 #include "ov-scalar.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
40 #include "ov-float.h" |
| 2376 | 41 #include "ov-re-mat.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
42 #include "ov-flt-re-mat.h" |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
43 #include "ov-re-diag.h" |
|
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
44 #include "ov-flt-re-diag.h" |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
45 #include "ov-perm.h" |
| 5164 | 46 #include "ov-bool-sparse.h" |
| 47 #include "ov-cx-sparse.h" | |
| 48 #include "ov-re-sparse.h" | |
| 4901 | 49 #include "ov-int8.h" |
| 50 #include "ov-int16.h" | |
| 51 #include "ov-int32.h" | |
| 52 #include "ov-int64.h" | |
| 53 #include "ov-uint8.h" | |
| 54 #include "ov-uint16.h" | |
| 55 #include "ov-uint32.h" | |
| 56 #include "ov-uint64.h" | |
| 2376 | 57 #include "ov-complex.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
58 #include "ov-flt-complex.h" |
| 2376 | 59 #include "ov-cx-mat.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
60 #include "ov-flt-cx-mat.h" |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
61 #include "ov-cx-diag.h" |
|
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
62 #include "ov-flt-cx-diag.h" |
| 2376 | 63 #include "ov-ch-mat.h" |
| 64 #include "ov-str-mat.h" | |
| 65 #include "ov-range.h" | |
| 66 #include "ov-struct.h" | |
| 7336 | 67 #include "ov-class.h" |
| 2880 | 68 #include "ov-list.h" |
| 3977 | 69 #include "ov-cs-list.h" |
| 2376 | 70 #include "ov-colon.h" |
| 2974 | 71 #include "ov-builtin.h" |
| 4649 | 72 #include "ov-dld-fcn.h" |
| 2974 | 73 #include "ov-usr-fcn.h" |
| 4342 | 74 #include "ov-fcn-handle.h" |
| 4966 | 75 #include "ov-fcn-inline.h" |
| 2376 | 76 #include "ov-typeinfo.h" |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
77 #include "ov-null-mat.h" |
| 2376 | 78 |
| 79 #include "defun.h" | |
| 2880 | 80 #include "error.h" |
| 2376 | 81 #include "gripes.h" |
| 82 #include "pager.h" | |
| 4005 | 83 #include "parse.h" |
| 2376 | 84 #include "pr-output.h" |
| 7336 | 85 #include "symtab.h" |
| 2376 | 86 #include "utils.h" |
| 87 #include "variables.h" | |
| 88 | |
| 2477 | 89 // We are likely to have a lot of octave_value objects to allocate, so |
| 90 // make the grow_size large. | |
| 3219 | 91 DEFINE_OCTAVE_ALLOCATOR2(octave_value, 1024); |
| 2477 | 92 |
| 5775 | 93 // FIXME |
| 2880 | 94 |
| 2376 | 95 // Octave's value type. |
| 96 | |
| 3536 | 97 std::string |
| 3203 | 98 octave_value::unary_op_as_string (unary_op op) |
| 99 { | |
| 3523 | 100 std::string retval; |
| 3203 | 101 |
| 102 switch (op) | |
| 103 { | |
| 3533 | 104 case op_not: |
| 3203 | 105 retval = "!"; |
| 106 break; | |
| 107 | |
| 4965 | 108 case op_uplus: |
| 109 retval = "+"; | |
| 110 break; | |
| 111 | |
| 3533 | 112 case op_uminus: |
| 3203 | 113 retval = "-"; |
| 114 break; | |
| 115 | |
| 3533 | 116 case op_transpose: |
| 3203 | 117 retval = ".'"; |
| 118 break; | |
| 119 | |
| 3533 | 120 case op_hermitian: |
| 3203 | 121 retval = "'"; |
| 122 break; | |
| 123 | |
| 3533 | 124 case op_incr: |
| 3203 | 125 retval = "++"; |
| 126 break; | |
| 127 | |
| 3533 | 128 case op_decr: |
| 3203 | 129 retval = "--"; |
| 130 break; | |
| 131 | |
| 132 default: | |
| 133 retval = "<unknown>"; | |
| 134 } | |
| 135 | |
| 136 return retval; | |
| 137 } | |
| 138 | |
| 3536 | 139 std::string |
| 7336 | 140 octave_value::unary_op_fcn_name (unary_op op) |
| 141 { | |
| 142 std::string retval; | |
| 143 | |
| 144 switch (op) | |
| 145 { | |
| 146 case op_not: | |
| 147 retval = "not"; | |
| 148 break; | |
| 149 | |
| 150 case op_uplus: | |
| 151 retval = "uplus"; | |
| 152 break; | |
| 153 | |
| 154 case op_uminus: | |
| 155 retval = "uminus"; | |
| 156 break; | |
| 157 | |
| 158 case op_transpose: | |
| 159 retval = "transpose"; | |
| 160 break; | |
| 161 | |
| 162 case op_hermitian: | |
| 163 retval = "ctranspose"; | |
| 164 break; | |
| 165 | |
| 166 default: | |
| 167 break; | |
| 168 } | |
| 169 | |
| 170 return retval; | |
| 171 } | |
| 172 | |
| 173 std::string | |
| 2376 | 174 octave_value::binary_op_as_string (binary_op op) |
| 175 { | |
| 3523 | 176 std::string retval; |
| 2376 | 177 |
| 178 switch (op) | |
| 179 { | |
| 3533 | 180 case op_add: |
| 2376 | 181 retval = "+"; |
| 182 break; | |
| 183 | |
| 3533 | 184 case op_sub: |
| 2376 | 185 retval = "-"; |
| 186 break; | |
| 187 | |
| 3533 | 188 case op_mul: |
| 2376 | 189 retval = "*"; |
| 190 break; | |
| 191 | |
| 3533 | 192 case op_div: |
| 2376 | 193 retval = "/"; |
| 194 break; | |
| 195 | |
| 3533 | 196 case op_pow: |
| 2376 | 197 retval = "^"; |
| 198 break; | |
| 199 | |
| 3533 | 200 case op_ldiv: |
| 2376 | 201 retval = "\\"; |
| 202 break; | |
| 203 | |
| 3533 | 204 case op_lshift: |
| 2903 | 205 retval = "<<"; |
| 206 break; | |
| 207 | |
| 3533 | 208 case op_rshift: |
| 2903 | 209 retval = ">>"; |
| 210 break; | |
| 211 | |
| 3533 | 212 case op_lt: |
| 2376 | 213 retval = "<"; |
| 214 break; | |
| 215 | |
| 3533 | 216 case op_le: |
| 2376 | 217 retval = "<="; |
| 218 break; | |
| 219 | |
| 3533 | 220 case op_eq: |
| 2376 | 221 retval = "=="; |
| 222 break; | |
| 223 | |
| 3533 | 224 case op_ge: |
| 2376 | 225 retval = ">="; |
| 226 break; | |
| 227 | |
| 3533 | 228 case op_gt: |
| 2376 | 229 retval = ">"; |
| 230 break; | |
| 231 | |
| 3533 | 232 case op_ne: |
| 2376 | 233 retval = "!="; |
| 234 break; | |
| 235 | |
| 3533 | 236 case op_el_mul: |
| 2376 | 237 retval = ".*"; |
| 238 break; | |
| 239 | |
| 3533 | 240 case op_el_div: |
| 2376 | 241 retval = "./"; |
| 242 break; | |
| 243 | |
| 3533 | 244 case op_el_pow: |
| 2376 | 245 retval = ".^"; |
| 246 break; | |
| 247 | |
| 3533 | 248 case op_el_ldiv: |
| 2376 | 249 retval = ".\\"; |
| 250 break; | |
| 251 | |
| 3533 | 252 case op_el_and: |
| 2376 | 253 retval = "&"; |
| 254 break; | |
| 255 | |
| 3533 | 256 case op_el_or: |
| 2376 | 257 retval = "|"; |
| 258 break; | |
| 259 | |
| 3533 | 260 case op_struct_ref: |
| 2376 | 261 retval = "."; |
| 262 break; | |
| 263 | |
| 264 default: | |
| 265 retval = "<unknown>"; | |
| 266 } | |
| 267 | |
| 268 return retval; | |
| 269 } | |
| 270 | |
| 3536 | 271 std::string |
| 7336 | 272 octave_value::binary_op_fcn_name (binary_op op) |
| 273 { | |
| 274 std::string retval; | |
| 275 | |
| 276 switch (op) | |
| 277 { | |
| 278 case op_add: | |
| 279 retval = "plus"; | |
| 280 break; | |
| 281 | |
| 282 case op_sub: | |
| 283 retval = "minus"; | |
| 284 break; | |
| 285 | |
| 286 case op_mul: | |
| 287 retval = "mtimes"; | |
| 288 break; | |
| 289 | |
| 290 case op_div: | |
| 291 retval = "mrdivide"; | |
| 292 break; | |
| 293 | |
| 294 case op_pow: | |
| 295 retval = "mpower"; | |
| 296 break; | |
| 297 | |
| 298 case op_ldiv: | |
| 299 retval = "mldivide"; | |
| 300 break; | |
| 301 | |
| 302 case op_lt: | |
| 303 retval = "lt"; | |
| 304 break; | |
| 305 | |
| 306 case op_le: | |
| 307 retval = "le"; | |
| 308 break; | |
| 309 | |
| 310 case op_eq: | |
| 311 retval = "eq"; | |
| 312 break; | |
| 313 | |
| 314 case op_ge: | |
| 315 retval = "ge"; | |
| 316 break; | |
| 317 | |
| 318 case op_gt: | |
| 319 retval = "gt"; | |
| 320 break; | |
| 321 | |
| 322 case op_ne: | |
| 323 retval = "ne"; | |
| 324 break; | |
| 325 | |
| 326 case op_el_mul: | |
| 327 retval = "times"; | |
| 328 break; | |
| 329 | |
| 330 case op_el_div: | |
| 331 retval = "rdivide"; | |
| 332 break; | |
| 333 | |
| 334 case op_el_pow: | |
| 335 retval = "power"; | |
| 336 break; | |
| 337 | |
| 338 case op_el_ldiv: | |
| 339 retval = "ldivide"; | |
| 340 break; | |
| 341 | |
| 342 case op_el_and: | |
| 343 retval = "and"; | |
| 344 break; | |
| 345 | |
| 346 case op_el_or: | |
| 347 retval = "or"; | |
| 348 break; | |
| 349 | |
| 350 default: | |
| 351 break; | |
| 352 } | |
| 353 | |
| 354 return retval; | |
| 355 } | |
| 356 | |
| 357 std::string | |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
358 octave_value::binary_op_fcn_name (compound_binary_op op) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
359 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
360 std::string retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
361 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
362 switch (op) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
363 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
364 case op_trans_mul: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
365 retval = "transtimes"; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
366 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
367 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
368 case op_mul_trans: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
369 retval = "timestrans"; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
370 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
371 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
372 case op_herm_mul: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
373 retval = "hermtimes"; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
374 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
375 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
376 case op_mul_herm: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
377 retval = "timesherm"; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
378 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
379 |
|
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
380 case op_trans_ldiv: |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
381 retval = "transldiv"; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
382 break; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
383 |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
384 case op_herm_ldiv: |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
385 retval = "hermldiv"; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
386 break; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
387 |
|
8982
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
388 case op_el_and_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
389 retval = "andnot"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
390 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
391 |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
392 case op_el_or_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
393 retval = "ornot"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
394 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
395 |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
396 case op_el_not_and: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
397 retval = "notand"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
398 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
399 |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
400 case op_el_not_or: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
401 retval = "notor"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
402 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
403 |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
404 default: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
405 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
406 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
407 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
408 return retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
409 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
410 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
411 std::string |
| 2880 | 412 octave_value::assign_op_as_string (assign_op op) |
| 413 { | |
| 3523 | 414 std::string retval; |
| 2880 | 415 |
| 416 switch (op) | |
| 417 { | |
| 3533 | 418 case op_asn_eq: |
| 2880 | 419 retval = "="; |
| 420 break; | |
| 421 | |
| 3533 | 422 case op_add_eq: |
| 2880 | 423 retval = "+="; |
| 424 break; | |
| 425 | |
| 3533 | 426 case op_sub_eq: |
| 2880 | 427 retval = "-="; |
| 428 break; | |
| 429 | |
| 3533 | 430 case op_mul_eq: |
| 2880 | 431 retval = "*="; |
| 432 break; | |
| 433 | |
| 3533 | 434 case op_div_eq: |
| 2880 | 435 retval = "/="; |
| 436 break; | |
| 437 | |
| 3533 | 438 case op_ldiv_eq: |
| 3204 | 439 retval = "\\="; |
| 440 break; | |
| 441 | |
| 4018 | 442 case op_pow_eq: |
| 443 retval = "^="; | |
| 444 break; | |
| 445 | |
| 3533 | 446 case op_lshift_eq: |
| 2903 | 447 retval = "<<="; |
| 448 break; | |
| 449 | |
| 3533 | 450 case op_rshift_eq: |
| 2903 | 451 retval = ">>="; |
| 452 break; | |
| 453 | |
| 3533 | 454 case op_el_mul_eq: |
| 2880 | 455 retval = ".*="; |
| 456 break; | |
| 457 | |
| 3533 | 458 case op_el_div_eq: |
| 2880 | 459 retval = "./="; |
| 460 break; | |
| 461 | |
| 3533 | 462 case op_el_ldiv_eq: |
| 3204 | 463 retval = ".\\="; |
| 464 break; | |
| 465 | |
| 4018 | 466 case op_el_pow_eq: |
| 467 retval = ".^="; | |
| 468 break; | |
| 469 | |
| 3533 | 470 case op_el_and_eq: |
| 2880 | 471 retval = "&="; |
| 472 break; | |
| 473 | |
| 3533 | 474 case op_el_or_eq: |
| 2880 | 475 retval = "|="; |
| 476 break; | |
| 477 | |
| 478 default: | |
| 479 retval = "<unknown>"; | |
| 480 } | |
| 481 | |
| 482 return retval; | |
| 483 } | |
| 484 | |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
485 octave_value::assign_op |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
486 octave_value::binary_op_to_assign_op (binary_op op) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
487 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
488 assign_op retval; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
489 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
490 switch (op) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
491 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
492 case op_add: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
493 retval = op_add_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
494 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
495 case op_sub: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
496 retval = op_sub_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
497 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
498 case op_mul: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
499 retval = op_mul_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
500 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
501 case op_div: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
502 retval = op_div_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
503 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
504 case op_el_mul: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
505 retval = op_el_mul_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
506 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
507 case op_el_div: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
508 retval = op_el_div_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
509 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
510 case op_el_and: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
511 retval = op_el_and_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
512 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
513 case op_el_or: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
514 retval = op_el_or_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
515 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
516 default: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
517 retval = unknown_assign_op; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
518 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
519 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
520 return retval; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
521 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
522 |
| 4254 | 523 octave_value::octave_value (short int i) |
| 524 : rep (new octave_scalar (i)) | |
| 525 { | |
| 526 } | |
| 527 | |
| 528 octave_value::octave_value (unsigned short int i) | |
| 529 : rep (new octave_scalar (i)) | |
| 530 { | |
| 531 } | |
| 532 | |
| 4233 | 533 octave_value::octave_value (int i) |
| 534 : rep (new octave_scalar (i)) | |
| 535 { | |
| 536 } | |
| 537 | |
| 4254 | 538 octave_value::octave_value (unsigned int i) |
| 539 : rep (new octave_scalar (i)) | |
| 540 { | |
| 541 } | |
| 542 | |
| 543 octave_value::octave_value (long int i) | |
| 544 : rep (new octave_scalar (i)) | |
| 545 { | |
| 546 } | |
| 547 | |
| 548 octave_value::octave_value (unsigned long int i) | |
| 549 : rep (new octave_scalar (i)) | |
| 550 { | |
| 551 } | |
| 552 | |
| 4353 | 553 #if defined (HAVE_LONG_LONG_INT) |
| 554 octave_value::octave_value (long long int i) | |
| 555 : rep (new octave_scalar (i)) | |
| 556 { | |
| 557 } | |
| 558 #endif | |
| 559 | |
| 4355 | 560 #if defined (HAVE_UNSIGNED_LONG_LONG_INT) |
| 4353 | 561 octave_value::octave_value (unsigned long long int i) |
| 562 : rep (new octave_scalar (i)) | |
| 563 { | |
| 564 } | |
| 565 #endif | |
| 566 | |
| 4254 | 567 octave_value::octave_value (octave_time t) |
| 7065 | 568 : rep (new octave_scalar (t.double_value ())) |
| 4254 | 569 { |
| 570 } | |
| 571 | |
| 2376 | 572 octave_value::octave_value (double d) |
| 2825 | 573 : rep (new octave_scalar (d)) |
| 574 { | |
| 575 } | |
| 2376 | 576 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
577 octave_value::octave_value (float d) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
578 : rep (new octave_float_scalar (d)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
579 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
580 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
581 |
| 4587 | 582 octave_value::octave_value (const Cell& c, bool is_csl) |
| 5477 | 583 : rep (is_csl |
| 5759 | 584 ? dynamic_cast<octave_base_value *> (new octave_cs_list (c)) |
| 585 : dynamic_cast<octave_base_value *> (new octave_cell (c))) | |
| 3351 | 586 { |
| 587 } | |
| 588 | |
| 5147 | 589 octave_value::octave_value (const ArrayN<octave_value>& a, bool is_csl) |
| 5477 | 590 : rep (is_csl |
| 5759 | 591 ? dynamic_cast<octave_base_value *> (new octave_cs_list (Cell (a))) |
| 592 : dynamic_cast<octave_base_value *> (new octave_cell (Cell (a)))) | |
| 5147 | 593 { |
| 594 } | |
| 595 | |
| 5785 | 596 octave_value::octave_value (const Matrix& m, const MatrixType& t) |
| 597 : rep (new octave_matrix (m, t)) | |
| 2423 | 598 { |
| 599 maybe_mutate (); | |
| 600 } | |
| 2376 | 601 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
602 octave_value::octave_value (const FloatMatrix& m, const MatrixType& t) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
603 : rep (new octave_float_matrix (m, t)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
604 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
605 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
606 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
607 |
| 4507 | 608 octave_value::octave_value (const NDArray& a) |
| 4513 | 609 : rep (new octave_matrix (a)) |
| 4478 | 610 { |
| 611 maybe_mutate (); | |
| 612 } | |
| 613 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
614 octave_value::octave_value (const FloatNDArray& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
615 : rep (new octave_float_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
616 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
617 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
618 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
619 |
| 4911 | 620 octave_value::octave_value (const ArrayN<double>& a) |
| 621 : rep (new octave_matrix (a)) | |
| 622 { | |
| 623 maybe_mutate (); | |
| 624 } | |
| 625 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
626 octave_value::octave_value (const ArrayN<float>& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
627 : rep (new octave_float_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
628 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
629 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
630 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
631 |
| 2376 | 632 octave_value::octave_value (const DiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
633 : rep (new octave_diag_matrix (d)) |
| 2423 | 634 { |
| 635 maybe_mutate (); | |
| 636 } | |
| 2376 | 637 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
638 octave_value::octave_value (const FloatDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
639 : rep (new octave_float_diag_matrix (d)) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
640 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
641 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
642 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
643 |
| 3418 | 644 octave_value::octave_value (const RowVector& v) |
| 645 : rep (new octave_matrix (v)) | |
| 2423 | 646 { |
| 647 maybe_mutate (); | |
| 648 } | |
| 2376 | 649 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
650 octave_value::octave_value (const FloatRowVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
651 : rep (new octave_float_matrix (v)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
652 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
653 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
654 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
655 |
| 3418 | 656 octave_value::octave_value (const ColumnVector& v) |
| 657 : rep (new octave_matrix (v)) | |
| 2423 | 658 { |
| 659 maybe_mutate (); | |
| 660 } | |
| 2376 | 661 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
662 octave_value::octave_value (const FloatColumnVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
663 : rep (new octave_float_matrix (v)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
664 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
665 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
666 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
667 |
| 2376 | 668 octave_value::octave_value (const Complex& C) |
| 2423 | 669 : rep (new octave_complex (C)) |
| 670 { | |
| 671 maybe_mutate (); | |
| 672 } | |
| 2376 | 673 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
674 octave_value::octave_value (const FloatComplex& C) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
675 : rep (new octave_float_complex (C)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
676 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
677 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
678 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
679 |
| 5785 | 680 octave_value::octave_value (const ComplexMatrix& m, const MatrixType& t) |
| 681 : rep (new octave_complex_matrix (m, t)) | |
| 2423 | 682 { |
| 683 maybe_mutate (); | |
| 684 } | |
| 2376 | 685 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
686 octave_value::octave_value (const FloatComplexMatrix& m, const MatrixType& t) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
687 : rep (new octave_float_complex_matrix (m, t)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
688 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
689 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
690 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
691 |
| 4513 | 692 octave_value::octave_value (const ComplexNDArray& a) |
| 693 : rep (new octave_complex_matrix (a)) | |
| 4478 | 694 { |
| 695 maybe_mutate (); | |
| 696 } | |
| 697 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
698 octave_value::octave_value (const FloatComplexNDArray& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
699 : rep (new octave_float_complex_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
700 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
701 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
702 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
703 |
| 4911 | 704 octave_value::octave_value (const ArrayN<Complex>& a) |
| 705 : rep (new octave_complex_matrix (a)) | |
| 706 { | |
| 707 maybe_mutate (); | |
| 708 } | |
| 709 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
710 octave_value::octave_value (const ArrayN<FloatComplex>& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
711 : rep (new octave_float_complex_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
712 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
713 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
714 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
715 |
| 2376 | 716 octave_value::octave_value (const ComplexDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
717 : rep (new octave_complex_diag_matrix (d)) |
| 2423 | 718 { |
| 719 maybe_mutate (); | |
| 720 } | |
| 2376 | 721 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
722 octave_value::octave_value (const FloatComplexDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
723 : rep (new octave_float_complex_diag_matrix (d)) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
724 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
725 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
726 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
727 |
| 3418 | 728 octave_value::octave_value (const ComplexRowVector& v) |
| 729 : rep (new octave_complex_matrix (v)) | |
| 2423 | 730 { |
| 731 maybe_mutate (); | |
| 732 } | |
| 2376 | 733 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
734 octave_value::octave_value (const FloatComplexRowVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
735 : rep (new octave_float_complex_matrix (v)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
736 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
737 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
738 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
739 |
| 3418 | 740 octave_value::octave_value (const ComplexColumnVector& v) |
| 741 : rep (new octave_complex_matrix (v)) | |
| 2423 | 742 { |
| 743 maybe_mutate (); | |
| 744 } | |
| 2376 | 745 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
746 octave_value::octave_value (const FloatComplexColumnVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
747 : rep (new octave_float_complex_matrix (v)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
748 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
749 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
750 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
751 |
|
8960
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
752 octave_value::octave_value (const PermMatrix& p) |
|
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
753 : rep (new octave_perm_matrix (p)) |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
754 { |
|
8960
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
755 maybe_mutate (); |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
756 } |
|
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
757 |
| 2825 | 758 octave_value::octave_value (bool b) |
| 759 : rep (new octave_bool (b)) | |
| 760 { | |
| 761 } | |
| 762 | |
| 5785 | 763 octave_value::octave_value (const boolMatrix& bm, const MatrixType& t) |
| 764 : rep (new octave_bool_matrix (bm, t)) | |
| 2825 | 765 { |
| 766 maybe_mutate (); | |
| 767 } | |
| 768 | |
| 4513 | 769 octave_value::octave_value (const boolNDArray& bnda) |
| 770 : rep (new octave_bool_matrix (bnda)) | |
| 771 { | |
| 772 maybe_mutate (); | |
| 773 } | |
| 774 | |
| 7433 | 775 octave_value::octave_value (const ArrayN<bool>& bnda) |
| 776 : rep (new octave_bool_matrix (bnda)) | |
| 777 { | |
| 778 maybe_mutate (); | |
| 779 } | |
| 780 | |
| 5279 | 781 octave_value::octave_value (char c, char type) |
| 782 : rep (type == '"' | |
| 783 ? new octave_char_matrix_dq_str (c) | |
| 784 : new octave_char_matrix_sq_str (c)) | |
| 3189 | 785 { |
| 786 maybe_mutate (); | |
| 787 } | |
| 788 | |
| 5279 | 789 octave_value::octave_value (const char *s, char type) |
| 790 : rep (type == '"' | |
| 791 ? new octave_char_matrix_dq_str (s) | |
| 792 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 793 { |
| 794 maybe_mutate (); | |
| 795 } | |
| 2376 | 796 |
| 5279 | 797 octave_value::octave_value (const std::string& s, char type) |
| 798 : rep (type == '"' | |
| 799 ? new octave_char_matrix_dq_str (s) | |
| 800 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 801 { |
| 802 maybe_mutate (); | |
| 803 } | |
| 2376 | 804 |
| 5279 | 805 octave_value::octave_value (const string_vector& s, char type) |
| 806 : rep (type == '"' | |
| 807 ? new octave_char_matrix_dq_str (s) | |
| 808 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 809 { |
| 810 maybe_mutate (); | |
| 811 } | |
| 2376 | 812 |
| 5279 | 813 octave_value::octave_value (const charMatrix& chm, bool is_str, char type) |
| 4587 | 814 : rep (is_str |
| 5279 | 815 ? (type == '"' |
| 816 ? new octave_char_matrix_dq_str (chm) | |
| 817 : new octave_char_matrix_sq_str (chm)) | |
| 4513 | 818 : new octave_char_matrix (chm)) |
| 2409 | 819 { |
| 4513 | 820 maybe_mutate (); |
| 821 } | |
| 2376 | 822 |
| 5279 | 823 octave_value::octave_value (const charNDArray& chm, bool is_str, char type) |
| 4587 | 824 : rep (is_str |
| 5279 | 825 ? (type == '"' |
| 826 ? new octave_char_matrix_dq_str (chm) | |
| 827 : new octave_char_matrix_sq_str (chm)) | |
| 4513 | 828 : new octave_char_matrix (chm)) |
| 829 { | |
| 2423 | 830 maybe_mutate (); |
| 2409 | 831 } |
| 2376 | 832 |
| 5279 | 833 octave_value::octave_value (const ArrayN<char>& chm, bool is_str, char type) |
| 4997 | 834 : rep (is_str |
| 5279 | 835 ? (type == '"' |
| 836 ? new octave_char_matrix_dq_str (chm) | |
| 837 : new octave_char_matrix_sq_str (chm)) | |
| 4997 | 838 : new octave_char_matrix (chm)) |
| 839 { | |
| 840 maybe_mutate (); | |
| 841 } | |
| 842 | |
| 5785 | 843 octave_value::octave_value (const SparseMatrix& m, const MatrixType &t) |
| 5164 | 844 : rep (new octave_sparse_matrix (m, t)) |
| 845 { | |
| 846 maybe_mutate (); | |
| 847 } | |
| 848 | |
| 6863 | 849 octave_value::octave_value (const Sparse<double>& m, const MatrixType &t) |
| 850 : rep (new octave_sparse_matrix (m, t)) | |
| 851 { | |
| 852 maybe_mutate (); | |
| 853 } | |
| 854 | |
| 5785 | 855 octave_value::octave_value (const SparseComplexMatrix& m, const MatrixType &t) |
| 5164 | 856 : rep (new octave_sparse_complex_matrix (m, t)) |
| 857 { | |
| 858 maybe_mutate (); | |
| 859 } | |
| 860 | |
| 6863 | 861 octave_value::octave_value (const Sparse<Complex>& m, const MatrixType &t) |
| 862 : rep (new octave_sparse_complex_matrix (m, t)) | |
| 863 { | |
| 864 maybe_mutate (); | |
| 865 } | |
| 866 | |
| 5785 | 867 octave_value::octave_value (const SparseBoolMatrix& bm, const MatrixType &t) |
| 5164 | 868 : rep (new octave_sparse_bool_matrix (bm, t)) |
| 869 { | |
| 870 maybe_mutate (); | |
| 871 } | |
| 872 | |
| 7433 | 873 octave_value::octave_value (const Sparse<bool>& bm, const MatrixType &t) |
| 874 : rep (new octave_sparse_bool_matrix (bm, t)) | |
| 875 { | |
| 876 maybe_mutate (); | |
| 877 } | |
| 878 | |
| 4901 | 879 octave_value::octave_value (const octave_int8& i) |
| 880 : rep (new octave_int8_scalar (i)) | |
| 881 { | |
| 882 maybe_mutate (); | |
| 883 } | |
| 884 | |
| 885 octave_value::octave_value (const octave_uint8& i) | |
| 886 : rep (new octave_uint8_scalar (i)) | |
| 887 { | |
| 888 maybe_mutate (); | |
| 889 } | |
| 890 | |
| 891 octave_value::octave_value (const octave_int16& i) | |
| 892 : rep (new octave_int16_scalar (i)) | |
| 893 { | |
| 894 maybe_mutate (); | |
| 895 } | |
| 896 | |
| 897 octave_value::octave_value (const octave_uint16& i) | |
| 898 : rep (new octave_uint16_scalar (i)) | |
| 899 { | |
| 900 maybe_mutate (); | |
| 901 } | |
| 902 | |
| 903 octave_value::octave_value (const octave_int32& i) | |
| 904 : rep (new octave_int32_scalar (i)) | |
| 905 { | |
| 906 maybe_mutate (); | |
| 907 } | |
| 908 | |
| 909 octave_value::octave_value (const octave_uint32& i) | |
| 910 : rep (new octave_uint32_scalar (i)) | |
| 911 { | |
| 912 maybe_mutate (); | |
| 913 } | |
| 914 | |
| 915 octave_value::octave_value (const octave_int64& i) | |
| 916 : rep (new octave_int64_scalar (i)) | |
| 917 { | |
| 918 maybe_mutate (); | |
| 919 } | |
| 920 | |
| 921 octave_value::octave_value (const octave_uint64& i) | |
| 922 : rep (new octave_uint64_scalar (i)) | |
| 923 { | |
| 924 maybe_mutate (); | |
| 925 } | |
| 926 | |
| 927 octave_value::octave_value (const int8NDArray& inda) | |
| 928 : rep (new octave_int8_matrix (inda)) | |
| 929 { | |
| 930 maybe_mutate (); | |
| 931 } | |
| 932 | |
| 7064 | 933 octave_value::octave_value (const ArrayN<octave_int8>& inda) |
| 934 : rep (new octave_int8_matrix (inda)) | |
| 935 { | |
| 936 maybe_mutate (); | |
| 937 } | |
| 938 | |
| 4901 | 939 octave_value::octave_value (const uint8NDArray& inda) |
| 940 : rep (new octave_uint8_matrix (inda)) | |
| 941 { | |
| 942 maybe_mutate (); | |
| 943 } | |
| 944 | |
| 7064 | 945 octave_value::octave_value (const ArrayN<octave_uint8>& inda) |
| 946 : rep (new octave_uint8_matrix (inda)) | |
| 947 { | |
| 948 maybe_mutate (); | |
| 949 } | |
| 950 | |
| 4901 | 951 octave_value::octave_value (const int16NDArray& inda) |
| 952 : rep (new octave_int16_matrix (inda)) | |
| 953 { | |
| 954 maybe_mutate (); | |
| 955 } | |
| 956 | |
| 7064 | 957 octave_value::octave_value (const ArrayN<octave_int16>& inda) |
| 958 : rep (new octave_int16_matrix (inda)) | |
| 959 { | |
| 960 maybe_mutate (); | |
| 961 } | |
| 962 | |
| 4901 | 963 octave_value::octave_value (const uint16NDArray& inda) |
| 964 : rep (new octave_uint16_matrix (inda)) | |
| 965 { | |
| 966 maybe_mutate (); | |
| 967 } | |
| 968 | |
| 7064 | 969 octave_value::octave_value (const ArrayN<octave_uint16>& inda) |
| 970 : rep (new octave_uint16_matrix (inda)) | |
| 971 { | |
| 972 maybe_mutate (); | |
| 973 } | |
| 974 | |
| 4901 | 975 octave_value::octave_value (const int32NDArray& inda) |
| 976 : rep (new octave_int32_matrix (inda)) | |
| 977 { | |
| 978 maybe_mutate (); | |
| 979 } | |
| 980 | |
| 7064 | 981 octave_value::octave_value (const ArrayN<octave_int32>& inda) |
| 982 : rep (new octave_int32_matrix (inda)) | |
| 983 { | |
| 984 maybe_mutate (); | |
| 985 } | |
| 986 | |
| 4901 | 987 octave_value::octave_value (const uint32NDArray& inda) |
| 988 : rep (new octave_uint32_matrix (inda)) | |
| 989 { | |
| 990 maybe_mutate (); | |
| 991 } | |
| 992 | |
| 7064 | 993 octave_value::octave_value (const ArrayN<octave_uint32>& inda) |
| 994 : rep (new octave_uint32_matrix (inda)) | |
| 995 { | |
| 996 maybe_mutate (); | |
| 997 } | |
| 998 | |
| 4901 | 999 octave_value::octave_value (const int64NDArray& inda) |
| 1000 : rep (new octave_int64_matrix (inda)) | |
| 1001 { | |
| 1002 maybe_mutate (); | |
| 1003 } | |
| 1004 | |
| 7064 | 1005 octave_value::octave_value (const ArrayN<octave_int64>& inda) |
| 1006 : rep (new octave_int64_matrix (inda)) | |
| 1007 { | |
| 1008 maybe_mutate (); | |
| 1009 } | |
| 1010 | |
| 4901 | 1011 octave_value::octave_value (const uint64NDArray& inda) |
| 1012 : rep (new octave_uint64_matrix (inda)) | |
| 1013 { | |
| 1014 maybe_mutate (); | |
| 1015 } | |
| 1016 | |
| 7064 | 1017 octave_value::octave_value (const ArrayN<octave_uint64>& inda) |
| 1018 : rep (new octave_uint64_matrix (inda)) | |
| 1019 { | |
| 1020 maybe_mutate (); | |
| 1021 } | |
| 1022 | |
|
9351
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1023 octave_value::octave_value (const Array<octave_idx_type>& inda, bool zero_based, |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1024 bool cache_index) |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1025 : rep (new octave_matrix (inda, zero_based, cache_index)) |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1026 { |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1027 maybe_mutate (); |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1028 } |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1029 |
|
9479
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1030 octave_value::octave_value (const idx_vector& idx) |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1031 : rep () |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1032 { |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1033 double scalar; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1034 Range range; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1035 NDArray array; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1036 idx_vector::idx_class_type idx_class; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1037 |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1038 idx.unconvert (idx_class, scalar, range, array); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1039 |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1040 switch (idx_class) |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1041 { |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1042 case idx_vector::class_colon: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1043 rep = new octave_magic_colon (); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1044 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1045 case idx_vector::class_range: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1046 rep = new octave_range (range, idx); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1047 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1048 case idx_vector::class_scalar: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1049 rep = new octave_scalar (scalar); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1050 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1051 case idx_vector::class_vector: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1052 rep = new octave_matrix (array, idx); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1053 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1054 default: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1055 assert (false); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1056 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1057 } |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1058 |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1059 // FIXME: needed? |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1060 maybe_mutate (); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1061 } |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1062 |
| 2376 | 1063 octave_value::octave_value (double base, double limit, double inc) |
| 2423 | 1064 : rep (new octave_range (base, limit, inc)) |
| 1065 { | |
| 1066 maybe_mutate (); | |
| 1067 } | |
| 2376 | 1068 |
| 1069 octave_value::octave_value (const Range& r) | |
| 2423 | 1070 : rep (new octave_range (r)) |
| 1071 { | |
| 1072 maybe_mutate (); | |
| 1073 } | |
| 2376 | 1074 |
| 1075 octave_value::octave_value (const Octave_map& m) | |
| 2825 | 1076 : rep (new octave_struct (m)) |
| 1077 { | |
| 2880 | 1078 } |
| 1079 | |
| 7336 | 1080 octave_value::octave_value (const Octave_map& m, const std::string& id) |
| 1081 : rep (new octave_class (m, id)) | |
| 1082 { | |
| 1083 } | |
| 1084 | |
| 4587 | 1085 octave_value::octave_value (const octave_value_list& l, bool is_csl) |
| 5477 | 1086 : rep (is_csl |
| 5759 | 1087 ? dynamic_cast<octave_base_value *> (new octave_cs_list (l)) |
| 1088 : dynamic_cast<octave_base_value *> (new octave_list (l))) | |
| 2880 | 1089 { |
| 1090 } | |
| 2376 | 1091 |
| 1092 octave_value::octave_value (octave_value::magic_colon) | |
| 2825 | 1093 : rep (new octave_magic_colon ()) |
| 1094 { | |
| 1095 } | |
| 2376 | 1096 |
| 5759 | 1097 octave_value::octave_value (octave_base_value *new_rep) |
| 2825 | 1098 : rep (new_rep) |
| 1099 { | |
| 1100 } | |
| 2376 | 1101 |
| 7336 | 1102 octave_value::octave_value (octave_base_value *new_rep, int xcount) |
| 1103 : rep (new_rep) | |
| 1104 { | |
| 1105 rep->count = xcount; | |
| 1106 } | |
| 1107 | |
| 5759 | 1108 octave_base_value * |
| 3933 | 1109 octave_value::clone (void) const |
| 2880 | 1110 { |
| 1111 panic_impossible (); | |
| 3546 | 1112 return 0; |
| 2880 | 1113 } |
| 1114 | |
| 2409 | 1115 void |
| 1116 octave_value::maybe_mutate (void) | |
| 1117 { | |
| 5759 | 1118 octave_base_value *tmp = rep->try_narrowing_conversion (); |
| 2409 | 1119 |
| 1120 if (tmp && tmp != rep) | |
| 1121 { | |
| 1122 if (--rep->count == 0) | |
| 1123 delete rep; | |
| 1124 | |
| 1125 rep = tmp; | |
| 1126 } | |
| 1127 } | |
| 1128 | |
| 4247 | 1129 octave_value |
| 4271 | 1130 octave_value::single_subsref (const std::string& type, |
| 1131 const octave_value_list& idx) | |
| 4247 | 1132 { |
| 1133 std::list<octave_value_list> i; | |
| 1134 | |
| 1135 i.push_back (idx); | |
| 1136 | |
| 1137 return rep->subsref (type, i); | |
| 1138 } | |
| 1139 | |
| 2974 | 1140 octave_value_list |
| 4247 | 1141 octave_value::subsref (const std::string& type, |
| 4219 | 1142 const std::list<octave_value_list>& idx, int nargout) |
| 3933 | 1143 { |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7503
diff
changeset
|
1144 if (nargout == 1) |
| 3933 | 1145 return rep->subsref (type, idx); |
| 1146 else | |
| 1147 return rep->subsref (type, idx, nargout); | |
| 1148 } | |
| 1149 | |
| 1150 octave_value | |
| 4247 | 1151 octave_value::next_subsref (const std::string& type, |
| 4219 | 1152 const std::list<octave_value_list>& idx, |
| 4233 | 1153 size_t skip) |
| 3933 | 1154 { |
| 4582 | 1155 if (! error_state && idx.size () > skip) |
| 3933 | 1156 { |
| 4219 | 1157 std::list<octave_value_list> new_idx (idx); |
| 4233 | 1158 for (size_t i = 0; i < skip; i++) |
| 4219 | 1159 new_idx.erase (new_idx.begin ()); |
| 3933 | 1160 return subsref (type.substr (skip), new_idx); |
| 1161 } | |
| 1162 else | |
| 1163 return *this; | |
| 1164 } | |
| 1165 | |
| 1166 octave_value_list | |
| 4994 | 1167 octave_value::next_subsref (int nargout, const std::string& type, |
| 1168 const std::list<octave_value_list>& idx, | |
| 1169 size_t skip) | |
| 1170 { | |
| 1171 if (! error_state && idx.size () > skip) | |
| 1172 { | |
| 1173 std::list<octave_value_list> new_idx (idx); | |
| 1174 for (size_t i = 0; i < skip; i++) | |
| 1175 new_idx.erase (new_idx.begin ()); | |
| 1176 return subsref (type.substr (skip), new_idx, nargout); | |
| 1177 } | |
| 1178 else | |
| 1179 return *this; | |
| 1180 } | |
| 1181 | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1182 octave_value |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1183 octave_value::next_subsref (bool auto_add, const std::string& type, |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1184 const std::list<octave_value_list>& idx, |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1185 size_t skip) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1186 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1187 if (! error_state && idx.size () > skip) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1188 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1189 std::list<octave_value_list> new_idx (idx); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1190 for (size_t i = 0; i < skip; i++) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1191 new_idx.erase (new_idx.begin ()); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1192 return subsref (type.substr (skip), new_idx, auto_add); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1193 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1194 else |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1195 return *this; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1196 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1197 |
| 4994 | 1198 octave_value_list |
| 3544 | 1199 octave_value::do_multi_index_op (int nargout, const octave_value_list& idx) |
| 2974 | 1200 { |
| 3544 | 1201 return rep->do_multi_index_op (nargout, idx); |
| 2974 | 1202 } |
| 1203 | |
| 3933 | 1204 #if 0 |
| 3204 | 1205 static void |
| 3933 | 1206 gripe_assign_failed (const std::string& on, const std::string& tn1, |
| 1207 const std::string& tn2) | |
| 3204 | 1208 { |
| 1209 error ("assignment failed for `%s %s %s'", | |
| 1210 tn1.c_str (), on.c_str (), tn2.c_str ()); | |
| 1211 } | |
| 3933 | 1212 #endif |
| 3204 | 1213 |
| 1214 static void | |
| 3933 | 1215 gripe_assign_failed_or_no_method (const std::string& on, |
| 1216 const std::string& tn1, | |
| 3523 | 1217 const std::string& tn2) |
| 3204 | 1218 { |
| 1219 error ("assignment failed, or no method for `%s %s %s'", | |
| 1220 tn1.c_str (), on.c_str (), tn2.c_str ()); | |
| 1221 } | |
| 1222 | |
| 3933 | 1223 octave_value |
| 4247 | 1224 octave_value::subsasgn (const std::string& type, |
| 4219 | 1225 const std::list<octave_value_list>& idx, |
| 3933 | 1226 const octave_value& rhs) |
| 1227 { | |
| 1228 return rep->subsasgn (type, idx, rhs); | |
| 1229 } | |
| 1230 | |
| 1231 octave_value | |
| 4247 | 1232 octave_value::assign (assign_op op, const std::string& type, |
| 4219 | 1233 const std::list<octave_value_list>& idx, |
| 3933 | 1234 const octave_value& rhs) |
| 1235 { | |
| 1236 octave_value retval; | |
| 1237 | |
| 1238 make_unique (); | |
| 1239 | |
| 1240 octave_value t_rhs = rhs; | |
| 1241 | |
| 1242 if (op != op_asn_eq) | |
| 1243 { | |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7503
diff
changeset
|
1244 octave_value t = subsref (type, idx); |
| 3933 | 1245 |
| 1246 if (! error_state) | |
| 1247 { | |
| 1248 binary_op binop = op_eq_to_binary_op (op); | |
| 1249 | |
| 1250 if (! error_state) | |
| 1251 t_rhs = do_binary_op (binop, t, rhs); | |
| 1252 } | |
| 1253 } | |
| 1254 | |
| 1255 if (! error_state) | |
| 1256 { | |
| 7336 | 1257 if (type[0] == '.' && ! (is_map () || is_object ())) |
| 3933 | 1258 { |
| 1259 octave_value tmp = Octave_map (); | |
| 1260 retval = tmp.subsasgn (type, idx, t_rhs); | |
| 1261 } | |
| 1262 else | |
| 1263 retval = subsasgn (type, idx, t_rhs); | |
| 1264 } | |
| 1265 | |
| 1266 if (error_state) | |
| 1267 gripe_assign_failed_or_no_method (assign_op_as_string (op), | |
| 1268 type_name (), rhs.type_name ()); | |
| 1269 | |
| 1270 return retval; | |
| 1271 } | |
| 1272 | |
| 1273 const octave_value& | |
| 3203 | 1274 octave_value::assign (assign_op op, const octave_value& rhs) |
| 2880 | 1275 { |
| 3533 | 1276 if (op == op_asn_eq) |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1277 // Regularize a null matrix if stored into a variable. |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1278 operator = (rhs.storable_value ()); |
| 3203 | 1279 else |
| 1280 { | |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1281 octave_value_typeinfo::assign_op_fcn f = 0; |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1282 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1283 // Only attempt to operate in-place if this variable is unshared. |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1284 if (rep->count == 1) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1285 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1286 int tthis = this->type_id (); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1287 int trhs = rhs.type_id (); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1288 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1289 f = octave_value_typeinfo::lookup_assign_op (op, tthis, trhs); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1290 } |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1291 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1292 if (f) |
| 3204 | 1293 { |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1294 try |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1295 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1296 f (*rep, octave_value_list (), *rhs.rep); |
|
9608
1c76e806c2a7
possibly mutate after in-place computed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
1297 maybe_mutate (); // Usually unnecessary, but may be needed (complex arrays). |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1298 } |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1299 catch (octave_execution_exception) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1300 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1301 gripe_library_execution_error (); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1302 } |
| 3204 | 1303 } |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1304 else |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1305 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1306 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1307 binary_op binop = op_eq_to_binary_op (op); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1308 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1309 if (! error_state) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1310 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1311 octave_value t = do_binary_op (binop, *this, rhs); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1312 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1313 if (! error_state) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1314 operator = (t); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1315 } |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1316 } |
| 3204 | 1317 |
| 1318 if (error_state) | |
| 1319 gripe_assign_failed_or_no_method (assign_op_as_string (op), | |
| 1320 type_name (), rhs.type_name ()); | |
| 1321 } | |
| 1322 | |
| 3933 | 1323 return *this; |
| 2376 | 1324 } |
| 1325 | |
| 5275 | 1326 octave_idx_type |
| 4563 | 1327 octave_value::length (void) const |
| 1328 { | |
| 1329 int retval = 0; | |
| 1330 | |
| 1331 dim_vector dv = dims (); | |
| 4584 | 1332 |
| 4563 | 1333 for (int i = 0; i < dv.length (); i++) |
| 1334 { | |
| 1335 if (dv(i) < 0) | |
| 1336 { | |
| 1337 retval = -1; | |
| 1338 break; | |
| 1339 } | |
| 1340 | |
| 4584 | 1341 if (dv(i) == 0) |
| 1342 { | |
| 1343 retval = 0; | |
| 1344 break; | |
| 1345 } | |
| 1346 | |
| 4563 | 1347 if (dv(i) > retval) |
| 1348 retval = dv(i); | |
| 1349 } | |
| 1350 | |
| 1351 return retval; | |
| 1352 } | |
| 1353 | |
|
8346
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1354 bool |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1355 octave_value::is_equal (const octave_value& test) const |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1356 { |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1357 bool retval = false; |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1358 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1359 // If there is no op_eq for these types, we can't compare values. |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1360 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1361 if (rows () == test.rows () && columns () == test.columns ()) |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1362 { |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1363 octave_value tmp = do_binary_op (octave_value::op_eq, *this, test); |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1364 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1365 // Empty array also means a match. |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1366 if (! error_state && tmp.is_defined ()) |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1367 retval = tmp.is_true () || tmp.is_empty (); |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1368 } |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1369 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1370 return retval; |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1371 } |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1372 |
| 3351 | 1373 Cell |
| 1374 octave_value::cell_value (void) const | |
| 1375 { | |
| 1376 return rep->cell_value (); | |
| 1377 } | |
| 1378 | |
|
8017
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1379 // Define the idx_type_value function here instead of in ov.h to avoid |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1380 // needing definitions for the SIZEOF_X macros in ov.h. |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1381 |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1382 octave_idx_type |
|
8024
dc36eb214129
ov.cc (octave_value::idx_type_value): don't include default argument value in definition
John W. Eaton <jwe@octave.org>
parents:
8017
diff
changeset
|
1383 octave_value::idx_type_value (bool req_int, bool frc_str_conv) const |
|
8017
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1384 { |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1385 #if SIZEOF_OCTAVE_IDX_TYPE == SIZEOF_LONG |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1386 return long_value (req_int, frc_str_conv); |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1387 #elif SIZEOF_OCTAVE_IDX_TYPE == SIZEOF_INT |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1388 return int_value (req_int, frc_str_conv); |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1389 #else |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1390 #error "no octave_value extractor for octave_idx_type" |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1391 #endif |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1392 } |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1393 |
| 2376 | 1394 Octave_map |
| 1395 octave_value::map_value (void) const | |
| 1396 { | |
| 1397 return rep->map_value (); | |
| 1398 } | |
| 1399 | |
| 2974 | 1400 octave_function * |
| 1401 octave_value::function_value (bool silent) | |
| 1402 { | |
| 1403 return rep->function_value (silent); | |
| 1404 } | |
| 1405 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1406 const octave_function * |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1407 octave_value::function_value (bool silent) const |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1408 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1409 return rep->function_value (silent); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1410 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1411 |
| 4700 | 1412 octave_user_function * |
| 1413 octave_value::user_function_value (bool silent) | |
| 1414 { | |
| 1415 return rep->user_function_value (silent); | |
| 1416 } | |
| 1417 | |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1418 octave_user_script * |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1419 octave_value::user_script_value (bool silent) |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1420 { |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1421 return rep->user_script_value (silent); |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1422 } |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1423 |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1424 octave_user_code * |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1425 octave_value::user_code_value (bool silent) |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1426 { |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1427 return rep->user_code_value (silent); |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1428 } |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1429 |
| 4346 | 1430 octave_fcn_handle * |
| 4343 | 1431 octave_value::fcn_handle_value (bool silent) |
| 1432 { | |
| 1433 return rep->fcn_handle_value (silent); | |
| 1434 } | |
| 1435 | |
| 4933 | 1436 octave_fcn_inline * |
| 1437 octave_value::fcn_inline_value (bool silent) | |
| 1438 { | |
| 1439 return rep->fcn_inline_value (silent); | |
| 1440 } | |
| 1441 | |
| 2880 | 1442 octave_value_list |
| 1443 octave_value::list_value (void) const | |
| 1444 { | |
| 1445 return rep->list_value (); | |
| 1446 } | |
| 1447 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1448 static dim_vector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1449 make_vector_dims (const dim_vector& dv, bool force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1450 const std::string& my_type, const std::string& wanted_type) |
| 3419 | 1451 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1452 dim_vector retval (dv); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1453 retval.chop_trailing_singletons (); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1454 octave_idx_type nel = dv.numel (); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1455 |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1456 if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1)) |
| 3419 | 1457 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1458 if (!force_vector_conversion) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1459 gripe_implicit_conversion ("Octave:array-as-vector", |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1460 my_type.c_str (), wanted_type.c_str ()); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1461 retval = dim_vector (nel); |
| 3419 | 1462 } |
| 1463 | |
| 1464 return retval; | |
| 1465 } | |
| 1466 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1467 ColumnVector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1468 octave_value::column_vector_value (bool force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1469 bool frc_vec_conv) const |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1470 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1471 return ColumnVector (vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1472 frc_vec_conv)); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1473 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1474 |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1475 ComplexColumnVector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1476 octave_value::complex_column_vector_value (bool force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1477 bool frc_vec_conv) const |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1478 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1479 return ComplexColumnVector (complex_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1480 frc_vec_conv)); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1481 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1482 |
| 3419 | 1483 RowVector |
| 1484 octave_value::row_vector_value (bool force_string_conv, | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1485 bool frc_vec_conv) const |
| 3419 | 1486 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1487 return RowVector (vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1488 frc_vec_conv)); |
| 3419 | 1489 } |
| 1490 | |
| 1491 ComplexRowVector | |
| 1492 octave_value::complex_row_vector_value (bool force_string_conv, | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1493 bool frc_vec_conv) const |
| 3419 | 1494 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1495 return ComplexRowVector (complex_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1496 frc_vec_conv)); |
| 3419 | 1497 } |
| 1498 | |
| 1499 Array<double> | |
| 2376 | 1500 octave_value::vector_value (bool force_string_conv, |
| 1501 bool force_vector_conversion) const | |
| 1502 { | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1503 Array<double> retval = array_value (force_string_conv); |
| 2376 | 1504 |
| 1505 if (error_state) | |
| 1506 return retval; | |
| 1507 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1508 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1509 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1510 type_name (), "real vector")); |
| 2376 | 1511 } |
| 1512 | |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1513 template <class T> |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1514 static Array<int> |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1515 convert_to_int_array (const Array<octave_int<T> >& A) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1516 { |
| 7999 | 1517 Array<int> retval (A.dims ()); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1518 octave_idx_type n = A.numel (); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1519 |
|
8039
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1520 octave_int<int>::clear_conv_flag (); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1521 for (octave_idx_type i = 0; i < n; i++) |
| 7999 | 1522 retval.xelem (i) = octave_int<int> (A.xelem (i)); |
|
8039
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1523 |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1524 if (octave_int<int>::get_trunc_flag ()) |
|
8039
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1525 gripe_truncated_conversion (octave_int<T>::type_name (), "int"); |
|
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1526 |
|
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1527 octave_int<int>::clear_conv_flag (); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1528 |
| 7999 | 1529 return retval; |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1530 } |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1531 |
| 4044 | 1532 Array<int> |
| 1533 octave_value::int_vector_value (bool force_string_conv, bool require_int, | |
| 1534 bool force_vector_conversion) const | |
| 1535 { | |
| 1536 Array<int> retval; | |
| 1537 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1538 if (is_integer_type ()) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1539 { |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1540 if (is_int32_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1541 retval = convert_to_int_array (int32_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1542 else if (is_int64_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1543 retval = convert_to_int_array (int64_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1544 else if (is_int16_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1545 retval = convert_to_int_array (int16_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1546 else if (is_int8_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1547 retval = convert_to_int_array (int8_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1548 else if (is_uint32_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1549 retval = convert_to_int_array (uint32_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1550 else if (is_uint64_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1551 retval = convert_to_int_array (uint64_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1552 else if (is_uint16_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1553 retval = convert_to_int_array (uint16_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1554 else if (is_uint8_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1555 retval = convert_to_int_array (uint8_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1556 else |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1557 retval = array_value (force_string_conv); |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1558 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1559 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1560 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1561 const NDArray a = array_value (force_string_conv); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1562 if (! error_state) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1563 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1564 if (require_int) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1565 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1566 retval.resize (a.dims ()); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1567 for (octave_idx_type i = 0; i < a.numel (); i++) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1568 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1569 double ai = a.elem (i); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1570 int v = static_cast<int> (ai); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1571 if (ai == v) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1572 retval.xelem (i) = v; |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1573 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1574 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1575 error ("conversion to integer value failed"); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1576 break; |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1577 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1578 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1579 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1580 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1581 retval = Array<int> (a); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1582 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1583 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1584 |
| 4044 | 1585 |
| 1586 if (error_state) | |
| 1587 return retval; | |
| 1588 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1589 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1590 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1591 type_name (), "integer vector")); |
| 4044 | 1592 } |
| 1593 | |
| 8811 | 1594 template <class T> |
| 1595 static Array<octave_idx_type> | |
| 1596 convert_to_octave_idx_type_array (const Array<octave_int<T> >& A) | |
| 1597 { | |
| 1598 Array<octave_idx_type> retval (A.dims ()); | |
| 1599 octave_idx_type n = A.numel (); | |
| 1600 | |
| 1601 octave_int<int>::clear_conv_flag (); | |
| 1602 for (octave_idx_type i = 0; i < n; i++) | |
| 1603 retval.xelem (i) = octave_int<octave_idx_type> (A.xelem (i)); | |
| 1604 | |
| 1605 if (octave_int<int>::get_trunc_flag ()) | |
| 1606 gripe_truncated_conversion (octave_int<T>::type_name (), "int"); | |
| 1607 | |
| 1608 octave_int<int>::clear_conv_flag (); | |
| 1609 | |
| 1610 return retval; | |
| 1611 } | |
| 1612 | |
| 1613 Array<octave_idx_type> | |
|
9479
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1614 octave_value::octave_idx_type_vector_value (bool require_int, |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1615 bool force_string_conv, |
| 8811 | 1616 bool force_vector_conversion) const |
| 1617 { | |
| 1618 Array<octave_idx_type> retval; | |
| 1619 | |
| 1620 if (is_integer_type ()) | |
| 1621 { | |
| 1622 if (is_int32_type ()) | |
| 1623 retval = convert_to_octave_idx_type_array (int32_array_value ()); | |
| 1624 else if (is_int64_type ()) | |
| 1625 retval = convert_to_octave_idx_type_array (int64_array_value ()); | |
| 1626 else if (is_int16_type ()) | |
| 1627 retval = convert_to_octave_idx_type_array (int16_array_value ()); | |
| 1628 else if (is_int8_type ()) | |
| 1629 retval = convert_to_octave_idx_type_array (int8_array_value ()); | |
| 1630 else if (is_uint32_type ()) | |
| 1631 retval = convert_to_octave_idx_type_array (uint32_array_value ()); | |
| 1632 else if (is_uint64_type ()) | |
| 1633 retval = convert_to_octave_idx_type_array (uint64_array_value ()); | |
| 1634 else if (is_uint16_type ()) | |
| 1635 retval = convert_to_octave_idx_type_array (uint16_array_value ()); | |
| 1636 else if (is_uint8_type ()) | |
| 1637 retval = convert_to_octave_idx_type_array (uint8_array_value ()); | |
| 1638 else | |
| 1639 retval = array_value (force_string_conv); | |
| 1640 } | |
| 1641 else | |
| 1642 { | |
| 1643 const NDArray a = array_value (force_string_conv); | |
| 1644 if (! error_state) | |
| 1645 { | |
| 1646 if (require_int) | |
| 1647 { | |
| 1648 retval.resize (a.dims ()); | |
| 1649 for (octave_idx_type i = 0; i < a.numel (); i++) | |
| 1650 { | |
| 1651 double ai = a.elem (i); | |
| 1652 octave_idx_type v = static_cast<octave_idx_type> (ai); | |
| 1653 if (ai == v) | |
| 1654 retval.xelem (i) = v; | |
| 1655 else | |
| 1656 { | |
| 1657 error ("conversion to integer value failed"); | |
| 1658 break; | |
| 1659 } | |
| 1660 } | |
| 1661 } | |
| 1662 else | |
| 1663 retval = Array<octave_idx_type> (a); | |
| 1664 } | |
| 1665 } | |
| 1666 | |
| 1667 | |
| 1668 if (error_state) | |
| 1669 return retval; | |
| 1670 else | |
| 1671 return retval.reshape (make_vector_dims (retval.dims (), | |
| 1672 force_vector_conversion, | |
| 1673 type_name (), "integer vector")); | |
| 1674 } | |
| 1675 | |
| 3419 | 1676 Array<Complex> |
| 2376 | 1677 octave_value::complex_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1678 bool force_vector_conversion) const |
| 2376 | 1679 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1680 Array<Complex> retval = complex_array_value (force_string_conv); |
| 2376 | 1681 |
| 1682 if (error_state) | |
| 1683 return retval; | |
| 1684 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1685 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1686 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1687 type_name (), "complex vector")); |
| 2376 | 1688 } |
| 1689 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1690 FloatColumnVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1691 octave_value::float_column_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1692 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1693 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1694 return FloatColumnVector (float_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1695 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1696 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1697 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1698 FloatComplexColumnVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1699 octave_value::float_complex_column_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1700 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1701 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1702 return FloatComplexColumnVector (float_complex_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1703 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1704 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1705 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1706 FloatRowVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1707 octave_value::float_row_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1708 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1709 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1710 return FloatRowVector (float_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1711 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1712 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1713 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1714 FloatComplexRowVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1715 octave_value::float_complex_row_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1716 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1717 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1718 return FloatComplexRowVector (float_complex_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1719 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1720 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1721 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1722 Array<float> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1723 octave_value::float_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1724 bool force_vector_conversion) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1725 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1726 Array<float> retval = float_array_value (force_string_conv); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1727 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1728 if (error_state) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1729 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1730 else |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1731 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1732 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1733 type_name (), "real vector")); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1734 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1735 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1736 Array<FloatComplex> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1737 octave_value::float_complex_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1738 bool force_vector_conversion) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1739 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1740 Array<FloatComplex> retval = float_complex_array_value (force_string_conv); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1741 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1742 if (error_state) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1743 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1744 else |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1745 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1746 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1747 type_name (), "complex vector")); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1748 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1749 |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1750 octave_value |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1751 octave_value::storable_value (void) const |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1752 { |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1753 octave_value retval = *this; |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1754 if (is_null_value ()) |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1755 retval = octave_value (rep->empty_clone ()); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1756 else |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1757 retval.maybe_economize (); |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1758 |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1759 return retval; |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1760 } |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1761 |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1762 void |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1763 octave_value::make_storable_value (void) |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1764 { |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1765 if (is_null_value ()) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1766 { |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1767 octave_base_value *rc = rep->empty_clone (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1768 if (--rep->count == 0) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1769 delete rep; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1770 rep = rc; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1771 } |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1772 else |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1773 maybe_economize (); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1774 } |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1775 |
| 4944 | 1776 int |
| 1777 octave_value::write (octave_stream& os, int block_size, | |
| 1778 oct_data_conv::data_type output_type, int skip, | |
| 1779 oct_mach_info::float_format flt_fmt) const | |
| 1780 { | |
| 1781 return rep->write (os, block_size, output_type, skip, flt_fmt); | |
| 1782 } | |
| 1783 | |
| 2413 | 1784 static void |
| 3933 | 1785 gripe_binary_op (const std::string& on, const std::string& tn1, |
| 1786 const std::string& tn2) | |
| 2376 | 1787 { |
| 2903 | 1788 error ("binary operator `%s' not implemented for `%s' by `%s' operations", |
| 2376 | 1789 on.c_str (), tn1.c_str (), tn2.c_str ()); |
| 1790 } | |
| 1791 | |
| 3203 | 1792 static void |
| 3523 | 1793 gripe_binary_op_conv (const std::string& on) |
| 3203 | 1794 { |
| 1795 error ("type conversion failed for binary operator `%s'", on.c_str ()); | |
| 1796 } | |
| 1797 | |
| 2376 | 1798 octave_value |
| 3933 | 1799 do_binary_op (octave_value::binary_op op, |
| 1800 const octave_value& v1, const octave_value& v2) | |
| 2376 | 1801 { |
| 1802 octave_value retval; | |
| 1803 | |
| 1804 int t1 = v1.type_id (); | |
| 1805 int t2 = v2.type_id (); | |
| 1806 | |
| 7336 | 1807 if (t1 == octave_class::static_type_id () |
| 1808 || t2 == octave_class::static_type_id ()) | |
| 1809 { | |
| 1810 octave_value_typeinfo::binary_class_op_fcn f | |
| 1811 = octave_value_typeinfo::lookup_binary_class_op (op); | |
| 2376 | 1812 |
| 7336 | 1813 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1814 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1815 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1816 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1817 retval = f (v1, v2); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1818 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1819 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1820 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1821 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1822 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1823 } |
| 7336 | 1824 else |
| 1825 gripe_binary_op (octave_value::binary_op_as_string (op), | |
| 1826 v1.class_name (), v2.class_name ()); | |
| 1827 } | |
| 2376 | 1828 else |
| 1829 { | |
| 7336 | 1830 // FIXME -- we need to handle overloading operators for built-in |
| 1831 // classes (double, char, int8, etc.) | |
| 2376 | 1832 |
| 7336 | 1833 octave_value_typeinfo::binary_op_fcn f |
| 1834 = octave_value_typeinfo::lookup_binary_op (op, t1, t2); | |
| 1835 | |
| 1836 if (f) | |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1837 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1838 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1839 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1840 retval = f (*v1.rep, *v2.rep); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1841 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1842 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1843 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1844 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1845 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1846 } |
| 7336 | 1847 else |
| 2376 | 1848 { |
| 7336 | 1849 octave_value tv1; |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1850 octave_base_value::type_conv_info cf1 = v1.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1851 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1852 octave_value tv2; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1853 octave_base_value::type_conv_info cf2 = v2.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1854 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1855 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1856 if (cf2.type_id () >= 0 && |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1857 octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1858 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1859 else if (cf1.type_id () >= 0 && |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1860 octave_value_typeinfo::lookup_binary_op (op, cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1861 cf2 = 0; |
| 7336 | 1862 |
| 1863 if (cf1) | |
| 1864 { | |
| 1865 octave_base_value *tmp = cf1 (*v1.rep); | |
| 3203 | 1866 |
| 7336 | 1867 if (tmp) |
| 1868 { | |
| 1869 tv1 = octave_value (tmp); | |
| 1870 t1 = tv1.type_id (); | |
| 1871 } | |
| 1872 else | |
| 1873 { | |
| 1874 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); | |
| 1875 return retval; | |
| 1876 } | |
| 3203 | 1877 } |
| 1878 else | |
| 7336 | 1879 tv1 = v1; |
| 1880 | |
| 1881 if (cf2) | |
| 3203 | 1882 { |
| 7336 | 1883 octave_base_value *tmp = cf2 (*v2.rep); |
| 2376 | 1884 |
| 7336 | 1885 if (tmp) |
| 1886 { | |
| 1887 tv2 = octave_value (tmp); | |
| 1888 t2 = tv2.type_id (); | |
| 1889 } | |
| 1890 else | |
| 1891 { | |
| 1892 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); | |
| 1893 return retval; | |
| 1894 } | |
| 3203 | 1895 } |
| 1896 else | |
| 7336 | 1897 tv2 = v2; |
| 1898 | |
| 1899 if (cf1 || cf2) | |
| 3203 | 1900 { |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1901 retval = do_binary_op (op, tv1, tv2); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1902 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1903 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1904 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1905 //demote double -> single and try again |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1906 cf1 = tv1.numeric_demotion_function (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1907 |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1908 cf2 = tv2.numeric_demotion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1909 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1910 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1911 if (cf2.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1912 && octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1913 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1914 else if (cf1.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1915 && octave_value_typeinfo::lookup_binary_op (op, cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1916 cf2 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1917 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1918 if (cf1) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1919 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1920 octave_base_value *tmp = cf1 (*tv1.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1921 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1922 if (tmp) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1923 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1924 tv1 = octave_value (tmp); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1925 t1 = tv1.type_id (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1926 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1927 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1928 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1929 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1930 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1931 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1932 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1933 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1934 if (cf2) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1935 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1936 octave_base_value *tmp = cf2 (*tv2.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1937 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1938 if (tmp) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1939 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1940 tv2 = octave_value (tmp); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1941 t2 = tv2.type_id (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1942 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1943 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1944 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1945 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1946 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1947 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1948 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1949 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1950 if (cf1 || cf2) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1951 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1952 f = octave_value_typeinfo::lookup_binary_op (op, t1, t2); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1953 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1954 if (f) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1955 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1956 try |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1957 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1958 retval = f (*tv1.rep, *tv2.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1959 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1960 catch (octave_execution_exception) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1961 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1962 gripe_library_execution_error (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1963 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1964 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1965 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1966 gripe_binary_op (octave_value::binary_op_as_string (op), |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1967 v1.type_name (), v2.type_name ()); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1968 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1969 else |
| 7336 | 1970 gripe_binary_op (octave_value::binary_op_as_string (op), |
| 1971 v1.type_name (), v2.type_name ()); | |
| 3203 | 1972 } |
| 2376 | 1973 } |
| 1974 } | |
| 1975 | |
| 1976 return retval; | |
| 1977 } | |
| 1978 | |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1979 static octave_value |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1980 decompose_binary_op (octave_value::compound_binary_op op, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1981 const octave_value& v1, const octave_value& v2) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1982 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1983 octave_value retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1984 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1985 switch (op) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1986 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1987 case octave_value::op_trans_mul: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1988 retval = do_binary_op (octave_value::op_mul, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1989 do_unary_op (octave_value::op_transpose, v1), |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1990 v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1991 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1992 case octave_value::op_mul_trans: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1993 retval = do_binary_op (octave_value::op_mul, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1994 v1, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1995 do_unary_op (octave_value::op_transpose, v2)); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1996 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1997 case octave_value::op_herm_mul: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1998 retval = do_binary_op (octave_value::op_mul, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1999 do_unary_op (octave_value::op_hermitian, v1), |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2000 v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2001 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2002 case octave_value::op_mul_herm: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2003 retval = do_binary_op (octave_value::op_mul, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2004 v1, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2005 do_unary_op (octave_value::op_hermitian, v2)); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2006 break; |
|
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2007 case octave_value::op_trans_ldiv: |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2008 retval = do_binary_op (octave_value::op_ldiv, |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2009 do_unary_op (octave_value::op_transpose, v1), |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2010 v2); |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2011 break; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2012 case octave_value::op_herm_ldiv: |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2013 retval = do_binary_op (octave_value::op_ldiv, |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2014 do_unary_op (octave_value::op_hermitian, v1), |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2015 v2); |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2016 break; |
|
8982
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2017 case octave_value::op_el_not_and: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2018 retval = do_binary_op (octave_value::op_el_and, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2019 do_unary_op (octave_value::op_not, v1), |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2020 v2); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2021 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2022 case octave_value::op_el_not_or: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2023 retval = do_binary_op (octave_value::op_el_or, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2024 do_unary_op (octave_value::op_not, v1), |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2025 v2); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2026 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2027 case octave_value::op_el_and_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2028 retval = do_binary_op (octave_value::op_el_and, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2029 v1, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2030 do_unary_op (octave_value::op_not, v2)); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2031 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2032 case octave_value::op_el_or_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2033 retval = do_binary_op (octave_value::op_el_or, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2034 v1, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2035 do_unary_op (octave_value::op_not, v2)); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2036 break; |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2037 default: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2038 error ("invalid compound operator"); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2039 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2040 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2041 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2042 return retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2043 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2044 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2045 octave_value |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2046 do_binary_op (octave_value::compound_binary_op op, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2047 const octave_value& v1, const octave_value& v2) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2048 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2049 octave_value retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2050 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2051 int t1 = v1.type_id (); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2052 int t2 = v2.type_id (); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2053 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2054 if (t1 == octave_class::static_type_id () |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2055 || t2 == octave_class::static_type_id ()) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2056 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2057 octave_value_typeinfo::binary_class_op_fcn f |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2058 = octave_value_typeinfo::lookup_binary_class_op (op); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2059 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2060 if (f) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2061 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2062 try |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2063 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2064 retval = f (v1, v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2065 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2066 catch (octave_execution_exception) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2067 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2068 gripe_library_execution_error (); |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2069 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2070 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2071 else |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2072 retval = decompose_binary_op (op, v1, v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2073 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2074 else |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2075 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2076 octave_value_typeinfo::binary_op_fcn f |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2077 = octave_value_typeinfo::lookup_binary_op (op, t1, t2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2078 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2079 if (f) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2080 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2081 try |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2082 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2083 retval = f (*v1.rep, *v2.rep); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2084 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2085 catch (octave_execution_exception) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2086 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2087 gripe_library_execution_error (); |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2088 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2089 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2090 else |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2091 retval = decompose_binary_op (op, v1, v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2092 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2093 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2094 return retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2095 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2096 |
| 4915 | 2097 static void |
| 2098 gripe_cat_op (const std::string& tn1, const std::string& tn2) | |
| 2099 { | |
| 2100 error ("concatenation operator not implemented for `%s' by `%s' operations", | |
| 2101 tn1.c_str (), tn2.c_str ()); | |
| 2102 } | |
| 2103 | |
| 2104 static void | |
| 2105 gripe_cat_op_conv (void) | |
| 2106 { | |
| 2107 error ("type conversion failed for concatenation operator"); | |
| 2108 } | |
| 2109 | |
| 2110 octave_value | |
| 2111 do_cat_op (const octave_value& v1, const octave_value& v2, | |
| 6867 | 2112 const Array<octave_idx_type>& ra_idx) |
| 4915 | 2113 { |
| 2114 octave_value retval; | |
| 2115 | |
|
7814
87865ed7405f
Second set of single precision test code and fix of resulting bugs
David Bateman <dbateman@free.fr>
parents:
7800
diff
changeset
|
2116 // Can't rapid return for concatenation with an empty object here as |
|
87865ed7405f
Second set of single precision test code and fix of resulting bugs
David Bateman <dbateman@free.fr>
parents:
7800
diff
changeset
|
2117 // something like cat(1,[],single([]) must return the correct type. |
| 5164 | 2118 |
| 4915 | 2119 int t1 = v1.type_id (); |
| 2120 int t2 = v2.type_id (); | |
| 2121 | |
| 5759 | 2122 octave_value_typeinfo::cat_op_fcn f |
| 2123 = octave_value_typeinfo::lookup_cat_op (t1, t2); | |
| 4915 | 2124 |
| 2125 if (f) | |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2126 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2127 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2128 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2129 retval = f (*v1.rep, *v2.rep, ra_idx); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2130 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2131 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2132 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2133 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2134 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2135 } |
| 4915 | 2136 else |
| 2137 { | |
| 2138 octave_value tv1; | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2139 octave_base_value::type_conv_info cf1 = v1.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2140 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2141 octave_value tv2; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2142 octave_base_value::type_conv_info cf2 = v2.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2143 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2144 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2145 if (cf2.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2146 && octave_value_typeinfo::lookup_cat_op (t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2147 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2148 else if (cf1.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2149 && octave_value_typeinfo::lookup_cat_op (cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2150 cf2 = 0; |
| 4915 | 2151 |
| 2152 if (cf1) | |
| 2153 { | |
| 5759 | 2154 octave_base_value *tmp = cf1 (*v1.rep); |
| 4915 | 2155 |
| 2156 if (tmp) | |
| 2157 { | |
| 2158 tv1 = octave_value (tmp); | |
| 2159 t1 = tv1.type_id (); | |
| 2160 } | |
| 2161 else | |
| 2162 { | |
| 2163 gripe_cat_op_conv (); | |
| 2164 return retval; | |
| 2165 } | |
| 2166 } | |
| 2167 else | |
| 2168 tv1 = v1; | |
| 2169 | |
| 2170 if (cf2) | |
| 2171 { | |
| 5759 | 2172 octave_base_value *tmp = cf2 (*v2.rep); |
| 4915 | 2173 |
| 2174 if (tmp) | |
| 2175 { | |
| 2176 tv2 = octave_value (tmp); | |
| 2177 t2 = tv2.type_id (); | |
| 2178 } | |
| 2179 else | |
| 2180 { | |
| 2181 gripe_cat_op_conv (); | |
| 2182 return retval; | |
| 2183 } | |
| 2184 } | |
| 2185 else | |
| 2186 tv2 = v2; | |
| 2187 | |
| 2188 if (cf1 || cf2) | |
| 2189 { | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2190 retval = do_cat_op (tv1, tv2, ra_idx); |
| 4915 | 2191 } |
| 2192 else | |
| 2193 gripe_cat_op (v1.type_name (), v2.type_name ()); | |
| 2194 } | |
| 2195 | |
| 2196 return retval; | |
| 2197 } | |
| 2198 | |
| 3933 | 2199 void |
| 2200 octave_value::print_info (std::ostream& os, const std::string& prefix) const | |
| 2201 { | |
| 2202 os << prefix << "type_name: " << type_name () << "\n" | |
| 2203 << prefix << "count: " << get_count () << "\n" | |
| 2204 << prefix << "rep info: "; | |
| 2205 | |
| 2206 rep->print_info (os, prefix + " "); | |
| 2207 } | |
| 2208 | |
| 3203 | 2209 static void |
| 3523 | 2210 gripe_unary_op (const std::string& on, const std::string& tn) |
| 3203 | 2211 { |
| 2212 error ("unary operator `%s' not implemented for `%s' operands", | |
| 2213 on.c_str (), tn.c_str ()); | |
| 2214 } | |
| 2215 | |
| 2216 static void | |
| 3523 | 2217 gripe_unary_op_conv (const std::string& on) |
| 3203 | 2218 { |
| 2219 error ("type conversion failed for unary operator `%s'", on.c_str ()); | |
| 2220 } | |
| 2221 | |
| 2222 octave_value | |
| 2223 do_unary_op (octave_value::unary_op op, const octave_value& v) | |
| 2224 { | |
| 2225 octave_value retval; | |
| 2226 | |
| 2227 int t = v.type_id (); | |
| 2228 | |
| 7336 | 2229 if (t == octave_class::static_type_id ()) |
| 2230 { | |
| 2231 octave_value_typeinfo::unary_class_op_fcn f | |
| 2232 = octave_value_typeinfo::lookup_unary_class_op (op); | |
| 3203 | 2233 |
| 7336 | 2234 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2235 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2236 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2237 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2238 retval = f (v); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2239 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2240 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2241 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2242 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2243 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2244 } |
| 7336 | 2245 else |
| 2246 gripe_unary_op (octave_value::unary_op_as_string (op), | |
| 2247 v.class_name ()); | |
| 2248 } | |
| 3203 | 2249 else |
| 2250 { | |
| 7336 | 2251 // FIXME -- we need to handle overloading operators for built-in |
| 2252 // classes (double, char, int8, etc.) | |
| 2253 | |
| 2254 octave_value_typeinfo::unary_op_fcn f | |
| 2255 = octave_value_typeinfo::lookup_unary_op (op, t); | |
| 3203 | 2256 |
| 7336 | 2257 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2258 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2259 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2260 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2261 retval = f (*v.rep); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2262 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2263 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2264 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2265 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2266 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2267 } |
| 7336 | 2268 else |
| 3203 | 2269 { |
| 7336 | 2270 octave_value tv; |
| 2271 octave_base_value::type_conv_fcn cf | |
| 2272 = v.numeric_conversion_function (); | |
| 3203 | 2273 |
| 7336 | 2274 if (cf) |
| 3203 | 2275 { |
| 7336 | 2276 octave_base_value *tmp = cf (*v.rep); |
| 3203 | 2277 |
| 7336 | 2278 if (tmp) |
| 2279 { | |
| 2280 tv = octave_value (tmp); | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2281 retval = do_unary_op (op, tv); |
| 7336 | 2282 } |
| 3203 | 2283 else |
| 7336 | 2284 gripe_unary_op_conv (octave_value::unary_op_as_string (op)); |
| 3203 | 2285 } |
| 2286 else | |
| 7336 | 2287 gripe_unary_op (octave_value::unary_op_as_string (op), |
| 2288 v.type_name ()); | |
| 3203 | 2289 } |
| 2290 } | |
| 2291 | |
| 2292 return retval; | |
| 2293 } | |
| 2294 | |
| 2295 static void | |
| 3933 | 2296 gripe_unary_op_conversion_failed (const std::string& op, |
| 2297 const std::string& tn) | |
| 3203 | 2298 { |
| 2299 error ("operator %s: type conversion for `%s' failed", | |
| 2300 op.c_str (), tn.c_str ()); | |
| 2301 } | |
| 2302 | |
| 3933 | 2303 const octave_value& |
| 2304 octave_value::do_non_const_unary_op (unary_op op) | |
| 3203 | 2305 { |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2306 if (op == op_incr || op == op_decr) |
| 3203 | 2307 { |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2308 // Genuine. |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2309 int t = type_id (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2310 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2311 octave_value_typeinfo::non_const_unary_op_fcn f |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2312 = octave_value_typeinfo::lookup_non_const_unary_op (op, t); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2313 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2314 if (f) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2315 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2316 make_unique (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2317 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2318 try |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2319 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2320 f (*rep); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2321 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2322 catch (octave_execution_exception) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2323 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2324 gripe_library_execution_error (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2325 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2326 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2327 else |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2328 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2329 octave_base_value::type_conv_fcn cf = numeric_conversion_function (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2330 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2331 if (cf) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2332 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2333 octave_base_value *tmp = cf (*rep); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2334 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2335 if (tmp) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2336 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2337 octave_base_value *old_rep = rep; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2338 rep = tmp; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2339 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2340 t = type_id (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2341 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2342 f = octave_value_typeinfo::lookup_non_const_unary_op (op, t); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2343 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2344 if (f) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2345 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2346 try |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2347 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2348 f (*rep); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2349 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2350 catch (octave_execution_exception) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2351 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2352 gripe_library_execution_error (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2353 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2354 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2355 if (old_rep && --old_rep->count == 0) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2356 delete old_rep; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2357 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2358 else |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2359 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2360 if (old_rep) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2361 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2362 if (--rep->count == 0) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2363 delete rep; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2364 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2365 rep = old_rep; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2366 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2367 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2368 gripe_unary_op (octave_value::unary_op_as_string (op), |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2369 type_name ()); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2370 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2371 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2372 else |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2373 gripe_unary_op_conversion_failed |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2374 (octave_value::unary_op_as_string (op), type_name ()); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2375 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2376 else |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2377 gripe_unary_op (octave_value::unary_op_as_string (op), type_name ()); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2378 } |
| 3203 | 2379 } |
| 2380 else | |
| 2381 { | |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2382 // Non-genuine. |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2383 int t = type_id (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2384 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2385 octave_value_typeinfo::non_const_unary_op_fcn f = 0; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2386 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2387 // Only attempt to operate in-place if this variable is unshared. |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2388 if (rep->count == 1) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2389 f = octave_value_typeinfo::lookup_non_const_unary_op (op, t); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2390 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2391 if (f) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2392 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2393 try |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2394 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2395 f (*rep); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2396 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2397 catch (octave_execution_exception) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2398 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2399 gripe_library_execution_error (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2400 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2401 } |
| 3203 | 2402 else |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2403 *this = do_unary_op (op, *this); |
| 3203 | 2404 } |
| 3933 | 2405 |
| 2406 return *this; | |
| 3203 | 2407 } |
| 2408 | |
| 3933 | 2409 #if 0 |
| 3205 | 2410 static void |
| 3933 | 2411 gripe_unary_op_failed_or_no_method (const std::string& on, |
| 2412 const std::string& tn) | |
| 3205 | 2413 { |
| 2414 error ("operator %s: no method, or unable to evaluate for %s operand", | |
| 2415 on.c_str (), tn.c_str ()); | |
| 2416 } | |
| 3933 | 2417 #endif |
| 3205 | 2418 |
| 2419 void | |
| 4661 | 2420 octave_value::do_non_const_unary_op (unary_op, const octave_value_list&) |
| 3205 | 2421 { |
| 3933 | 2422 abort (); |
| 2423 } | |
| 2424 | |
| 2425 octave_value | |
| 4247 | 2426 octave_value::do_non_const_unary_op (unary_op op, const std::string& type, |
| 4219 | 2427 const std::list<octave_value_list>& idx) |
| 3933 | 2428 { |
| 2429 octave_value retval; | |
| 2430 | |
| 2431 if (idx.empty ()) | |
| 2432 { | |
| 2433 do_non_const_unary_op (op); | |
| 3205 | 2434 |
| 3933 | 2435 retval = *this; |
| 2436 } | |
| 2437 else | |
| 2438 { | |
| 5775 | 2439 // FIXME -- only do the following stuff if we can't find a |
| 3933 | 2440 // specific function to call to handle the op= operation for the |
| 2441 // types we have. | |
| 3205 | 2442 |
| 3933 | 2443 assign_op assop = unary_op_to_assign_op (op); |
| 2444 | |
| 2445 retval = assign (assop, type, idx, 1.0); | |
| 2446 } | |
| 2447 | |
| 2448 return retval; | |
| 3205 | 2449 } |
| 2450 | |
| 2451 octave_value::assign_op | |
| 2452 octave_value::unary_op_to_assign_op (unary_op op) | |
| 2453 { | |
| 2454 assign_op binop = unknown_assign_op; | |
| 2455 | |
| 2456 switch (op) | |
| 2457 { | |
| 3533 | 2458 case op_incr: |
| 2459 binop = op_add_eq; | |
| 3205 | 2460 break; |
| 2461 | |
| 3533 | 2462 case op_decr: |
| 2463 binop = op_sub_eq; | |
| 3205 | 2464 break; |
| 2465 | |
| 2466 default: | |
| 2467 { | |
| 3523 | 2468 std::string on = unary_op_as_string (op); |
| 3205 | 2469 error ("operator %s: no assign operator found", on.c_str ()); |
| 2470 } | |
| 2471 } | |
| 2472 | |
| 2473 return binop; | |
| 2474 } | |
| 2475 | |
| 3204 | 2476 octave_value::binary_op |
| 2477 octave_value::op_eq_to_binary_op (assign_op op) | |
| 2478 { | |
| 2479 binary_op binop = unknown_binary_op; | |
| 2480 | |
| 2481 switch (op) | |
| 2482 { | |
| 3533 | 2483 case op_add_eq: |
| 2484 binop = op_add; | |
| 3204 | 2485 break; |
| 2486 | |
| 3533 | 2487 case op_sub_eq: |
| 2488 binop = op_sub; | |
| 3204 | 2489 break; |
| 2490 | |
| 3533 | 2491 case op_mul_eq: |
| 2492 binop = op_mul; | |
| 3204 | 2493 break; |
| 2494 | |
| 3533 | 2495 case op_div_eq: |
| 2496 binop = op_div; | |
| 3204 | 2497 break; |
| 2498 | |
| 3533 | 2499 case op_ldiv_eq: |
| 2500 binop = op_ldiv; | |
| 3204 | 2501 break; |
| 2502 | |
| 4018 | 2503 case op_pow_eq: |
| 2504 binop = op_pow; | |
| 2505 break; | |
| 2506 | |
| 3533 | 2507 case op_lshift_eq: |
| 2508 binop = op_lshift; | |
| 3204 | 2509 break; |
| 2510 | |
| 3533 | 2511 case op_rshift_eq: |
| 2512 binop = op_rshift; | |
| 3204 | 2513 break; |
| 2514 | |
| 3533 | 2515 case op_el_mul_eq: |
| 2516 binop = op_el_mul; | |
| 3204 | 2517 break; |
| 2518 | |
| 3533 | 2519 case op_el_div_eq: |
| 2520 binop = op_el_div; | |
| 3204 | 2521 break; |
| 2522 | |
| 3533 | 2523 case op_el_ldiv_eq: |
| 2524 binop = op_el_ldiv; | |
| 3204 | 2525 break; |
| 2526 | |
| 4018 | 2527 case op_el_pow_eq: |
| 2528 binop = op_el_pow; | |
| 2529 break; | |
| 2530 | |
| 3533 | 2531 case op_el_and_eq: |
| 2532 binop = op_el_and; | |
| 3204 | 2533 break; |
| 2534 | |
| 3533 | 2535 case op_el_or_eq: |
| 2536 binop = op_el_or; | |
| 3204 | 2537 break; |
| 2538 | |
| 2539 default: | |
| 2540 { | |
| 3523 | 2541 std::string on = assign_op_as_string (op); |
| 3204 | 2542 error ("operator %s: no binary operator found", on.c_str ()); |
| 2543 } | |
| 2544 } | |
| 2545 | |
| 2546 return binop; | |
| 2547 } | |
| 2548 | |
| 3933 | 2549 octave_value |
| 2550 octave_value::empty_conv (const std::string& type, const octave_value& rhs) | |
| 2551 { | |
| 2552 octave_value retval; | |
| 2553 | |
| 2554 if (type.length () > 0) | |
| 2555 { | |
| 2556 switch (type[0]) | |
| 2557 { | |
| 2558 case '(': | |
| 2559 { | |
| 2560 if (type.length () > 1 && type[1] == '.') | |
| 2561 retval = Octave_map (); | |
| 2562 else | |
| 2563 retval = octave_value (rhs.empty_clone ()); | |
| 2564 } | |
| 2565 break; | |
| 2566 | |
| 2567 case '{': | |
| 2568 retval = Cell (); | |
| 2569 break; | |
| 2570 | |
| 2571 case '.': | |
| 2572 retval = Octave_map (); | |
| 2573 break; | |
| 2574 | |
| 2575 default: | |
| 2576 panic_impossible (); | |
| 2577 } | |
| 2578 } | |
| 2579 else | |
| 2580 retval = octave_value (rhs.empty_clone ()); | |
| 2581 | |
| 2582 return retval; | |
| 2583 } | |
| 2584 | |
| 2376 | 2585 void |
| 2586 install_types (void) | |
| 2587 { | |
| 2588 octave_base_value::register_type (); | |
| 3928 | 2589 octave_cell::register_type (); |
| 2376 | 2590 octave_scalar::register_type (); |
| 2591 octave_complex::register_type (); | |
| 2592 octave_matrix::register_type (); | |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2593 octave_diag_matrix::register_type (); |
| 2376 | 2594 octave_complex_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2595 octave_complex_diag_matrix::register_type (); |
| 2376 | 2596 octave_range::register_type (); |
| 2825 | 2597 octave_bool::register_type (); |
| 2598 octave_bool_matrix::register_type (); | |
| 2376 | 2599 octave_char_matrix::register_type (); |
| 2600 octave_char_matrix_str::register_type (); | |
| 5279 | 2601 octave_char_matrix_sq_str::register_type (); |
| 4901 | 2602 octave_int8_scalar::register_type (); |
| 2603 octave_int16_scalar::register_type (); | |
| 2604 octave_int32_scalar::register_type (); | |
| 2605 octave_int64_scalar::register_type (); | |
| 2606 octave_uint8_scalar::register_type (); | |
| 2607 octave_uint16_scalar::register_type (); | |
| 2608 octave_uint32_scalar::register_type (); | |
| 2609 octave_uint64_scalar::register_type (); | |
| 2610 octave_int8_matrix::register_type (); | |
| 2611 octave_int16_matrix::register_type (); | |
| 2612 octave_int32_matrix::register_type (); | |
| 2613 octave_int64_matrix::register_type (); | |
| 2614 octave_uint8_matrix::register_type (); | |
| 2615 octave_uint16_matrix::register_type (); | |
| 2616 octave_uint32_matrix::register_type (); | |
| 2617 octave_uint64_matrix::register_type (); | |
| 5164 | 2618 octave_sparse_bool_matrix::register_type (); |
| 2619 octave_sparse_matrix::register_type (); | |
| 2620 octave_sparse_complex_matrix::register_type (); | |
| 2376 | 2621 octave_struct::register_type (); |
| 7336 | 2622 octave_class::register_type (); |
| 2880 | 2623 octave_list::register_type (); |
| 3977 | 2624 octave_cs_list::register_type (); |
| 2376 | 2625 octave_magic_colon::register_type (); |
| 2974 | 2626 octave_builtin::register_type (); |
| 2627 octave_user_function::register_type (); | |
| 4649 | 2628 octave_dld_function::register_type (); |
| 4643 | 2629 octave_fcn_handle::register_type (); |
| 4966 | 2630 octave_fcn_inline::register_type (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2631 octave_float_scalar::register_type (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2632 octave_float_complex::register_type (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2633 octave_float_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2634 octave_float_diag_matrix::register_type (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2635 octave_float_complex_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2636 octave_float_complex_diag_matrix::register_type (); |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
2637 octave_perm_matrix::register_type (); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2638 octave_null_matrix::register_type (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2639 octave_null_str::register_type (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2640 octave_null_sq_str::register_type (); |
| 2376 | 2641 } |
| 2642 | |
| 4970 | 2643 #if 0 |
| 2644 DEFUN (cast, args, , | |
| 2645 "-*- texinfo -*-\n\ | |
| 2646 @deftypefn {Built-in Function} {} cast (@var{val}, @var{type})\n\ | |
| 2647 Convert @var{val} to the new data type @var{type}.\n\ | |
| 5642 | 2648 @seealso{class, typeinfo}\n\ |
| 2649 @end deftypefn") | |
| 4970 | 2650 { |
| 2651 octave_value retval; | |
| 2652 | |
| 2653 if (args.length () == 2) | |
| 2654 error ("cast: not implemented"); | |
| 2655 else | |
| 5823 | 2656 print_usage (); |
| 4970 | 2657 |
| 2658 return retval; | |
| 2659 } | |
| 2660 #endif | |
| 2661 | |
| 4791 | 2662 DEFUN (sizeof, args, , |
| 2663 "-*- texinfo -*-\n\ | |
| 2664 @deftypefn {Built-in Function} {} sizeof (@var{val})\n\ | |
| 2665 Return the size of @var{val} in bytes\n\ | |
| 2666 @end deftypefn") | |
| 2667 { | |
| 2668 octave_value retval; | |
| 2669 | |
| 2670 if (args.length () == 1) | |
| 2671 retval = args(0).byte_size (); | |
| 2672 else | |
| 5823 | 2673 print_usage (); |
| 4791 | 2674 |
| 2675 return retval; | |
| 2676 } | |
| 2677 | |
| 6153 | 2678 static void |
| 2679 decode_subscripts (const char* name, const octave_value& arg, | |
| 2680 std::string& type_string, | |
| 2681 std::list<octave_value_list>& idx) | |
| 2682 { | |
| 2683 Octave_map m = arg.map_value (); | |
| 2684 | |
| 2685 if (! error_state | |
| 6639 | 2686 && m.nfields () == 2 && m.contains ("type") && m.contains ("subs")) |
| 6153 | 2687 { |
| 2688 Cell& type = m.contents ("type"); | |
| 2689 Cell& subs = m.contents ("subs"); | |
| 2690 | |
| 2691 type_string = std::string (type.length(), '\0'); | |
| 2692 | |
| 2693 for (int k = 0; k < type.length (); k++) | |
| 2694 { | |
| 2695 std::string item = type(k).string_value (); | |
| 2696 | |
| 2697 if (! error_state) | |
| 2698 { | |
| 2699 if (item == "{}") | |
| 2700 type_string[k] = '{'; | |
| 2701 else if (item == "()") | |
| 2702 type_string[k] = '('; | |
| 2703 else if (item == ".") | |
| 2704 type_string[k] = '.'; | |
| 2705 else | |
| 2706 { | |
| 2707 error("%s: invalid indexing type `%s'", name, item.c_str ()); | |
| 2708 return; | |
| 2709 } | |
| 2710 } | |
| 2711 else | |
| 2712 { | |
| 2713 error ("%s: expecting type(%d) to be a character string", | |
| 2714 name, k+1); | |
| 2715 return; | |
| 2716 } | |
| 2717 | |
| 2718 octave_value_list idx_item; | |
| 2719 | |
| 2720 if (subs(k).is_string ()) | |
| 2721 idx_item(0) = subs(k); | |
| 2722 else if (subs(k).is_cell ()) | |
| 2723 { | |
| 2724 Cell subs_cell = subs(k).cell_value (); | |
| 2725 | |
| 2726 for (int n = 0; n < subs_cell.length (); n++) | |
| 2727 { | |
| 2728 if (subs_cell(n).is_string () | |
| 2729 && subs_cell(n).string_value () == ":") | |
| 2730 idx_item(n) = octave_value(octave_value::magic_colon_t); | |
| 2731 else | |
| 2732 idx_item(n) = subs_cell(n); | |
| 2733 } | |
| 2734 } | |
| 2735 else | |
| 2736 { | |
| 2737 error ("%s: expecting subs(%d) to be a character string or cell array", | |
| 2738 name, k+1); | |
| 2739 return; | |
| 2740 } | |
| 2741 | |
| 2742 idx.push_back (idx_item); | |
| 2743 } | |
| 2744 } | |
| 2745 else | |
| 2746 error ("%s: second argument must be a structure with fields `type' and `subs'", name); | |
| 2747 } | |
| 2748 | |
| 2749 DEFUN (subsref, args, nargout, | |
| 2750 "-*- texinfo -*-\n\ | |
| 2751 @deftypefn {Built-in Function} {} subsref (@var{val}, @var{idx})\n\ | |
| 2752 Perform the subscripted element selection operation according to\n\ | |
| 2753 the subscript specified by @var{idx}.\n\ | |
| 2754 \n\ | |
| 2755 The subscript @var{idx} is expected to be a structure array with\n\ | |
| 2756 fields @samp{type} and @samp{subs}. Valid values for @samp{type}\n\ | |
| 6550 | 2757 are @samp{\"()\"}, @samp{\"@{@}\"}, and @samp{\".\"}.\n\ |
| 6153 | 2758 The @samp{subs} field may be either @samp{\":\"} or a cell array\n\ |
| 2759 of index values.\n\ | |
| 6631 | 2760 \n\ |
| 2761 The following example shows how to extract the two first columns of\n\ | |
| 2762 a matrix\n\ | |
| 2763 \n\ | |
| 2764 @example\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2765 @group\n\ |
| 6631 | 2766 val = magic(3)\n\ |
| 2767 @result{} val = [ 8 1 6\n\ | |
| 2768 3 5 7\n\ | |
| 2769 4 9 2 ]\n\ | |
| 2770 idx.type = \"()\";\n\ | |
| 2771 idx.subs = @{\":\", 1:2@};\n\ | |
| 2772 subsref(val, idx)\n\ | |
| 2773 @result{} [ 8 1 \n\ | |
| 2774 3 5 \n\ | |
| 2775 4 9 ]\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2776 @end group\n\ |
| 6631 | 2777 @end example\n\ |
| 2778 \n\ | |
| 2779 @noindent\n\ | |
| 2780 Note that this is the same as writing @code{val(:,1:2)}.\n\ | |
| 6157 | 2781 @seealso{subsasgn, substruct}\n\ |
| 6153 | 2782 @end deftypefn") |
| 2783 { | |
| 2784 octave_value_list retval; | |
| 2785 | |
| 2786 if (args.length () == 2) | |
| 2787 { | |
| 2788 std::string type; | |
| 2789 std::list<octave_value_list> idx; | |
| 2790 | |
| 2791 decode_subscripts ("subsref", args(1), type, idx); | |
| 2792 | |
| 2793 if (! error_state) | |
| 2794 retval = args(0).subsref (type, idx, nargout); | |
| 2795 } | |
| 2796 else | |
| 2797 print_usage (); | |
| 2798 | |
| 2799 return retval; | |
| 2800 } | |
| 2801 | |
| 2802 DEFUN (subsasgn, args, , | |
| 2803 "-*- texinfo -*-\n\ | |
| 2804 @deftypefn {Built-in Function} {} subsasgn (@var{val}, @var{idx}, @var{rhs})\n\ | |
| 2805 Perform the subscripted assignment operation according to\n\ | |
| 2806 the subscript specified by @var{idx}.\n\ | |
| 2807 \n\ | |
| 2808 The subscript @var{idx} is expected to be a structure array with\n\ | |
| 2809 fields @samp{type} and @samp{subs}. Valid values for @samp{type}\n\ | |
| 6248 | 2810 are @samp{\"()\"}, @samp{\"@{@}\"}, and @samp{\".\"}.\n\ |
| 6153 | 2811 The @samp{subs} field may be either @samp{\":\"} or a cell array\n\ |
| 2812 of index values.\n\ | |
| 6631 | 2813 \n\ |
| 2814 The following example shows how to set the two first columns of a\n\ | |
| 2815 3-by-3 matrix to zero.\n\ | |
| 2816 \n\ | |
| 2817 @example\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2818 @group\n\ |
| 6631 | 2819 val = magic(3);\n\ |
| 2820 idx.type = \"()\";\n\ | |
| 2821 idx.subs = @{\":\", 1:2@};\n\ | |
| 2822 subsasgn (val, idx, 0)\n\ | |
| 2823 @result{} [ 0 0 6\n\ | |
| 2824 0 0 7\n\ | |
| 2825 0 0 2 ]\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2826 @end group\n\ |
| 6631 | 2827 @end example\n\ |
| 2828 \n\ | |
| 2829 Note that this is the same as writing @code{val(:,1:2) = 0}.\n\ | |
| 6157 | 2830 @seealso{subsref, substruct}\n\ |
| 6153 | 2831 @end deftypefn") |
| 2832 { | |
| 2833 octave_value retval; | |
| 2834 | |
| 2835 if (args.length () == 3) | |
| 2836 { | |
| 2837 std::string type; | |
| 2838 std::list<octave_value_list> idx; | |
| 2839 | |
| 2840 decode_subscripts ("subsasgn", args(1), type, idx); | |
| 2841 | |
|
9368
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2842 octave_value arg0 = args(0); |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2843 |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2844 arg0.make_unique (); |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2845 |
| 6153 | 2846 if (! error_state) |
|
9368
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2847 retval = arg0.subsasgn (type, idx, args(2)); |
| 6153 | 2848 } |
| 2849 else | |
| 2850 print_usage (); | |
| 2851 | |
| 2852 return retval; | |
| 2853 } | |
| 2854 | |
| 2376 | 2855 /* |
| 2856 ;;; Local Variables: *** | |
| 2857 ;;; mode: C++ *** | |
| 2858 ;;; End: *** | |
| 2859 */ |