octave-nkf: src/ov-cell.cc annotate

annotate src/ov-cell.cc @ 10840:89f4d7e294cc

Grammarcheck .cc files

author	Rik <octave@nomad.inbox5.com>
date	Sat, 31 Jul 2010 11:18:11 -0700
parents	687586b99f9d
children	333bf09e3b6e

rev	line source
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	1 /*
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	2
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8825 diff changeset	3 Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	4 John W. Eaton
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	5 Copyright (C) 2009, 2010 VZLU Prague
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	6
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	8
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	10 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	12 option) any later version.
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	13
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	17 for more details.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	18
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	19 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	21 <http://www.gnu.org/licenses/>.
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	22
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	23 */
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	24
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	25 #ifdef HAVE_CONFIG_H
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	26 #include <config.h>
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	27 #endif
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	28
5850 426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	29 #include <iomanip>
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3448 diff changeset	30 #include <iostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	31 #include <sstream>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	32 #include <vector>
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	33 #include <queue>
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	34
5360 33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5351 diff changeset	35 #include "Array-util.h"
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5351 diff changeset	36 #include "byte-swap.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	37 #include "lo-utils.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4066 diff changeset	38 #include "quit.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	39 #include "oct-locbuf.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	40
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	41 #include "defun.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	42 #include "error.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	43 #include "ov-cell.h"
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	44 #include "oct-obj.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	45 #include "unwind-prot.h"
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	46 #include "utils.h"
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	47 #include "ov-base-mat.h"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	48 #include "ov-base-mat.cc"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	49 #include "ov-re-mat.h"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	50 #include "ov-scalar.h"
5360 33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5351 diff changeset	51 #include "pr-output.h"
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5351 diff changeset	52 #include "ov-scalar.h"
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8551 diff changeset	53 #include "gripes.h"
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	54
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	55 #include "ls-oct-ascii.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	56 #include "ls-oct-binary.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	57 #include "ls-hdf5.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	58 #include "ls-utils.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	59
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	60 // Cell is able to handle octave_value indexing by itself, so just forward
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	61 // everything.
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	62
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	63 template <>
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	64 octave_value
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	65 octave_base_matrix<Cell>::do_index_op (const octave_value_list& idx,
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	66 bool resize_ok)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	67 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	68 return matrix.index (idx, resize_ok);
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	69 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	70
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	71 template <>
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	72 void
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	73 octave_base_matrix<Cell>::assign (const octave_value_list& idx, const Cell& rhs)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	74 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	75 matrix.assign (idx, rhs);
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	76 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	77
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	78 template <>
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	79 void
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	80 octave_base_matrix<Cell>::assign (const octave_value_list& idx, octave_value rhs)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	81 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	82 // FIXME: Really?
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	83 if (rhs.is_cell ())
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	84 matrix.assign (idx, rhs.cell_value ());
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	85 else
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	86 matrix.assign (idx, Cell (rhs));
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	87 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	88
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	89 template <>
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	90 void
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	91 octave_base_matrix<Cell>::delete_elements (const octave_value_list& idx)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	92 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	93 matrix.delete_elements (idx);
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	94 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	95
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	96 // FIXME: this list of specializations is becoming so long that we should really ask
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	97 // whether octave_cell should inherit from octave_base_matrix at all.
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	98
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	99 template <>
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	100 octave_value
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	101 octave_base_matrix<Cell>::fast_elem_extract (octave_idx_type n) const
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	102 {
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	103 if (n < matrix.numel ())
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	104 return Cell (matrix(n));
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	105 else
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	106 return octave_value ();
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	107 }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	108
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	109 template <>
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	110 bool
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	111 octave_base_matrix<Cell>::fast_elem_insert (octave_idx_type n,
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	112 const octave_value& x)
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	113 {
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	114 const octave_cell *xrep =
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	115 dynamic_cast<const octave_cell *> (&x.get_rep ());
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	116
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	117 bool retval = xrep && xrep->matrix.numel () == 1 && n < matrix.numel ();
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	118 if (retval)
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	119 matrix(n) = xrep->matrix(0);
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	120
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	121 return retval;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	122 }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	123
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	124 template class octave_base_matrix<Cell>;
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	125
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	126 DEFINE_OCTAVE_ALLOCATOR (octave_cell);
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	127
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4610 diff changeset	128 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_cell, "cell", "cell");
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	129
6833 e8a18d380097 [project @ 2007-08-27 17:22:50 by jwe] jwe parents: 6767 diff changeset	130 static void
e8a18d380097 [project @ 2007-08-27 17:22:50 by jwe] jwe parents: 6767 diff changeset	131 gripe_failed_assignment (void)
e8a18d380097 [project @ 2007-08-27 17:22:50 by jwe] jwe parents: 6767 diff changeset	132 {
e8a18d380097 [project @ 2007-08-27 17:22:50 by jwe] jwe parents: 6767 diff changeset	133 error ("assignment to cell array failed");
e8a18d380097 [project @ 2007-08-27 17:22:50 by jwe] jwe parents: 6767 diff changeset	134 }
e8a18d380097 [project @ 2007-08-27 17:22:50 by jwe] jwe parents: 6767 diff changeset	135
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	136 octave_value_list
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4243 diff changeset	137 octave_cell::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	138 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	139 int nargout)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	140 {
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	141 octave_value_list retval;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	142
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	143 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	144 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	145 case '(':
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	146 retval(0) = do_index_op (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	147 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	148
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	149 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	150 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	151 octave_value tmp = do_index_op (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	152
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	153 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	154 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	155 Cell tcell = tmp.cell_value ();
4582 db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe] jwe parents: 4563 diff changeset	156
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	157 if (tcell.length () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	158 retval(0) = tcell(0,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	159 else
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	160 retval = octave_value (octave_value_list (tcell), true);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	161 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	162 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	163 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	164
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	165 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	166 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	167 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	168 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	169 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	170 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	171
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	172 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	173 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	174 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	175
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5765 diff changeset	176 // FIXME -- perhaps there should be an
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	177 // octave_value_list::next_subsref member function? See also
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	178 // octave_user_function::subsref.
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	179
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	180 if (idx.size () > 1)
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	181 retval = retval(0).next_subsref (nargout, type, idx);
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	182
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	183 return retval;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	184 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	185
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	186 octave_value
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	187 octave_cell::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	188 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	189 bool auto_add)
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	190 {
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	191 octave_value retval;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	192
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	193 switch (type[0])
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	194 {
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	195 case '(':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	196 retval = do_index_op (idx.front (), auto_add);
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	197 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	198
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	199 case '{':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	200 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	201 octave_value tmp = do_index_op (idx.front (), auto_add);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	202
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	203 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	204 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	205 const Cell tcell = tmp.cell_value ();
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	206
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	207 if (tcell.length () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	208 retval = tcell(0,0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	209 else
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8551 diff changeset	210 retval = octave_value (octave_value_list (tcell), true);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	211 }
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	212 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	213 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	214
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	215 case '.':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	216 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	217 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	218 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	219 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	220 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	221
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	222 default:
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	223 panic_impossible ();
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	224 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	225
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	226 // FIXME -- perhaps there should be an
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	227 // octave_value_list::next_subsref member function? See also
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	228 // octave_user_function::subsref.
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	229
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	230 if (idx.size () > 1)
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	231 retval = retval.next_subsref (auto_add, type, idx);
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	232
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	233 return retval;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	234 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	235
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	236 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4243 diff changeset	237 octave_cell::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	238 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	239 const octave_value& rhs)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	240 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	241 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	242
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	243 int n = type.length ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	244
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	245 octave_value t_rhs = rhs;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	246
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	247 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	248
9286 c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9109 diff changeset	249 if (idx.front ().empty ())
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9109 diff changeset	250 {
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9109 diff changeset	251 error ("missing index in indexed assignment");
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9109 diff changeset	252 return retval;
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9109 diff changeset	253 }
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9109 diff changeset	254
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	255 if (n > 1)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	256 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	257 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	258 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	259 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	260 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	261 if (is_empty () && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	262 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	263 // Allow conversion of empty cell array to some other
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	264 // type in cases like
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	265 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	266 // x = []; x(i).f = rhs
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	267
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	268 octave_value tmp = octave_value::empty_conv (type, rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	269
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	270 return tmp.subsasgn (type, idx, rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	271 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	272 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	273 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	274 octave_value tmp = do_index_op (idx.front (), true);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	275
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	276 if (! tmp.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	277 tmp = octave_value::empty_conv (type.substr (1), rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	278
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	279 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	280 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	281 std::list<octave_value_list> next_idx (idx);
4362 0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe] jwe parents: 4358 diff changeset	282
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	283 next_idx.erase (next_idx.begin ());
6767 a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6686 diff changeset	284
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	285 tmp.make_unique ();
6767 a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6686 diff changeset	286
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	287 t_rhs = tmp.subsasgn (type.substr (1), next_idx, rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	288 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	289 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	290 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	291 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	292
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	293 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	294 {
9106 1eb5b24186b6 fix nested cell assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	295 matrix.make_unique ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	296 Cell tmpc = matrix.index (idx.front (), true);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	297
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	298 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	299 {
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	300 std::list<octave_value_list> next_idx (idx);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	301
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	302 next_idx.erase (next_idx.begin ());
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	303
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	304 std::string next_type = type.substr (1);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	305
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8551 diff changeset	306 if (tmpc.numel () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	307 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	308 octave_value tmp = tmpc(0);
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	309 tmpc = Cell ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	310
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	311 if (! tmp.is_defined () \|\| tmp.is_zero_by_zero ())
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	312 {
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	313 tmp = octave_value::empty_conv (type.substr (1), rhs);
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	314 tmp.make_unique (); // probably a no-op.
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	315 }
8452 d6a349c7bd39 fix {} assigment if error occurs on subsequent assignment component Jaroslav Hajek <highegg@gmail.com> parents: 8446 diff changeset	316 else
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	317 // optimization: ignore the copy still stored inside our array.
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	318 tmp.make_unique (1);
4519 8e1c04e506ce [project @ 2003-09-24 17:11:46 by jwe] jwe parents: 4513 diff changeset	319
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	320 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	321 t_rhs = tmp.subsasgn (next_type, next_idx, rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	322 }
8446 7b25349b32e6 avoid redundant copying in {} assignment Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	323 else
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8551 diff changeset	324 gripe_indexed_cs_list ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	325 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	326 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	327 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	328
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	329 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	330 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	331 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	332 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	333 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	334 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	335
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	336 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	337 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	338 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	339 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	340
3940 1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe] jwe parents: 3933 diff changeset	341 if (! error_state)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	342 {
3940 1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe] jwe parents: 3933 diff changeset	343 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	344 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	345 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	346 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	347 octave_value_list i = idx.front ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	348
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	349 if (t_rhs.is_cell ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	350 octave_base_matrix<Cell>::assign (i, t_rhs.cell_value ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	351 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	352 if (t_rhs.is_null_value ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	353 octave_base_matrix<Cell>::delete_elements (i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	354 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	355 octave_base_matrix<Cell>::assign (i, Cell (t_rhs));
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	356
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	357 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	358 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	359 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	360 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	361 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	362 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	363 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	364 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	365 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	366
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	367 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	368 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	369 octave_value_list idxf = idx.front ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	370
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	371 if (t_rhs.is_cs_list ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	372 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	373 Cell tmp_cell = Cell (t_rhs.list_value ());
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5828 diff changeset	374
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	375 // Inquire the proper shape of the RHS.
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	376
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	377 dim_vector didx = dims ().redim (idxf.length ());
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	378 for (octave_idx_type k = 0; k < idxf.length (); k++)
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	379 if (! idxf(k).is_magic_colon ()) didx(k) = idxf(k).numel ();
7040 1f16da18d85d [project @ 2007-10-19 18:24:19 by jwe] jwe parents: 7017 diff changeset	380
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	381 if (didx.numel () == tmp_cell.numel ())
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	382 tmp_cell = tmp_cell.reshape (didx);
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	383
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5828 diff changeset	384
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	385 octave_base_matrix<Cell>::assign (idxf, tmp_cell);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	386 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	387 else if (idxf.all_scalars () \|\| do_index_op (idxf, true).numel () == 1)
8455 fd11a08a9b31 disallow invalid {}-indexed assigments Jaroslav Hajek <highegg@gmail.com> parents: 8452 diff changeset	388 // Regularize a null matrix if stored into a cell.
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	389 octave_base_matrix<Cell>::assign (idxf, Cell (t_rhs.storable_value ()));
8455 fd11a08a9b31 disallow invalid {}-indexed assigments Jaroslav Hajek <highegg@gmail.com> parents: 8452 diff changeset	390 else if (! error_state)
10030 83bb2a78c07d improve simple assignments error checks and messages Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	391 gripe_nonbraced_cs_list_assignment ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	392
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	393 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	394 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	395 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	396 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	397 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	398 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	399 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	400 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	401 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	402
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	403 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	404 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	405 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	406 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	407 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	408 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	409
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	410 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	411 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	412 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	413 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	414
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	415 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	416 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	417
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	418 bool
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	419 octave_cell::is_cellstr (void) const
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	420 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	421 bool retval;
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	422 if (cellstr_cache.get ())
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	423 retval = true;
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	424 else
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	425 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	426 retval = matrix.is_cellstr ();
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	427 // Allocate empty cache to mark that this is indeed a cellstr.
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	428 if (retval)
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	429 cellstr_cache.reset (new Array<std::string> ());
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	430 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	431
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	432 return retval;
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	433 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	434
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	435 void
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	436 octave_cell::assign (const octave_value_list& idx, const Cell& rhs)
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	437 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	438 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	439 octave_base_matrix<Cell>::assign (idx, rhs);
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	440 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	441
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	442 void
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	443 octave_cell::assign (const octave_value_list& idx, const octave_value& rhs)
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	444 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	445 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	446 octave_base_matrix<Cell>::assign (idx, rhs);
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	447 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	448
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	449
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	450 void
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	451 octave_cell::delete_elements (const octave_value_list& idx)
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	452 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	453 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	454 octave_base_matrix<Cell>::delete_elements (idx);
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	455 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	456
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	457 size_t
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	458 octave_cell::byte_size (void) const
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	459 {
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	460 size_t retval = 0;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	461
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	462 for (octave_idx_type i = 0; i < numel (); i++)
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	463 retval += matrix(i).byte_size ();
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	464
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	465 return retval;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	466 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	467
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	468 octave_value
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	469 octave_cell::sort (octave_idx_type dim, sortmode mode) const
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	470 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	471 octave_value retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	472
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	473 if (is_cellstr ())
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	474 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	475 Array<std::string> tmp = cellstr_value ();
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	476
8824 76ddf0ab985d auto-set cellstr cache when sorting cells Jaroslav Hajek <highegg@gmail.com> parents: 8823 diff changeset	477 tmp = tmp.sort (dim, mode);
76ddf0ab985d auto-set cellstr cache when sorting cells Jaroslav Hajek <highegg@gmail.com> parents: 8823 diff changeset	478
8825 c3445f1c8cb4 reuse cellstr cache in strcmp Jaroslav Hajek <highegg@gmail.com> parents: 8824 diff changeset	479 // We already have the cache.
c3445f1c8cb4 reuse cellstr cache in strcmp Jaroslav Hajek <highegg@gmail.com> parents: 8824 diff changeset	480 retval = new octave_cell (tmp);
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	481 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	482 else
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	483 error ("sort: only cell arrays of character strings may be sorted");
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	484
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	485 return retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	486 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	487
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	488 octave_value
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	489 octave_cell::sort (Array<octave_idx_type> &sidx, octave_idx_type dim,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	490 sortmode mode) const
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	491 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	492 octave_value retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	493
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	494 if (is_cellstr ())
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	495 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	496 Array<std::string> tmp = cellstr_value ();
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	497
8824 76ddf0ab985d auto-set cellstr cache when sorting cells Jaroslav Hajek <highegg@gmail.com> parents: 8823 diff changeset	498 tmp = tmp.sort (sidx, dim, mode);
76ddf0ab985d auto-set cellstr cache when sorting cells Jaroslav Hajek <highegg@gmail.com> parents: 8823 diff changeset	499
9338 650c7efa7234 simplify octave_cell::sort Jaroslav Hajek <highegg@gmail.com> parents: 9286 diff changeset	500 // We already have the cache.
650c7efa7234 simplify octave_cell::sort Jaroslav Hajek <highegg@gmail.com> parents: 9286 diff changeset	501 retval = new octave_cell (tmp);
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	502 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	503 else
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	504 error ("sort: only cell arrays of character strings may be sorted");
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	505
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	506 return retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	507 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	508
8823 3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	509 sortmode
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	510 octave_cell::is_sorted (sortmode mode) const
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	511 {
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	512 sortmode retval = UNSORTED;
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	513
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	514 if (is_cellstr ())
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	515 {
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	516 Array<std::string> tmp = cellstr_value ();
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	517
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	518 retval = tmp.is_sorted (mode);
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	519 }
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	520 else
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	521 error ("issorted: not a cell array of strings");
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	522
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	523 return retval;
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	524 }
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	525
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	526
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	527 Array<octave_idx_type>
8733 3ef774603887 rename all uses of sortrows_idx to sort_rows_idx John W. Eaton <jwe@octave.org> parents: 8732 diff changeset	528 octave_cell::sort_rows_idx (sortmode mode) const
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	529 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	530 Array<octave_idx_type> retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	531
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	532 if (is_cellstr ())
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	533 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	534 Array<std::string> tmp = cellstr_value ();
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	535
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	536 retval = tmp.sort_rows_idx (mode);
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	537 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	538 else
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	539 error ("sortrows: only cell arrays of character strings may be sorted");
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	540
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	541 return retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	542 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	543
8823 3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	544 sortmode
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	545 octave_cell::is_sorted_rows (sortmode mode) const
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	546 {
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	547 sortmode retval = UNSORTED;
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	548
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	549 if (is_cellstr ())
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	550 {
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	551 Array<std::string> tmp = cellstr_value ();
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	552
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	553 retval = tmp.is_sorted_rows (mode);
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	554 }
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	555 else
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	556 error ("issorted: not a cell array of strings");
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	557
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	558 return retval;
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	559 }
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	560
8626 1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	561 bool
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	562 octave_cell::is_true (void) const
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	563 {
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	564 error ("invalid conversion from cell array to logical value");
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	565 return false;
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	566 }
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	567
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	568 octave_value_list
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	569 octave_cell::list_value (void) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	570 {
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	571 return octave_value_list (matrix);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	572 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	573
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	574 string_vector
5715 edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe] jwe parents: 5707 diff changeset	575 octave_cell::all_strings (bool pad) const
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	576 {
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	577 string_vector retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	578
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	579 octave_idx_type nel = numel ();
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	580
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	581 int n_elts = 0;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	582
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	583 octave_idx_type max_len = 0;
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	584
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	585 std::queue<string_vector> strvec_queue;
4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	586
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	587 for (octave_idx_type i = 0; i < nel; i++)
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	588 {
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	589 string_vector s = matrix(i).all_strings ();
c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	590
c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	591 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	592 return retval;
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	593
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	594 octave_idx_type s_len = s.length ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	595
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	596 n_elts += s_len ? s_len : 1;
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	597
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	598 octave_idx_type s_max_len = s.max_length ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	599
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	600 if (s_max_len > max_len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	601 max_len = s_max_len;
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	602
4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	603 strvec_queue.push (s);
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	604 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	605
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	606 retval = string_vector (n_elts);
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	607
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	608 octave_idx_type k = 0;
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	609
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	610 for (octave_idx_type i = 0; i < nel; i++)
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	611 {
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	612 const string_vector s = strvec_queue.front ();
4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	613 strvec_queue.pop ();
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	614
c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	615 octave_idx_type s_len = s.length ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	616
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	617 if (s_len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	618 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	619 for (octave_idx_type j = 0; j < s_len; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	620 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	621 std::string t = s[j];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	622 int t_len = t.length ();
5715 edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe] jwe parents: 5707 diff changeset	623
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	624 if (pad && max_len > t_len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	625 t += std::string (max_len - t_len, ' ');
5715 edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe] jwe parents: 5707 diff changeset	626
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	627 retval[k++] = t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	628 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	629 }
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	630 else if (pad)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	631 retval[k++] = std::string (max_len, ' ');
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	632 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	633 retval[k++] = std::string ();
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	634 }
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	635
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	636 return retval;
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	637 }
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	638
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	639 Array<std::string>
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	640 octave_cell::cellstr_value (void) const
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	641 {
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	642 Array<std::string> retval;
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	643
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	644 if (is_cellstr ())
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	645 {
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	646 if (cellstr_cache->is_empty ())
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	647 *cellstr_cache = matrix.cellstr_value ();
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	648
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	649 return *cellstr_cache;
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	650 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	651 else
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	652 error ("invalid conversion from cell array to array of strings");
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	653
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	654 return retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	655 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	656
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	657 bool
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	658 octave_cell::print_as_scalar (void) const
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	659 {
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	660 return (ndims () > 2 \|\| numel () == 0);
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	661 }
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	662
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	663 void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	664 octave_cell::print (std::ostream& os, bool) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	665 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	666 print_raw (os);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	667 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	668
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	669 void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	670 octave_cell::print_raw (std::ostream& os, bool) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	671 {
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4582 diff changeset	672 int nd = matrix.ndims ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	673
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4582 diff changeset	674 if (nd == 2)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	675 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	676 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	677 octave_idx_type nc = columns ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	678
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	679 if (nr > 0 && nc > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	680 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	681 indent (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	682 os << "{";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	683 newline (os);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	684
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	685 increment_indent_level ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	686
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	687 for (octave_idx_type j = 0; j < nc; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	688 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	689 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	690 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	691 octave_quit ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	692
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	693 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	694 buf << "[" << i+1 << "," << j+1 << "]";
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	695
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	696 octave_value val = matrix(i,j);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	697
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	698 val.print_with_name (os, buf.str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	699 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	700 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	701
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	702 decrement_indent_level ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	703
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	704 indent (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	705 os << "}";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	706 newline (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	707 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	708 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	709 {
9781 ea88eece12f5 fix printing of empty cells Jaroslav Hajek <highegg@gmail.com> parents: 9370 diff changeset	710 indent (os);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	711 os << "{}";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	712 if (Vprint_empty_dimensions)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	713 os << "(" << nr << "x" << nc << ")";
9781 ea88eece12f5 fix printing of empty cells Jaroslav Hajek <highegg@gmail.com> parents: 9370 diff changeset	714 newline (os);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	715 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	716 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	717 else
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	718 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	719 indent (os);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	720 dim_vector dv = matrix.dims ();
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4582 diff changeset	721 os << "{" << dv.str () << " Cell Array}";
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	722 newline (os);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	723 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	724 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	725
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	726 #define CELL_ELT_TAG "<cell-element>"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	727
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	728 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6833 diff changeset	729 octave_cell::save_ascii (std::ostream& os)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	730 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	731 dim_vector d = dims ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	732 if (d.length () > 2)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	733 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	734 os << "# ndims: " << d.length () << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	735
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	736 for (int i = 0; i < d.length (); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	737 os << " " << d (i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	738 os << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	739
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	740 Cell tmp = cell_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	741
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	742 for (octave_idx_type i = 0; i < d.numel (); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	743 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	744 octave_value o_val = tmp.elem (i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	745
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	746 // Recurse to print sub-value.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	747 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	748
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	749 if (! b)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	750 return os;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	751 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	752 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	753 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	754 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	755 // Keep this case, rather than use generic code above for backward
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	756 // compatiability. Makes load_ascii much more complex!!
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	757 os << "# rows: " << rows () << "\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	758 << "# columns: " << columns () << "\n";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	759
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	760 Cell tmp = cell_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	761
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	762 for (octave_idx_type j = 0; j < tmp.cols (); j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	763 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	764 for (octave_idx_type i = 0; i < tmp.rows (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	765 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	766 octave_value o_val = tmp.elem (i, j);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	767
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	768 // Recurse to print sub-value.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	769 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	770
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	771 if (! b)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	772 return os;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	773 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	774
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	775 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	776 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	777 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	778
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	779 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	780 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	781
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	782 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	783 octave_cell::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	784 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	785 bool success = true;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	786
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	787 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	788
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	789 string_vector keywords(2);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	790
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	791 keywords[0] = "ndims";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	792 keywords[1] = "rows";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	793
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	794 std::string kw;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	795 octave_idx_type val = 0;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	796
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	797 if (extract_keyword (is, keywords, kw, val, true))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	798 {
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	799 if (kw == "ndims")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	800 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	801 int mdims = static_cast<int> (val);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	802
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	803 if (mdims >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	804 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	805 dim_vector dv;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	806 dv.resize (mdims);
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	807
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	808 for (int i = 0; i < mdims; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	809 is >> dv(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	810
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	811 Cell tmp(dv);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	812
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	813 for (octave_idx_type i = 0; i < dv.numel (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	814 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	815 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	816 bool dummy;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	817
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	818 // recurse to read cell elements
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	819 std::string nm = read_ascii_data (is, std::string (),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	820 dummy, t2, i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	821
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	822 if (nm == CELL_ELT_TAG)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	823 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	824 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	825 tmp.elem (i) = t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	826 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	827 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	828 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	829 error ("load: cell array element had unexpected name");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	830 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	831 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	832 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	833 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	834
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	835 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	836 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	837 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	838 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	839 error ("load: failed to load matrix constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	840 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	841 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	842 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	843 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	844 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	845 error ("load: failed to extract number of rows and columns");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	846 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	847 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	848 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	849 else if (kw == "rows")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	850 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	851 octave_idx_type nr = val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	852 octave_idx_type nc = 0;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	853
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	854 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	855 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	856 if (nr > 0 && nc > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	857 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	858 Cell tmp (nr, nc);
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	859
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	860 for (octave_idx_type j = 0; j < nc; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	861 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	862 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	863 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	864 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	865 bool dummy;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	866
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	867 // recurse to read cell elements
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	868 std::string nm = read_ascii_data (is, std::string (),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	869 dummy, t2, i);
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	870
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	871 if (nm == CELL_ELT_TAG)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	872 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	873 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	874 tmp.elem (i, j) = t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	875 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	876 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	877 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	878 error ("load: cell array element had unexpected name");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	879 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	880 goto cell_read_error;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	881 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	882 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	883 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	884
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	885 cell_read_error:
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	886
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	887 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	888 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	889 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	890 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	891 error ("load: failed to load cell element");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	892 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	893 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	894 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	895 else if (nr == 0 \|\| nc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	896 matrix = Cell (nr, nc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	897 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	898 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	899 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	900 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	901 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	902 error ("load: failed to extract number of rows and columns for cell array");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	903 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	904 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	905 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	906 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	907 panic_impossible ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	908 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	909 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	910 {
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	911 error ("load: failed to extract number of rows and columns");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	912 success = false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	913 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	914
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	915 return success;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	916 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	917
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	918 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	919 octave_cell::save_binary (std::ostream& os, bool& save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	920 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	921 dim_vector d = dims ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	922 if (d.length () < 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	923 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	924
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	925 // Use negative value for ndims
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	926 int32_t di = - d.length();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	927 os.write (reinterpret_cast<char *> (&di), 4);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	928 for (int i = 0; i < d.length (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	929 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	930 di = d(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	931 os.write (reinterpret_cast<char *> (&di), 4);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	932 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	933
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	934 Cell tmp = cell_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	935
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	936 for (octave_idx_type i = 0; i < d.numel (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	937 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	938 octave_value o_val = tmp.elem (i);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	939
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	940 // Recurse to print sub-value.
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	941 bool b = save_binary_data (os, o_val, CELL_ELT_TAG, "", 0,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	942 save_as_floats);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	943
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	944 if (! b)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	945 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	946 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	947
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	948 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	949 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	950
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	951 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	952 octave_cell::load_binary (std::istream& is, bool swap,
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	953 oct_mach_info::float_format fmt)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	954 {
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	955 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	956
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	957 bool success = true;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	958 int32_t mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	959 if (! is.read (reinterpret_cast<char *> (&mdims), 4))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	960 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	961 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4941 diff changeset	962 swap_bytes<4> (&mdims);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	963 if (mdims >= 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	964 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	965
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	966 mdims = -mdims;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	967 int32_t di;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	968 dim_vector dv;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	969 dv.resize (mdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	970
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	971 for (int i = 0; i < mdims; i++)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	972 {
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	973 if (! is.read (reinterpret_cast<char *> (&di), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	974 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	975 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	976 swap_bytes<4> (&di);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	977 dv(i) = di;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	978 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	979
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	980 // Convert an array with a single dimension to be a row vector.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	981 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	982 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	983
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	984 if (mdims == 1)
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	985 {
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	986 mdims = 2;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	987 dv.resize (mdims);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	988 dv(1) = dv(0);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	989 dv(0) = 1;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	990 }
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	991
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	992 octave_idx_type nel = dv.numel ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	993 Cell tmp(dv);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	994
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	995 for (octave_idx_type i = 0; i < nel; i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	996 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	997 octave_value t2;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	998 bool dummy;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	999 std::string doc;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1000
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1001 // recurse to read cell elements
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1002 std::string nm = read_binary_data (is, swap, fmt, std::string (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1003 dummy, t2, doc);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1004
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1005 if (nm == CELL_ELT_TAG)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1006 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1007 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1008 tmp.elem (i) = t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1009 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1010 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1011 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1012 error ("load: cell array element had unexpected name");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1013 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1014 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1015 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1016 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1017
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1018 if (is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1019 matrix = tmp;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1020 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1021 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1022 error ("load: failed to load matrix constant");
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1023 success = false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1024 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1025
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1026 return success;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1027 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1028
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1029 void *
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1030 octave_cell::mex_get_data (void) const
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1031 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1032 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1033 return matrix.mex_get_data ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1034 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1035
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1036 #if defined (HAVE_HDF5)
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1037
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1038 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1039 octave_cell::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1040 {
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1041 dim_vector dv = dims ();
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1042 int empty = save_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1043 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1044 return (empty > 0);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1045
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1046 hsize_t rank = dv.length ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1047 hid_t space_hid = -1, data_hid = -1, size_hid = -1;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1048
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1049 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1050 data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1051 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1052 data_hid = H5Gcreate (loc_id, name, 0);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1053 #endif
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1054
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1055 if (data_hid < 0)
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1056 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1057
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1058 // Have to save cell array shape, since can't have a
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1059 // dataset of groups....
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1060
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1061 space_hid = H5Screate_simple (1, &rank, 0);
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1062
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1063 if (space_hid < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1064 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1065 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1066 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1067 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1068
5351 05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman] dbateman parents: 5307 diff changeset	1069 OCTAVE_LOCAL_BUFFER (octave_idx_type, hdims, rank);
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1070
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1071 // Octave uses column-major, while HDF5 uses row-major ordering
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4837 diff changeset	1072 for (hsize_t i = 0; i < rank; i++)
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1073 hdims[i] = dv(rank-i-1);
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1074
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1075 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1076 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1077 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1078 #else
5351 05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman] dbateman parents: 5307 diff changeset	1079 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1080 H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1081 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1082 if (size_hid < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1083 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1084 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1085 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1086 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1087 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1088
6276 d26c558691cd [project @ 2007-02-07 09:01:24 by jwe] jwe parents: 6116 diff changeset	1089 if (H5Dwrite (size_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1090 H5P_DEFAULT, hdims) < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1091 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1092 H5Dclose (size_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1093 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1094 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1095 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1096 }
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1097
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1098 H5Dclose (size_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1099 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1100
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1101 // Recursively add each element of the cell to this group.
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1102
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1103 Cell tmp = cell_value ();
5850 426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1104
426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1105 octave_idx_type nel = dv.numel ();
426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1106
426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1107 for (octave_idx_type i = 0; i < nel; i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1108 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	1109 std::ostringstream buf;
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7285 diff changeset	1110 int digits = static_cast<int> (::floor (::log10 (static_cast<double> (nel)) + 1.0));
5850 426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1111 buf << "_" << std::setw (digits) << std::setfill ('0') << i;
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	1112 std::string s = buf.str ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1113
5850 426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1114 if (! add_hdf5_data (data_hid, tmp.elem (i), s.c_str (), "", false,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1115 save_as_floats))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1116 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1117 H5Gclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1118 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1119 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1120 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1121
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1122 H5Gclose (data_hid);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1123
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1124 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1125 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1126
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1127 bool
9881 b3089dba88bf Remove HDF5 cruft for older versions of HDF5 Kacper Kowalik parents: 9813 diff changeset	1128 octave_cell::load_hdf5 (hid_t loc_id, const char *name)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1129 {
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1130 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1131
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1132 bool retval = false;
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1133
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1134 dim_vector dv;
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1135 int empty = load_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1136 if (empty > 0)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1137 matrix.resize(dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1138 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1139 return (empty > 0);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1140
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1141 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1142 hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1143 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1144 hid_t group_id = H5Gopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1145 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1146
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1147 if (group_id < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1148 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1149
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1150 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1151 hid_t data_hid = H5Dopen (group_id, "dims", H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1152 #else
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1153 hid_t data_hid = H5Dopen (group_id, "dims");
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1154 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1155 hid_t space_hid = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1156 hsize_t rank = H5Sget_simple_extent_ndims (space_hid);
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1157 if (rank != 1)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1158 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1159 H5Dclose (data_hid);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1160 H5Gclose (group_id);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1161 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1162 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1163
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1164 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1165 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1166
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1167 H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1168
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1169 // Octave uses column-major, while HDF5 uses row-major ordering.
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1170
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1171 dv.resize (hdims[0]);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1172
5351 05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman] dbateman parents: 5307 diff changeset	1173 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]);
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1174
5351 05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman] dbateman parents: 5307 diff changeset	1175 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1176 H5P_DEFAULT, tmp) < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1177 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1178 H5Dclose (data_hid);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1179 H5Gclose (group_id);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1180 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1181 }
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1182
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1183 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1184 H5Gclose (group_id);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1185
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1186 for (hsize_t i = 0, j = hdims[0] - 1; i < hdims[0]; i++, j--)
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1187 dv(j) = tmp[i];
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1188
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1189 hdf5_callback_data dsub;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1190
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1191 herr_t retval2 = -1;
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1192
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1193 Cell m (dv);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1194
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1195 int current_item = 0;
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1196
4696 fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe] jwe parents: 4687 diff changeset	1197 hsize_t num_obj = 0;
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1198 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1199 group_id = H5Gopen (loc_id, name, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1200 #else
5060 34a904ac130d [project @ 2004-11-02 03:08:10 by jwe] jwe parents: 4994 diff changeset	1201 group_id = H5Gopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1202 #endif
5060 34a904ac130d [project @ 2004-11-02 03:08:10 by jwe] jwe parents: 4994 diff changeset	1203 H5Gget_num_objs (group_id, &num_obj);
34a904ac130d [project @ 2004-11-02 03:08:10 by jwe] jwe parents: 4994 diff changeset	1204 H5Gclose (group_id);
4696 fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe] jwe parents: 4687 diff changeset	1205
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	1206 for (octave_idx_type i = 0; i < dv.numel (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1207 {
4696 fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe] jwe parents: 4687 diff changeset	1208
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1209 if (current_item >= static_cast<int> (num_obj))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1210 retval2 = -1;
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1211 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1212 retval2 = H5Giterate (loc_id, name, &current_item,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1213 hdf5_read_next_data, &dsub);
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1214
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1215 if (retval2 <= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1216 break;
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1217
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1218 octave_value ov = dsub.tc;
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1219 m.elem (i) = ov;
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1220
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1221 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1222
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1223 if (retval2 >= 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1224 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1225 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1226 retval = true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1227 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1228
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1229 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1230 }
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1231
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1232 #endif
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1233
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1234 DEFUN (iscell, args, ,
3448 0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1235 "-- texinfo --\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1236 @deftypefn {Built-in Function} {} iscell (@var{x})\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1237 Return true if @var{x} is a cell array object. Otherwise, return\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1238 false.\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1239 @end deftypefn")
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1240 {
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1241 octave_value retval;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1242
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1243 if (args.length () == 1)
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1244 retval = args(0).is_cell ();
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1245 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5805 diff changeset	1246 print_usage ();
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1247
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1248 return retval;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1249 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1250
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1251 DEFUN (cell, args, ,
3448 0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1252 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10772 diff changeset	1253 @deftypefn {Built-in Function} {} cell (@var{x})\n\
3448 0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1254 @deftypefnx {Built-in Function} {} cell (@var{n}, @var{m})\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1255 Create a new cell array object. If invoked with a single scalar\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1256 argument, @code{cell} returns a square cell array with the dimension\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1257 specified. If you supply two scalar arguments, @code{cell} takes\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1258 them to be the number of rows and columns. If given a vector with two\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1259 elements, @code{cell} uses the values of the elements as the number of\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1260 rows and columns, respectively.\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe] jwe parents: 3354 diff changeset	1261 @end deftypefn")
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1262 {
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1263 octave_value retval;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1264
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1265 int nargin = args.length ();
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1266
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1267 dim_vector dims;
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1268
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1269 switch (nargin)
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1270 {
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1271 case 0:
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1272 dims = dim_vector (0, 0);
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1273 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1274
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1275 case 1:
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1276 get_dimensions (args(0), "cell", dims);
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1277 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1278
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1279 default:
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1280 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1281 dims.resize (nargin);
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1282
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1283 for (int i = 0; i < nargin; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1284 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1285 dims(i) = args(i).is_empty () ? 0 : args(i).nint_value ();
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1286
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1287 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1288 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1289 error ("cell: expecting scalar arguments");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1290 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1291 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1292 }
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1293 }
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1294 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1295 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1296
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1297 if (! error_state)
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1298 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	1299 dims.chop_trailing_singletons ();
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1300
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1301 check_dimensions (dims, "cell");
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1302
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1303 if (! error_state)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	1304 retval = Cell (dims, Matrix ());
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1305 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1306
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1307 return retval;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1308 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1309
4610 02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1310 DEFUN (iscellstr, args, ,
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1311 "-- texinfo --\n\
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1312 @deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1313 Return true if every element of the cell array @var{cell} is a\n\
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1314 character string\n\
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1315 @end deftypefn")
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1316 {
4699 5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4696 diff changeset	1317 octave_value retval;
4610 02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1318
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1319 if (args.length () == 1)
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5992 diff changeset	1320 retval = args(0).is_cellstr ();
4610 02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1321 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5805 diff changeset	1322 print_usage ();
4610 02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1323
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1324 return retval;
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1325 }
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1326
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1327 // Note that since Fcellstr calls Fiscellstr, we need to have
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1328 // Fiscellstr defined first (to provide a declaration) and also we
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1329 // should keep it in the same file (so we don't have to provide a
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1330 // declaration) and so we don't have to use feval to call it.
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1331
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1332 DEFUN (cellstr, args, ,
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1333 "-- texinfo --\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1334 @deftypefn {Built-in Function} {} cellstr (@var{string})\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1335 Create a new cell array object from the elements of the string\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1336 array @var{string}.\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1337 @end deftypefn")
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1338 {
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1339 octave_value retval;
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1340
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1341 if (args.length () == 1)
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1342 {
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1343 octave_value_list tmp = Fiscellstr (args, 1);
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1344
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1345 if (tmp(0).is_true ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1346 retval = args(0);
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1347 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1348 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1349 string_vector s = args(0).all_strings ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1350
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1351 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1352 retval = (s.is_empty ()
7813 12a68443191c [mq]: cellstr Jaroslav Hajek <highegg@gmail.com> parents: 7760 diff changeset	1353 ? Cell (octave_value (std::string ()))
12a68443191c [mq]: cellstr Jaroslav Hajek <highegg@gmail.com> parents: 7760 diff changeset	1354 : Cell (s, true));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1355 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1356 error ("cellstr: expecting argument to be a 2-d character array");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1357 }
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1358 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1359 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5805 diff changeset	1360 print_usage ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1361
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1362 return retval;
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1363 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1364
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1365 DEFUN (struct2cell, args, ,
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1366 "-- texinfo --\n\
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1367 @deftypefn {Built-in Function} {} struct2cell (@var{S})\n\
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1368 Create a new cell array from the objects stored in the struct object.\n\
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1369 If @var{f} is the number of fields in the structure, the resulting\n\
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1370 cell array will have a dimension vector corresponding to\n\
10711 fbd7843974fa Periodic grammar check of documentation files to ensure common format. Rik <octave@nomad.inbox5.com> parents: 10670 diff changeset	1371 @code{[@var{F} size(@var{S})]}. For example:\n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1372 \n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1373 @example\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1374 @group\n\
10600 036bdc2d0af0 Wrap documentation line to prevent overfull hbox LaTex warning Rik <octave@nomad.inbox5.com> parents: 10521 diff changeset	1375 s = struct('name', @{'Peter', 'Hannah', 'Robert'@},\n\
036bdc2d0af0 Wrap documentation line to prevent overfull hbox LaTex warning Rik <octave@nomad.inbox5.com> parents: 10521 diff changeset	1376 'age', @{23, 16, 3@});\n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1377 c = struct2cell(s)\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1378 @result{} c = @{1x1x3 Cell Array@}\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1379 c(1,1,:)(:)\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1380 @result{} ans =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1381 @{\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1382 [1,1] = Peter\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1383 [2,1] = Hannah\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1384 [3,1] = Robert\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1385 @}\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1386 c(2,1,:)(:)\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1387 @result{} ans =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1388 @{\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1389 [1,1] = 23\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1390 [2,1] = 16\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1391 [3,1] = 3\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1392 @}\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1393 @end group\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1394 @end example\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1395 \n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5360 diff changeset	1396 @seealso{cell2struct, fieldnames}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5360 diff changeset	1397 @end deftypefn")
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1398 {
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1399 octave_value retval;
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1400
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1401 int nargin = args.length ();
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1402
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1403 if (nargin == 1)
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1404 {
10772 687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1405 const octave_map m = args(0).map_value ();
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1406
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1407 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1408 {
10772 687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1409 const dim_vector m_dv = m.dims ();
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1410
10772 687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1411 octave_idx_type num_fields = m.nfields ();
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1412
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1413 // The resulting dim_vector should have dimensions:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1414 // [numel(fields) size(struct)]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1415 // except if the struct is a column vector.
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1416
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1417 dim_vector result_dv;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1418 if (m_dv (m_dv.length () - 1) == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1419 result_dv.resize (m_dv.length ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1420 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1421 result_dv.resize (m_dv.length () + 1); // Add 1 for the fields.
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1422
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1423 result_dv(0) = num_fields;
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1424
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1425 for (int i = 1; i < result_dv.length (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1426 result_dv(i) = m_dv(i-1);
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1427
10772 687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1428 NoAlias<Cell> c (result_dv);
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1429
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1430 octave_idx_type n_elts = m.numel ();
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1431
10772 687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1432 // Fill c in one sweep. Note that thanks to octave_map structure,
687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1433 // we don't need a key lookup at all.
687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1434 for (octave_idx_type j = 0; j < n_elts; j++)
687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1435 for (octave_idx_type i = 0; i < num_fields; i++)
687586b99f9d improve struct2cell Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1436 c(i,j) = m.contents(i)(j);
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1437
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1438 retval = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1439 }
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1440 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1441 error ("struct2cell: expecting argument to be a cell array");
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1442 }
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1443 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5805 diff changeset	1444 print_usage ();
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1445
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1446 return retval;
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1447 }
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1448
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1449 /*
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1450 %!test
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1451 %! keys = cellstr (char (floor (rand (11,10)*24+65)))';
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1452 %! vals = cellfun(@(x) mat2cell(rand (19,1), ones (19,1), 1), ...
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1453 %! mat2cell([1:11]', ones(11,1), 1), "uniformoutput", false)';
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1454 %! s = struct ([keys; vals]{:});
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1455 %! t = cell2struct ([vals{:}], keys, 2);
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1456 %! assert (s, t);
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1457 %! assert (struct2cell (s), [vals{:}]');
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1458 %! assert (fieldnames (s), keys');
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1459 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1460
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1461 mxArray *
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1462 octave_cell::as_mxArray (void) const
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1463 {
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1464 mxArray *retval = new mxArray (dims ());
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1465
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1466 mxArray elts = static_cast<mxArray > (retval->get_data ());
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1467
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 6276 diff changeset	1468 mwSize nel = numel ();
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1469
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1470 const octave_value *p = matrix.data ();
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1471
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 6276 diff changeset	1472 for (mwIndex i = 0; i < nel; i++)
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1473 elts[i] = new mxArray (p[i]);
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1474
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1475 return retval;
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1476 }
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1477
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1478 octave_value
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1479 octave_cell::map (unary_mapper_t umap) const
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1480 {
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1481 switch (umap)
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1482 {
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1483 #define FORWARD_MAPPER(UMAP) \
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1484 case umap_ ## UMAP: \
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1485 return matrix.UMAP ()
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1486 FORWARD_MAPPER (xisalnum);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1487 FORWARD_MAPPER (xisalpha);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1488 FORWARD_MAPPER (xisascii);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1489 FORWARD_MAPPER (xiscntrl);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1490 FORWARD_MAPPER (xisdigit);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1491 FORWARD_MAPPER (xisgraph);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1492 FORWARD_MAPPER (xislower);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1493 FORWARD_MAPPER (xisprint);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1494 FORWARD_MAPPER (xispunct);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1495 FORWARD_MAPPER (xisspace);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1496 FORWARD_MAPPER (xisupper);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1497 FORWARD_MAPPER (xisxdigit);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1498 FORWARD_MAPPER (xtoascii);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1499 FORWARD_MAPPER (xtolower);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1500 FORWARD_MAPPER (xtoupper);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1501
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1502 default:
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1503 return octave_base_value::map (umap);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1504 }
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1505 }

Mercurial > octave-nkf

annotate src/ov-cell.cc @ 10840:89f4d7e294cc