Mercurial > octave

comparison libinterp/octave-value/ov-cell.cc @ 17787:175b392e91fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use GNU style coding conventions for code in libinterp/ * libinterp/corefcn/Cell.h, libinterp/corefcn/__contourc__.cc, libinterp/corefcn/__dispatch__.cc, libinterp/corefcn/__lin_interpn__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc, libinterp/corefcn/balance.cc, libinterp/corefcn/besselj.cc, libinterp/corefcn/betainc.cc, libinterp/corefcn/bitfcns.cc, libinterp/corefcn/bsxfun.cc, libinterp/corefcn/c-file-ptr-stream.cc, libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/cellfun.cc, libinterp/corefcn/colloc.cc, libinterp/corefcn/comment-list.h, libinterp/corefcn/conv2.cc, libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/data.cc, libinterp/corefcn/debug.cc, libinterp/corefcn/defaults.cc, libinterp/corefcn/defaults.in.h, libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc, libinterp/corefcn/det.cc, libinterp/corefcn/dirfns.cc, libinterp/corefcn/display.cc, libinterp/corefcn/dlmread.cc, libinterp/corefcn/dot.cc, libinterp/corefcn/dynamic-ld.cc, libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/eig.cc, libinterp/corefcn/ellipj.cc, libinterp/corefcn/error.cc, libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h, libinterp/corefcn/fft.cc, libinterp/corefcn/fft2.cc, libinterp/corefcn/fftn.cc, libinterp/corefcn/file-io.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gammainc.cc, libinterp/corefcn/gcd.cc, libinterp/corefcn/getgrent.cc, libinterp/corefcn/getpwent.cc, libinterp/corefcn/getrusage.cc, libinterp/corefcn/givens.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h, libinterp/corefcn/help.cc, libinterp/corefcn/hess.cc, libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc, libinterp/corefcn/input.h, libinterp/corefcn/inv.cc, libinterp/corefcn/jit-ir.h, libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/jit-util.h, libinterp/corefcn/kron.cc, libinterp/corefcn/load-path.cc, libinterp/corefcn/load-path.h, libinterp/corefcn/load-save.cc, libinterp/corefcn/load-save.h, libinterp/corefcn/lookup.cc, libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-hdf5.h, libinterp/corefcn/ls-mat-ascii.cc, libinterp/corefcn/ls-mat-ascii.h, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h, libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/lsode.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc, libinterp/corefcn/mappers.cc, libinterp/corefcn/matrix_type.cc, libinterp/corefcn/max.cc, libinterp/corefcn/md5sum.cc, libinterp/corefcn/mex.cc, libinterp/corefcn/mexproto.h, libinterp/corefcn/mgorth.cc, libinterp/corefcn/mxarray.in.h, libinterp/corefcn/nproc.cc, libinterp/corefcn/oct-hist.cc, libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-stdstrm.h, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h, libinterp/corefcn/octave-link.cc, libinterp/corefcn/octave-link.h, libinterp/corefcn/pager.cc, libinterp/corefcn/pinv.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/procstream.h, libinterp/corefcn/profiler.cc, libinterp/corefcn/pt-jit.cc, libinterp/corefcn/pt-jit.h, libinterp/corefcn/quad.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/qz.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/rcond.cc, libinterp/corefcn/regexp.cc, libinterp/corefcn/schur.cc, libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sighandlers.h, libinterp/corefcn/sparse-xdiv.cc, libinterp/corefcn/sparse-xdiv.h, libinterp/corefcn/sparse-xpow.cc, libinterp/corefcn/sparse.cc, libinterp/corefcn/spparms.cc, libinterp/corefcn/sqrtm.cc, libinterp/corefcn/str2double.cc, libinterp/corefcn/strfind.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc, libinterp/corefcn/svd.cc, libinterp/corefcn/syl.cc, libinterp/corefcn/symtab.cc, libinterp/corefcn/symtab.h, libinterp/corefcn/syscalls.cc, libinterp/corefcn/sysdep.cc, libinterp/corefcn/sysdep.h, libinterp/corefcn/time.cc, libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h, libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc, libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h, libinterp/corefcn/typecast.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/variables.h, libinterp/corefcn/xdiv.cc, libinterp/corefcn/xdiv.h, libinterp/corefcn/xnorm.h, libinterp/corefcn/xpow.cc, libinterp/corefcn/xpow.h, libinterp/corefcn/zfstream.cc, libinterp/corefcn/zfstream.h, libinterp/dldfcn/__delaunayn__.cc, libinterp/dldfcn/__dsearchn__.cc, libinterp/dldfcn/__eigs__.cc, libinterp/dldfcn/__fltk_uigetfile__.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__init_gnuplot__.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/dldfcn/amd.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/chol.cc, libinterp/dldfcn/colamd.cc, libinterp/dldfcn/convhulln.cc, libinterp/dldfcn/dmperm.cc, libinterp/dldfcn/fftw.cc, libinterp/dldfcn/qr.cc, libinterp/dldfcn/symbfact.cc, libinterp/dldfcn/symrcm.cc, libinterp/dldfcn/tsearch.cc, libinterp/octave-value/ov-base-diag.cc, libinterp/octave-value/ov-base-diag.h, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-base-int.h, libinterp/octave-value/ov-base-mat.h, libinterp/octave-value/ov-base-scalar.cc, libinterp/octave-value/ov-base-scalar.h, libinterp/octave-value/ov-base-sparse.cc, libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.cc, libinterp/octave-value/ov-base.h, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-bool-mat.h, libinterp/octave-value/ov-bool-sparse.cc, libinterp/octave-value/ov-bool-sparse.h, libinterp/octave-value/ov-bool.cc, libinterp/octave-value/ov-bool.h, libinterp/octave-value/ov-builtin.cc, libinterp/octave-value/ov-builtin.h, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-cell.h, libinterp/octave-value/ov-ch-mat.cc, libinterp/octave-value/ov-ch-mat.h, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-colon.h, libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-complex.h, libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-diag.h, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-mat.h, libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-cx-sparse.h, libinterp/octave-value/ov-dld-fcn.h, libinterp/octave-value/ov-fcn-handle.cc, libinterp/octave-value/ov-fcn-handle.h, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-fcn-inline.h, libinterp/octave-value/ov-fcn.h, libinterp/octave-value/ov-float.cc, libinterp/octave-value/ov-float.h, libinterp/octave-value/ov-flt-complex.cc, libinterp/octave-value/ov-flt-complex.h, libinterp/octave-value/ov-flt-cx-diag.cc, libinterp/octave-value/ov-flt-cx-diag.h, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-cx-mat.h, libinterp/octave-value/ov-flt-re-diag.cc, libinterp/octave-value/ov-flt-re-diag.h, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-flt-re-mat.h, libinterp/octave-value/ov-int16.cc, libinterp/octave-value/ov-int32.cc, libinterp/octave-value/ov-int64.cc, libinterp/octave-value/ov-int8.cc, libinterp/octave-value/ov-intx.h, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-lazy-idx.h, libinterp/octave-value/ov-mex-fcn.cc, libinterp/octave-value/ov-mex-fcn.h, libinterp/octave-value/ov-null-mat.cc, libinterp/octave-value/ov-null-mat.h, libinterp/octave-value/ov-oncleanup.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-perm.h, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-diag.cc, libinterp/octave-value/ov-re-diag.h, libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-re-mat.h, libinterp/octave-value/ov-re-sparse.cc, libinterp/octave-value/ov-re-sparse.h, libinterp/octave-value/ov-scalar.cc, libinterp/octave-value/ov-scalar.h, libinterp/octave-value/ov-str-mat.cc, libinterp/octave-value/ov-str-mat.h, libinterp/octave-value/ov-struct.cc, libinterp/octave-value/ov-struct.h, libinterp/octave-value/ov-type-conv.h, libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov-typeinfo.h, libinterp/octave-value/ov-uint16.cc, libinterp/octave-value/ov-uint32.cc, libinterp/octave-value/ov-uint64.cc, libinterp/octave-value/ov-uint8.cc, libinterp/octave-value/ov-usr-fcn.cc, libinterp/octave-value/ov-usr-fcn.h, libinterp/octave-value/ov.cc, libinterp/octave-value/ov.h, libinterp/octave.cc, libinterp/operators/op-b-bm.cc, libinterp/operators/op-b-sbm.cc, libinterp/operators/op-bm-b.cc, libinterp/operators/op-bm-bm.cc, libinterp/operators/op-cdm-cdm.cc, libinterp/operators/op-chm.cc, libinterp/operators/op-class.cc, libinterp/operators/op-cm-cm.cc, libinterp/operators/op-cm-cs.cc, libinterp/operators/op-cm-s.cc, libinterp/operators/op-cm-scm.cc, libinterp/operators/op-cm-sm.cc, libinterp/operators/op-cs-cm.cc, libinterp/operators/op-cs-cs.cc, libinterp/operators/op-cs-scm.cc, libinterp/operators/op-cs-sm.cc, libinterp/operators/op-dm-dm.cc, libinterp/operators/op-dm-scm.cc, libinterp/operators/op-double-conv.cc, libinterp/operators/op-fcdm-fcdm.cc, libinterp/operators/op-fcm-fcm.cc, libinterp/operators/op-fcm-fcs.cc, libinterp/operators/op-fcm-fm.cc, libinterp/operators/op-fcm-fs.cc, libinterp/operators/op-fcs-fcm.cc, libinterp/operators/op-fcs-fcs.cc, libinterp/operators/op-fcs-fm.cc, libinterp/operators/op-fcs-fs.cc, libinterp/operators/op-fdm-fdm.cc, libinterp/operators/op-float-conv.cc, libinterp/operators/op-fm-fcm.cc, libinterp/operators/op-fm-fcs.cc, libinterp/operators/op-fm-fm.cc, libinterp/operators/op-fm-fs.cc, libinterp/operators/op-fs-fcm.cc, libinterp/operators/op-fs-fcs.cc, libinterp/operators/op-fs-fm.cc, libinterp/operators/op-fs-fs.cc, libinterp/operators/op-m-cm.cc, libinterp/operators/op-m-cs.cc, libinterp/operators/op-m-m.cc, libinterp/operators/op-m-s.cc, libinterp/operators/op-m-scm.cc, libinterp/operators/op-m-sm.cc, libinterp/operators/op-pm-scm.cc, libinterp/operators/op-range.cc, libinterp/operators/op-s-cm.cc, libinterp/operators/op-s-cs.cc, libinterp/operators/op-s-scm.cc, libinterp/operators/op-sbm-b.cc, libinterp/operators/op-sbm-bm.cc, libinterp/operators/op-sbm-sbm.cc, libinterp/operators/op-scm-cm.cc, libinterp/operators/op-scm-cs.cc, libinterp/operators/op-scm-m.cc, libinterp/operators/op-scm-s.cc, libinterp/operators/op-scm-scm.cc, libinterp/operators/op-scm-sm.cc, libinterp/operators/op-sm-cm.cc, libinterp/operators/op-sm-m.cc, libinterp/operators/op-sm-s.cc, libinterp/operators/op-sm-scm.cc, libinterp/operators/op-sm-sm.cc, libinterp/operators/op-str-m.cc, libinterp/operators/op-str-s.cc, libinterp/operators/op-str-str.cc, libinterp/operators/ops.h, libinterp/parse-tree/lex.h, libinterp/parse-tree/parse.h, libinterp/parse-tree/pt-arg-list.cc, libinterp/parse-tree/pt-arg-list.h, libinterp/parse-tree/pt-assign.cc, libinterp/parse-tree/pt-assign.h, libinterp/parse-tree/pt-binop.cc, libinterp/parse-tree/pt-binop.h, libinterp/parse-tree/pt-bp.h, libinterp/parse-tree/pt-cbinop.cc, libinterp/parse-tree/pt-check.cc, libinterp/parse-tree/pt-colon.cc, libinterp/parse-tree/pt-colon.h, libinterp/parse-tree/pt-const.cc, libinterp/parse-tree/pt-decl.cc, libinterp/parse-tree/pt-decl.h, libinterp/parse-tree/pt-eval.cc, libinterp/parse-tree/pt-except.h, libinterp/parse-tree/pt-exp.h, libinterp/parse-tree/pt-fcn-handle.cc, libinterp/parse-tree/pt-id.cc, libinterp/parse-tree/pt-id.h, libinterp/parse-tree/pt-idx.cc, libinterp/parse-tree/pt-idx.h, libinterp/parse-tree/pt-loop.h, libinterp/parse-tree/pt-mat.cc, libinterp/parse-tree/pt-misc.cc, libinterp/parse-tree/pt-misc.h, libinterp/parse-tree/pt-pr-code.cc, libinterp/parse-tree/pt-select.h, libinterp/parse-tree/pt-stmt.h, libinterp/parse-tree/token.h, libinterp/version.cc: Use GNU style coding conventions for code in libinterp/
author Rik <rik@octave.org>
date Mon, 28 Oct 2013 19:51:46 -0700
parents d63878346099
children ea0ecbe2eaf5
comparison
equal deleted inserted replaced
17786:34d9812a943b 17787:175b392e91fe
75 matrix.assign (idx, rhs); 75 matrix.assign (idx, rhs);
76 } 76 }
77 77
78 template <> 78 template <>
79 void 79 void
80 octave_base_matrix<Cell>::assign (const octave_value_list& idx, octave_value rhs) 80 octave_base_matrix<Cell>::assign (const octave_value_list& idx,
81 octave_value rhs)
81 { 82 {
82 // FIXME: Really? 83 // FIXME: Really?
83 if (rhs.is_cell ()) 84 if (rhs.is_cell ())
84 matrix.assign (idx, rhs.cell_value ()); 85 matrix.assign (idx, rhs.cell_value ());
85 else 86 else
91 octave_base_matrix<Cell>::delete_elements (const octave_value_list& idx) 92 octave_base_matrix<Cell>::delete_elements (const octave_value_list& idx)
92 { 93 {
93 matrix.delete_elements (idx); 94 matrix.delete_elements (idx);
94 } 95 }
95 96
96 // FIXME: this list of specializations is becoming so long that we should really ask 97 // FIXME: this list of specializations is becoming so long that we should
97 // whether octave_cell should inherit from octave_base_matrix at all. 98 // really ask whether octave_cell should inherit from octave_base_matrix at all.
98 99
99 template <> 100 template <>
100 octave_value 101 octave_value
101 octave_base_matrix<Cell>::fast_elem_extract (octave_idx_type n) const 102 octave_base_matrix<Cell>::fast_elem_extract (octave_idx_type n) const
102 { 103 {
172 173
173 default: 174 default:
174 panic_impossible (); 175 panic_impossible ();
175 } 176 }
176 177
177 // FIXME -- perhaps there should be an 178 // FIXME: perhaps there should be an
178 // octave_value_list::next_subsref member function? See also 179 // octave_value_list::next_subsref member function? See also
179 // octave_user_function::subsref. 180 // octave_user_function::subsref.
180 181
181 if (idx.size () > 1) 182 if (idx.size () > 1)
182 retval = (lvalue_list 183 retval = (lvalue_list
224 225
225 default: 226 default:
226 panic_impossible (); 227 panic_impossible ();
227 } 228 }
228 229
229 // FIXME -- perhaps there should be an 230 // FIXME: perhaps there should be an
230 // octave_value_list::next_subsref member function? See also 231 // octave_value_list::next_subsref member function? See also
231 // octave_user_function::subsref. 232 // octave_user_function::subsref.
232 233
233 if (idx.size () > 1) 234 if (idx.size () > 1)
234 retval = retval.next_subsref (auto_add, type, idx); 235 retval = retval.next_subsref (auto_add, type, idx);
315 { 316 {
316 tmp = octave_value::empty_conv (type.substr (1), rhs); 317 tmp = octave_value::empty_conv (type.substr (1), rhs);
317 tmp.make_unique (); // probably a no-op. 318 tmp.make_unique (); // probably a no-op.
318 } 319 }
319 else 320 else
320 // optimization: ignore the copy still stored inside our array. 321 // optimization: ignore copy still stored inside array.
321 tmp.make_unique (1); 322 tmp.make_unique (1);
322 323
323 if (! error_state) 324 if (! error_state)
324 t_rhs = tmp.subsasgn (next_type, next_idx, rhs); 325 t_rhs = tmp.subsasgn (next_type, next_idx, rhs);
325 } 326 }
356 { 357 {
357 octave_value_list i = idx.front (); 358 octave_value_list i = idx.front ();
358 359
359 if (t_rhs.is_cell ()) 360 if (t_rhs.is_cell ())
360 octave_base_matrix<Cell>::assign (i, t_rhs.cell_value ()); 361 octave_base_matrix<Cell>::assign (i, t_rhs.cell_value ());
362 else if (t_rhs.is_null_value ())
363 octave_base_matrix<Cell>::delete_elements (i);
361 else 364 else
362 if (t_rhs.is_null_value ()) 365 octave_base_matrix<Cell>::assign (i, Cell (t_rhs));
363 octave_base_matrix<Cell>::delete_elements (i);
364 else
365 octave_base_matrix<Cell>::assign (i, Cell (t_rhs));
366 366
367 if (! error_state) 367 if (! error_state)
368 { 368 {
369 count++; 369 count++;
370 retval = octave_value (this); 370 retval = octave_value (this);
392 tmp_cell = tmp_cell.reshape (didx); 392 tmp_cell = tmp_cell.reshape (didx);
393 393
394 394
395 octave_base_matrix<Cell>::assign (idxf, tmp_cell); 395 octave_base_matrix<Cell>::assign (idxf, tmp_cell);
396 } 396 }
397 else if (idxf.all_scalars () || do_index_op (idxf, true).numel () == 1) 397 else if (idxf.all_scalars ()
398 || do_index_op (idxf, true).numel () == 1)
398 // Regularize a null matrix if stored into a cell. 399 // Regularize a null matrix if stored into a cell.
399 octave_base_matrix<Cell>::assign (idxf, Cell (t_rhs.storable_value ())); 400 octave_base_matrix<Cell>::assign (idxf,
401 Cell (t_rhs.storable_value ()));
400 else if (! error_state) 402 else if (! error_state)
401 gripe_nonbraced_cs_list_assignment (); 403 gripe_nonbraced_cs_list_assignment ();
402 404
403 if (! error_state) 405 if (! error_state)
404 { 406 {
1130 octave_idx_type nel = dv.numel (); 1132 octave_idx_type nel = dv.numel ();
1131 1133
1132 for (octave_idx_type i = 0; i < nel; i++) 1134 for (octave_idx_type i = 0; i < nel; i++)
1133 { 1135 {
1134 std::ostringstream buf; 1136 std::ostringstream buf;
1135 int digits = static_cast<int> (gnulib::floor (::log10 (static_cast<double> (nel)) + 1.0)); 1137 int digits = static_cast<int> (gnulib::floor (::log10 (static_cast<double>
1138 (nel)) + 1.0));
1136 buf << "_" << std::setw (digits) << std::setfill ('0') << i; 1139 buf << "_" << std::setw (digits) << std::setfill ('0') << i;
1137 std::string s = buf.str (); 1140 std::string s = buf.str ();
1138 1141
1139 if (! add_hdf5_data (data_hid, tmp.elem (i), s.c_str (), "", false, 1142 if (! add_hdf5_data (data_hid, tmp.elem (i), s.c_str (), "", false,
1140 save_as_floats)) 1143 save_as_floats))
1255 } 1258 }
1256 1259
1257 #endif 1260 #endif
1258 1261
1259 DEFUN (iscell, args, , 1262 DEFUN (iscell, args, ,
1260 "-*- texinfo -*-\n\ 1263 "-*- texinfo -*-\n\
1261 @deftypefn {Built-in Function} {} iscell (@var{x})\n\ 1264 @deftypefn {Built-in Function} {} iscell (@var{x})\n\
1262 Return true if @var{x} is a cell array object.\n\ 1265 Return true if @var{x} is a cell array object.\n\
1263 @seealso{ismatrix, isstruct, iscellstr, isa}\n\ 1266 @seealso{ismatrix, isstruct, iscellstr, isa}\n\
1264 @end deftypefn") 1267 @end deftypefn")
1265 { 1268 {
1272 1275
1273 return retval; 1276 return retval;
1274 } 1277 }
1275 1278
1276 DEFUN (cell, args, , 1279 DEFUN (cell, args, ,
1277 "-*- texinfo -*-\n\ 1280 "-*- texinfo -*-\n\
1278 @deftypefn {Built-in Function} {} cell (@var{n})\n\ 1281 @deftypefn {Built-in Function} {} cell (@var{n})\n\
1279 @deftypefnx {Built-in Function} {} cell (@var{m}, @var{n})\n\ 1282 @deftypefnx {Built-in Function} {} cell (@var{m}, @var{n})\n\
1280 @deftypefnx {Built-in Function} {} cell (@var{m}, @var{n}, @var{k}, @dots{})\n\ 1283 @deftypefnx {Built-in Function} {} cell (@var{m}, @var{n}, @var{k}, @dots{})\n\
1281 @deftypefnx {Built-in Function} {} cell ([@var{m} @var{n} @dots{}])\n\ 1284 @deftypefnx {Built-in Function} {} cell ([@var{m} @var{n} @dots{}])\n\
1282 Create a new cell array object.\n\ 1285 Create a new cell array object.\n\
1332 1335
1333 return retval; 1336 return retval;
1334 } 1337 }
1335 1338
1336 DEFUN (iscellstr, args, , 1339 DEFUN (iscellstr, args, ,
1337 "-*- texinfo -*-\n\ 1340 "-*- texinfo -*-\n\
1338 @deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\ 1341 @deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\
1339 Return true if every element of the cell array @var{cell} is a\n\ 1342 Return true if every element of the cell array @var{cell} is a\n\
1340 character string.\n\ 1343 character string.\n\
1341 @seealso{ischar}\n\ 1344 @seealso{ischar}\n\
1342 @end deftypefn") 1345 @end deftypefn")
1355 // Fiscellstr defined first (to provide a declaration) and also we 1358 // Fiscellstr defined first (to provide a declaration) and also we
1356 // should keep it in the same file (so we don't have to provide a 1359 // should keep it in the same file (so we don't have to provide a
1357 // declaration) and so we don't have to use feval to call it. 1360 // declaration) and so we don't have to use feval to call it.
1358 1361
1359 DEFUN (cellstr, args, , 1362 DEFUN (cellstr, args, ,
1360 "-*- texinfo -*-\n\ 1363 "-*- texinfo -*-\n\
1361 @deftypefn {Built-in Function} {} cellstr (@var{string})\n\ 1364 @deftypefn {Built-in Function} {} cellstr (@var{string})\n\
1362 Create a new cell array object from the elements of the string\n\ 1365 Create a new cell array object from the elements of the string\n\
1363 array @var{string}.\n\ 1366 array @var{string}.\n\
1364 @end deftypefn") 1367 @end deftypefn")
1365 { 1368 {
1388 1391
1389 return retval; 1392 return retval;
1390 } 1393 }
1391 1394
1392 DEFUN (struct2cell, args, , 1395 DEFUN (struct2cell, args, ,
1393 "-*- texinfo -*-\n\ 1396 "-*- texinfo -*-\n\
1394 @deftypefn {Built-in Function} {} struct2cell (@var{S})\n\ 1397 @deftypefn {Built-in Function} {} struct2cell (@var{S})\n\
1395 Create a new cell array from the objects stored in the struct object.\n\ 1398 Create a new cell array from the objects stored in the struct object.\n\
1396 If @var{f} is the number of fields in the structure, the resulting\n\ 1399 If @var{f} is the number of fields in the structure, the resulting\n\
1397 cell array will have a dimension vector corresponding to\n\ 1400 cell array will have a dimension vector corresponding to\n\
1398 @code{[@var{F} size(@var{S})]}. For example:\n\ 1401 @code{[@var{F} size(@var{S})]}. For example:\n\
1441 // [numel(fields) size(struct)] 1444 // [numel(fields) size(struct)]
1442 // except if the struct is a column vector. 1445 // except if the struct is a column vector.
1443 1446
1444 dim_vector result_dv; 1447 dim_vector result_dv;
1445 if (m_dv (m_dv.length () - 1) == 1) 1448 if (m_dv (m_dv.length () - 1) == 1)
1446 result_dv.resize (m_dv.length ()); 1449 result_dv.resize (m_dv.length ());
1447 else 1450 else
1448 result_dv.resize (m_dv.length () + 1); // Add 1 for the fields. 1451 result_dv.resize (m_dv.length () + 1); // Add 1 for the fields.
1449 1452
1450 result_dv(0) = num_fields; 1453 result_dv(0) = num_fields;
1451 1454
1452 for (int i = 1; i < result_dv.length (); i++) 1455 for (int i = 1; i < result_dv.length (); i++)
1453 result_dv(i) = m_dv(i-1); 1456 result_dv(i) = m_dv(i-1);