octave-nkf: src/Cell.cc annotate

annotate src/Cell.cc @ 14626:f947d2922feb stable rc-3-6-2-0

3.6.2-rc0 release candidate * configure.ac (AC_INIT): Version is now 3.6.2-rc0. (OCTAVE_RELEASE_DATE): Now 2012-05-11.

author	John W. Eaton <jwe@octave.org>
date	Fri, 11 May 2012 13:46:18 -0400
parents	72c96de7a403
children	e8e86ae3abbc

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
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	3 Copyright (C) 1999-2012 John W. Eaton
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11037 diff changeset	4 Copyright (C) 2009-2010 VZLU Prague
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	5
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	7
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	8 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	9 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: 6116 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6116 diff changeset	11 option) any later version.
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	12
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	13 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	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	15 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	16 for more details.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	17
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	18 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: 6116 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6116 diff changeset	20 <http://www.gnu.org/licenses/>.
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	21
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 #ifdef HAVE_CONFIG_H
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	25 #include <config.h>
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	26 #endif
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	27
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	28 #include "idx-vector.h"
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	29
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	30 #include "Cell.h"
4919 a1073eef650c [project @ 2004-07-27 15:22:50 by jwe] jwe parents: 4915 diff changeset	31 #include "error.h"
5602 dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5570 diff changeset	32 #include "gripes.h"
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	33 #include "oct-obj.h"
7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	34
7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	35 Cell::Cell (const octave_value_list& ovl)
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9415 diff changeset	36 : Array<octave_value> (ovl.cell_value ())
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	37 {
7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	38 }
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	39
5805 5bfb24f90bdd [project @ 2006-05-10 21:15:37 by jwe] jwe parents: 5602 diff changeset	40 Cell::Cell (const string_vector& sv, bool trim)
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9415 diff changeset	41 : Array<octave_value> ()
4216 e613ffa9f0e6 [project @ 2002-12-04 17:37:09 by jwe] jwe parents: 4192 diff changeset	42 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	43 octave_idx_type n = sv.length ();
4216 e613ffa9f0e6 [project @ 2002-12-04 17:37:09 by jwe] jwe parents: 4192 diff changeset	44
e613ffa9f0e6 [project @ 2002-12-04 17:37:09 by jwe] jwe parents: 4192 diff changeset	45 if (n > 0)
e613ffa9f0e6 [project @ 2002-12-04 17:37:09 by jwe] jwe parents: 4192 diff changeset	46 {
4625 87c01a296263 [project @ 2003-11-15 12:51:20 by jwe] jwe parents: 4587 diff changeset	47 resize (dim_vector (n, 1));
4216 e613ffa9f0e6 [project @ 2002-12-04 17:37:09 by jwe] jwe parents: 4192 diff changeset	48
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	49 for (octave_idx_type i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	50 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	51 std::string s = sv[i];
5805 5bfb24f90bdd [project @ 2006-05-10 21:15:37 by jwe] jwe parents: 5602 diff changeset	52
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	53 if (trim)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	54 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	55 size_t pos = s.find_last_not_of (' ');
5805 5bfb24f90bdd [project @ 2006-05-10 21:15:37 by jwe] jwe parents: 5602 diff changeset	56
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	57 s = (pos == std::string::npos) ? "" : s.substr (0, pos+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	58 }
5805 5bfb24f90bdd [project @ 2006-05-10 21:15:37 by jwe] jwe parents: 5602 diff changeset	59
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	60 elem(i,0) = s;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	61 }
4216 e613ffa9f0e6 [project @ 2002-12-04 17:37:09 by jwe] jwe parents: 4192 diff changeset	62 }
e613ffa9f0e6 [project @ 2002-12-04 17:37:09 by jwe] jwe parents: 4192 diff changeset	63 }
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	64
11037 e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	65 Cell::Cell (const std::list<std::string>& lst)
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	66 : Array<octave_value> ()
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	67 {
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	68 size_t n = lst.size ();
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	69
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	70 if (n > 0)
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	71 {
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	72 resize (dim_vector (n, 1));
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	73
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	74 octave_idx_type i = 0;
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	75
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	76 for (std::list<std::string>::const_iterator it = lst.begin ();
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	77 it != lst.end (); it++)
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	78 {
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	79 elem(i++,0) = *it;
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	80 }
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	81 }
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	82 }
e7864673c31f new Cell (std::list<std::string>&) constructor John W. Eaton <jwe@octave.org> parents: 10649 diff changeset	83
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	84 Cell::Cell (const Array<std::string>& sa)
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9415 diff changeset	85 : Array<octave_value> (sa.dims ())
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	86 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	87 octave_idx_type n = sa.numel ();
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	88
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	89 octave_value *dst = fortran_vec ();
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	90 const std::string *src = sa.data ();
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	91
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	92 for (octave_idx_type i = 0; i < n; i++)
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	93 dst[i] = src[i];
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	94 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	95
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	96 // Set size to DV, filling with []. Then fill with as many elements of
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	97 // SV as possible.
7209 f06b8150fe56 [project @ 2007-11-28 05:46:58 by jwe] jwe parents: 7017 diff changeset	98
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	99 Cell::Cell (const dim_vector& dv, const string_vector& sv, bool trim)
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9415 diff changeset	100 : Array<octave_value> (dv, resize_fill_value ())
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	101 {
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	102 octave_idx_type n = sv.length ();
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	103
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	104 if (n > 0)
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	105 {
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	106 octave_idx_type m = numel ();
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	107
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	108 octave_idx_type len = n > m ? m : n;
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	109
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	110 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	111 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	112 std::string s = sv[i];
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	113
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	114 if (trim)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	115 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	116 size_t pos = s.find_last_not_of (' ');
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	117
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	118 s = (pos == std::string::npos) ? "" : s.substr (0, pos+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	119 }
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	120
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	121 elem(i) = s;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	122 }
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	123 }
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	124 }
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	125
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	126 bool
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	127 Cell::is_cellstr (void) const
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	128 {
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	129 bool retval = true;
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	130
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	131 octave_idx_type n = numel ();
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	132
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	133 for (octave_idx_type i = 0; i < n; i++)
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	134 {
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	135 if (! elem(i).is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	136 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	137 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	138 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	139 }
6116 b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	140 }
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	141
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	142 return retval;
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	143 }
b64fb24bf4a0 [project @ 2006-10-27 18:04:49 by jwe] jwe parents: 5814 diff changeset	144
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	145 Array<std::string>
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	146 Cell::cellstr_value (void) const
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	147 {
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	148 Array<std::string> retval (dims ());
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	149
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	150 octave_idx_type n = numel ();
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	151
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	152 for (octave_idx_type i = 0; i < n; i++)
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	153 retval.xelem (i) = elem (i).string_value ();
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	154
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	155 return retval;
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	156 }
64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	157
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	158 Cell
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4513 diff changeset	159 Cell::index (const octave_value_list& idx_arg, bool resize_ok) const
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	160 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	161 Cell retval;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	162
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	163 octave_idx_type n = idx_arg.length ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	164
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	165 switch (n)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	166 {
5539 b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5307 diff changeset	167 case 0:
b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5307 diff changeset	168 retval = *this;
b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5307 diff changeset	169 break;
b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5307 diff changeset	170
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	171 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	172 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	173 idx_vector i = idx_arg(0).index_vector ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	174
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	175 if (! error_state)
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	176 retval = Array<octave_value>::index (i, resize_ok,
57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	177 resize_fill_value ());
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	178 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	179 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	180
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	181 case 2:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	182 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	183 idx_vector i = idx_arg(0).index_vector ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	184
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	185 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	186 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	187 idx_vector j = idx_arg(1).index_vector ();
4919 a1073eef650c [project @ 2004-07-27 15:22:50 by jwe] jwe parents: 4915 diff changeset	188
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	189 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	190 retval = Array<octave_value>::index (i, j, resize_ok,
9415 f16079069972 use proper empty value in Cell::index Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	191 resize_fill_value ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	192 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	193 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	194 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	195
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	196 default:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	197 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	198 Array<idx_vector> iv (dim_vector (n, 1));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	199
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	200 for (octave_idx_type i = 0; i < n; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	201 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	202 iv(i) = idx_arg(i).index_vector ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	203
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	204 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	205 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	206 }
4919 a1073eef650c [project @ 2004-07-27 15:22:50 by jwe] jwe parents: 4915 diff changeset	207
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	208 if (!error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	209 retval = Array<octave_value>::index (iv, resize_ok,
9415 f16079069972 use proper empty value in Cell::index Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	210 resize_fill_value ());
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	211 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	212 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	213 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	214
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	215 return retval;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	216 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	217
10649 64472dd48517 cosmetic changes in Cell interface Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	218 void
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4513 diff changeset	219 Cell::assign (const octave_value_list& idx_arg, const Cell& rhs,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	220 const octave_value& fill_val)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	221
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	222 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	223 octave_idx_type len = idx_arg.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	224
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	225 Array<idx_vector> ra_idx (dim_vector (len, 1));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	226
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	227 for (octave_idx_type i = 0; i < len; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	228 ra_idx(i) = idx_arg(i).index_vector ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	229
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	230 Array<octave_value>::assign (ra_idx, rhs, fill_val);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	231 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4216 diff changeset	232
10649 64472dd48517 cosmetic changes in Cell interface Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	233 void
8175 977d5204cf67 fix null assignment for structs Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	234 Cell::delete_elements (const octave_value_list& idx_arg)
977d5204cf67 fix null assignment for structs Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	235
977d5204cf67 fix null assignment for structs Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	236 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	237 octave_idx_type len = idx_arg.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	238
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	239 Array<idx_vector> ra_idx (dim_vector (len, 1));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	240
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	241 for (octave_idx_type i = 0; i < len; i++)
8175 977d5204cf67 fix null assignment for structs Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	242 ra_idx.xelem (i) = idx_arg(i).index_vector ();
977d5204cf67 fix null assignment for structs Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	243
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	244 Array<octave_value>::delete_elements (ra_idx);
8175 977d5204cf67 fix null assignment for structs Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	245 }
977d5204cf67 fix null assignment for structs Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	246
5602 dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5570 diff changeset	247 octave_idx_type
dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5570 diff changeset	248 Cell::nnz (void) const
dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5570 diff changeset	249 {
dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5570 diff changeset	250 gripe_wrong_type_arg ("nnz", "cell array");
dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5570 diff changeset	251 return -1;
dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5570 diff changeset	252 }
dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5570 diff changeset	253
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	254 Cell
5570 3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	255 Cell::column (octave_idx_type i) const
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	256 {
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	257 Cell retval;
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	258
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	259 if (ndims () < 3)
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	260 {
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	261 if (i < 0 \|\| i >= cols ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	262 error ("invalid column selection");
5570 3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	263 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	264 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	265 octave_idx_type nr = rows ();
5570 3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	266
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	267 retval.resize (dim_vector (nr, 1));
5570 3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	268
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	269 for (octave_idx_type j = 0; j < nr; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	270 retval.xelem (j) = elem (j, i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	271 }
5570 3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	272 }
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	273 else
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	274 error ("Cell::column: requires 2-d cell array");
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	275
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	276 return retval;
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	277 }
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	278
3074a549d644 [project @ 2005-12-08 21:01:50 by jwe] jwe parents: 5539 diff changeset	279 Cell
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	280 Cell::concat (const Cell& rb, const Array<octave_idx_type>& ra_idx)
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4625 diff changeset	281 {
5073 e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4919 diff changeset	282 return insert (rb, ra_idx);
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	283 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	284
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	285 Cell&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	286 Cell::insert (const Cell& a, octave_idx_type r, octave_idx_type c)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	287 {
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	288 Array<octave_value>::insert (a, r, c);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	289 return *this;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	290 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	291
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	292 Cell&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	293 Cell::insert (const Cell& a, const Array<octave_idx_type>& ra_idx)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	294 {
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	295 Array<octave_value>::insert (a, ra_idx);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	296 return *this;
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4625 diff changeset	297 }
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4625 diff changeset	298
7530 bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	299 Cell
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	300 Cell::map (ctype_mapper fcn) const
7530 bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	301 {
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	302 Cell retval (dims ());
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	303 octave_value *r = retval.fortran_vec ();
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	304
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	305 const octave_value *p = data ();
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	306
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	307 for (octave_idx_type i = 0; i < numel (); i++)
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	308 r[i] = ((p++)->*fcn) ();
7530 bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	309
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	310 return retval;
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	311 }
bb0f2353cff5 new cell array ctype mappers John W. Eaton <jwe@octave.org> parents: 7209 diff changeset	312
7618 3209a584e1ac Further type preservation tests and fix of diag for cell arrays David Bateman <dbateman@free.fr> parents: 7530 diff changeset	313 Cell
3209a584e1ac Further type preservation tests and fix of diag for cell arrays David Bateman <dbateman@free.fr> parents: 7530 diff changeset	314 Cell::diag (octave_idx_type k) const
3209a584e1ac Further type preservation tests and fix of diag for cell arrays David Bateman <dbateman@free.fr> parents: 7530 diff changeset	315 {
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9415 diff changeset	316 return Array<octave_value>::diag (k);
7618 3209a584e1ac Further type preservation tests and fix of diag for cell arrays David Bateman <dbateman@free.fr> parents: 7530 diff changeset	317 }

Mercurial > octave-nkf

annotate src/Cell.cc @ 14626:f947d2922feb stable rc-3-6-2-0