jwe/octave: libinterp/octave-value/ov-base-mat.cc annotate

annotate libinterp/octave-value/ov-base-mat.cc @ 21139:538b57866b90

consistently use "typename" intead of "class" in template declarations * Object.h, QtHandlesUtils.cc, QtHandlesUtils.h, ToolBarButton.cc, ToolBarButton.h, Cell.h, __lin_interpn__.cc, bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, filter.cc, gcd.cc, graphics.cc, help.cc, kron.cc, lookup.cc, ls-mat5.cc, ls-oct-text.h, lu.cc, max.cc, mgorth.cc, oct-map.cc, oct-map.h, oct-stream.cc, oct-stream.h, octave-link.h, pr-output.cc, profiler.h, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sqrtm.cc, symtab.h, tril.cc, typecast.cc, variables.cc, xdiv.cc, zfstream.h, __init_fltk__.cc, __magick_read__.cc, chol.cc, qr.cc, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.h, ov-classdef.cc, ov-int-traits.h, ov-java.h, ov-usr-fcn.h, ov.cc, ov.h, op-dms-template.cc, oct-parse.in.yy, parse.h, pt-mat.cc, Array-b.cc, Array.cc, Array.h, CDiagMatrix.h, CMatrix.h, CNDArray.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.cc, MSparse.h, MatrixType.cc, Sparse.cc, Sparse.h, dDiagMatrix.h, dMatrix.h, dNDArray.h, fCDiagMatrix.h, fCMatrix.h, fCNDArray.h, fDiagMatrix.h, fMatrix.h, fNDArray.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, DET.h, base-aepbal.h, base-lu.cc, base-lu.h, base-qr.cc, base-qr.h, bsxfun-defs.cc, eigs-base.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, oct-convn.cc, oct-fftw.cc, oct-norm.cc, sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-base-lu.h, sparse-dmsolve.cc, mx-inlines.cc, action-container.h, base-list.h, lo-traits.h, lo-utils.h, oct-base64.h, oct-binmap.h, oct-cmplx.h, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.h, oct-refcount.h, oct-sort.cc, oct-sort.h: Use "typename" instead of "class" in template declarations.

author	John W. Eaton <jwe@octave.org>
date	Sun, 24 Jan 2016 13:50:04 -0500
parents	3ac9f47fb04b
children	fcac5dbbf9ed

rev	line source
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	1 /*
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19269 diff changeset	3 Copyright (C) 1996-2015 John W. Eaton
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11129 diff changeset	4 Copyright (C) 2009-2010 VZLU Prague
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	5
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	7
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
30770ba4457a [project @ 1998-11-13 03:44:31 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: 6195 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: 6195 diff changeset	11 option) any later version.
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	12
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	16 for more details.
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	17
30770ba4457a [project @ 1998-11-13 03:44:31 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: 6195 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: 6195 diff changeset	20 <http://www.gnu.org/licenses/>.
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	21
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	22 */
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	23
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	25 #include <config.h>
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	26 #endif
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	27
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3220 diff changeset	28 #include <iostream>
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	29
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19220 diff changeset	30 #include "Array-util.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19220 diff changeset	31
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	32 #include "Cell.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20715 diff changeset	33 #include "ovl.h"
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	34 #include "oct-map.h"
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	35 #include "ov-base.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	36 #include "ov-base-mat.h"
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	37 #include "ov-base-scalar.h"
3572 8d641545e006 [project @ 2000-02-03 21:39:48 by jwe] jwe parents: 3523 diff changeset	38 #include "pr-output.h"
20715 5b7643257978 Remove trailing whitespace at end of lines. Rik <rik@octave.org> parents: 20652 diff changeset	39
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	40 template <typename MT>
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	41 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	42 octave_base_matrix<MT>::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	43 const std::list<octave_value_list>& idx)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	44 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	45 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	46
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	47 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	48 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	49 case '(':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	50 retval = do_index_op (idx.front ());
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	51 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	52
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	53 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	54 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	55 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	56 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	57 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	58 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	59 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	60
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	61 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	62 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	63 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	64
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	65 return retval.next_subsref (type, idx);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	66 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	67
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	68 template <typename MT>
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	69 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	70 octave_base_matrix<MT>::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	71 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	72 const octave_value& rhs)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	73 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	74 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	75
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	76 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	77 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	78 case '(':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	79 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	80 if (type.length () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	81 retval = numeric_assign (type, idx, rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	82 else if (is_empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	83 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	84 // Allow conversion of empty matrix to some other type in
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	85 // cases like
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	86 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	87 // x = []; x(i).f = rhs
4436 689f730954b3 [project @ 2003-06-24 13:00:12 by jwe] jwe parents: 4247 diff changeset	88
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	89 if (type[1] != '.')
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	90 error ("invalid assignment expression");
4436 689f730954b3 [project @ 2003-06-24 13:00:12 by jwe] jwe parents: 4247 diff changeset	91
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	92 octave_value tmp = octave_value::empty_conv (type, rhs);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	93
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	94 retval = tmp.subsasgn (type, idx, rhs);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	95 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	96 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	97 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	98 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	99 error ("in indexed assignment of %s, last lhs index must be ()",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	100 nm.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	101 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	102 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	103 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	104
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	105 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	106 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	107 {
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	108 if (! is_empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	109 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	110 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	111 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	112 }
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	113
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	114 octave_value tmp = octave_value::empty_conv (type, rhs);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	115
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	116 retval = tmp.subsasgn (type, idx, rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	117 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	118 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	119
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	120 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	121 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	122 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	123
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	124 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	125 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	126
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	127 template <typename MT>
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	128 octave_value
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	129 octave_base_matrix<MT>::do_index_op (const octave_value_list& idx,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	130 bool resize_ok)
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	131 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	132 octave_value retval;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	133
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	134 octave_idx_type n_idx = idx.length ();
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	135
4742 2527c2fd4345 [project @ 2004-02-06 00:59:45 by jwe] jwe parents: 4654 diff changeset	136 int nd = matrix.ndims ();
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	137 const MT& cmatrix = matrix;
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	138
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	139 // If we catch an indexing error in index_vector, we flag an error in
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	140 // index k. Ensure it is the right value befor each idx_vector call.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	141 // Same variable as used in the for loop in the default case.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	142
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	143 octave_idx_type k = 0;
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	144
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	145 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	146 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	147 switch (n_idx)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	148 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	149 case 0:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	150 retval = matrix;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	151 break;
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	152
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	153 case 1:
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	154 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	155 idx_vector i = idx (0).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	156
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	157 // optimize single scalar index.
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	158 if (! resize_ok && i.is_scalar ())
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	159 retval = cmatrix.checkelem (i(0));
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	160 else
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	161 retval = MT (matrix.index (i, resize_ok));
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	162 }
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	163 break;
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	164
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	165 case 2:
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	166 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	167 idx_vector i = idx (0).index_vector ();
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	168
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	169 k=1;
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	170 idx_vector j = idx (1).index_vector ();
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	171
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	172 // optimize two scalar indices.
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	173 if (! resize_ok && i.is_scalar () && j.is_scalar ())
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	174 retval = cmatrix.checkelem (i(0), j(0));
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	175 else
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	176 retval = MT (matrix.index (i, j, resize_ok));
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	177 }
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	178 break;
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	179
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	180 default:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	181 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	182 Array<idx_vector> idx_vec (dim_vector (n_idx, 1));
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	183 bool scalar_opt = n_idx == nd && ! resize_ok;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	184 const dim_vector dv = matrix.dims ();
4858 499d2ca46982 [project @ 2004-04-08 18:00:43 by jwe] jwe parents: 4846 diff changeset	185
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	186 for (k = 0; k < n_idx; k++)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	187 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	188 idx_vec(k) = idx(k).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	189
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	190 scalar_opt = (scalar_opt && idx_vec(k).is_scalar ());
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	191 }
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	192
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	193 if (scalar_opt)
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	194 retval = cmatrix.checkelem (conv_to_int_array (idx_vec));
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	195 else
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	196 retval = MT (matrix.index (idx_vec, resize_ok));
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	197 }
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	198 break;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	199 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	200 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	201 catch (index_exception& e)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	202 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	203 // Rethrow to allow more info to be reported later.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	204 e.set_pos_if_unset (n_idx, k+1);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	205 throw;
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	206 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	207
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	208 return retval;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	209 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	210
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	211 template <typename MT>
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3572 diff changeset	212 void
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3572 diff changeset	213 octave_base_matrix<MT>::assign (const octave_value_list& idx, const MT& rhs)
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3572 diff changeset	214 {
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	215 octave_idx_type n_idx = idx.length ();
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	216
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	217 // If we catch an indexing error in index_vector, we flag an error in
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	218 // index k. Ensure it is the right value befor each idx_vector call.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	219 // Same variable as used in the for loop in the default case.
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	220
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	221 octave_idx_type k = 0;
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	222
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	223 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	224 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	225 switch (n_idx)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	226 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	227 case 0:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	228 panic_impossible ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	229 break;
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	230
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	231 case 1:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	232 {
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	233 idx_vector i = idx (0).index_vector ();
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	234
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	235 matrix.assign (i, rhs);
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	236 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	237 break;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	238
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	239 case 2:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	240 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	241 idx_vector i = idx (0).index_vector ();
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	242
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	243 k = 1;
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	244 idx_vector j = idx (1).index_vector ();
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	245
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	246 matrix.assign (i, j, rhs);
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	247 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	248 break;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	249
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	250 default:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	251 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	252 Array<idx_vector> idx_vec (dim_vector (n_idx, 1));
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3572 diff changeset	253
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	254 for (k = 0; k < n_idx; k++)
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	255 idx_vec(k) = idx(k).index_vector ();
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	256
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	257 matrix.assign (idx_vec, rhs);
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	258 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	259 break;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	260 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	261 }
20651 c1d94e5cd5ea catch index_exception by const reference where possible John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	262 catch (const index_exception& e)
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	263 {
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20978 diff changeset	264 err_invalid_index (e.idx (), n_idx, k+1);
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	265 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	266
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	267 // Clear cache.
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	268 clear_cached_info ();
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	269 }
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	270
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	271 template <typename MT>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	272 MatrixType
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	273 octave_base_matrix<MT>::matrix_type (const MatrixType& _typ) const
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	274 {
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	275 delete typ;
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	276 typ = new MatrixType (_typ);
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	277 return *typ;
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	278 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	279
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	280 template <typename MT>
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	281 void
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	282 octave_base_matrix<MT>::assign (const octave_value_list& idx,
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	283 typename MT::element_type rhs)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	284 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	285 octave_idx_type n_idx = idx.length ();
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	286
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	287 int nd = matrix.ndims ();
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	288
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	289 MT mrhs (dim_vector (1, 1), rhs);
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	290
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	291 // If we catch an indexing error in index_vector, we flag an error in
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	292 // index k. Ensure it is the right value befor each idx_vector call.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	293 // Same variable as used in the for loop in the default case.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	294
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	295 octave_idx_type k = 0;
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3572 diff changeset	296
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	297 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	298 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	299 switch (n_idx)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	300 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	301 case 0:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	302 panic_impossible ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	303 break;
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	304
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	305 case 1:
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	306 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	307 idx_vector i = idx (0).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	308
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	309 // optimize single scalar index.
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	310 if (i.is_scalar () && i(0) < matrix.numel ())
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	311 matrix(i(0)) = rhs;
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	312 else
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	313 matrix.assign (i, mrhs);
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	314 }
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	315 break;
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	316
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	317 case 2:
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	318 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	319 idx_vector i = idx (0).index_vector ();
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	320
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	321 k = 1;
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	322 idx_vector j = idx (1).index_vector ();
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	323
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	324 // optimize two scalar indices.
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	325 if (i.is_scalar () && j.is_scalar () && nd == 2
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	326 && i(0) < matrix.rows () && j(0) < matrix.columns ())
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	327 matrix(i(0), j(0)) = rhs;
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	328 else
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	329 matrix.assign (i, j, mrhs);
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	330 }
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	331 break;
6195 c50a125a6c81 [project @ 2006-12-04 09:25:08 by dbateman] dbateman parents: 5885 diff changeset	332
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	333 default:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	334 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	335 Array<idx_vector> idx_vec (dim_vector (n_idx, 1));
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	336 bool scalar_opt = n_idx == nd;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	337 const dim_vector dv = matrix.dims ().redim (n_idx);
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	338
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	339 for (k = 0; k < n_idx; k++)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	340 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	341 idx_vec(k) = idx(k).index_vector ();
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	342
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	343 scalar_opt = (scalar_opt && idx_vec(k).is_scalar ()
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	344 && idx_vec(k)(0) < dv(k));
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	345 }
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	346
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	347 if (scalar_opt)
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	348 {
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	349 // optimize all scalar indices. Don't construct
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	350 // an index array, but rather calc a scalar index directly.
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	351 octave_idx_type n = 1;
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	352 octave_idx_type j = 0;
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	353 for (octave_idx_type i = 0; i < n_idx; i++)
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	354 {
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	355 j += idx_vec(i)(0) * n;
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	356 n *= dv (i);
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	357 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	358 matrix(j) = rhs;
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	359 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	360 else
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	361 matrix.assign (idx_vec, mrhs);
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	362 }
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	363 break;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	364 }
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	365 }
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	366 catch (const index_exception& e)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20218 diff changeset	367 {
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20978 diff changeset	368 err_invalid_index (e.idx (), n_idx, k+1);
20652 7a8096f8df5d more cleanup of indexing exceptions John W. Eaton <jwe@octave.org> parents: 20651 diff changeset	369 }
6195 c50a125a6c81 [project @ 2006-12-04 09:25:08 by dbateman] dbateman parents: 5885 diff changeset	370
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	371 // Clear cache.
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	372 clear_cached_info ();
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3572 diff changeset	373 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3572 diff changeset	374
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	375 template <typename MT>
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	376 void
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	377 octave_base_matrix<MT>::delete_elements (const octave_value_list& idx)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	378 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	379 octave_idx_type len = idx.length ();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	380
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	381 Array<idx_vector> ra_idx (dim_vector (len, 1));
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	382
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	383 for (octave_idx_type i = 0; i < len; i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	384 ra_idx(i) = idx(i).index_vector ();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	385
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	386 matrix.delete_elements (ra_idx);
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	387
9350 16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	388 // Clear cache.
16a5f9e1fdb3 cache idx_vector result in matrices once used for indexing Jaroslav Hajek <highegg@gmail.com> parents: 9239 diff changeset	389 clear_cached_info ();
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	390 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	391
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	392 template <typename MT>
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	393 octave_value
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	394 octave_base_matrix<MT>::resize (const dim_vector& dv, bool fill) const
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	395 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	396 MT retval (matrix);
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	397 if (fill)
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	398 retval.resize (dv, 0);
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	399 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	400 retval.resize (dv);
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	401 return retval;
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	402 }
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5539 diff changeset	403
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	404 template <typename MT>
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	405 bool
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	406 octave_base_matrix<MT>::is_true (void) const
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	407 {
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	408 bool retval = false;
4875 e674c7111b88 [project @ 2004-04-22 18:12:31 by jwe] jwe parents: 4858 diff changeset	409 dim_vector dv = matrix.dims ();
e674c7111b88 [project @ 2004-04-22 18:12:31 by jwe] jwe parents: 4858 diff changeset	410 int nel = dv.numel ();
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4875 diff changeset	411
4875 e674c7111b88 [project @ 2004-04-22 18:12:31 by jwe] jwe parents: 4858 diff changeset	412 if (nel > 0)
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	413 {
4875 e674c7111b88 [project @ 2004-04-22 18:12:31 by jwe] jwe parents: 4858 diff changeset	414 MT t1 (matrix.reshape (dim_vector (nel, 1)));
e674c7111b88 [project @ 2004-04-22 18:12:31 by jwe] jwe parents: 4858 diff changeset	415
8626 1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8290 diff changeset	416 if (t1.any_element_is_nan ())
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20978 diff changeset	417 err_nan_to_logical_conversion ();
4875 e674c7111b88 [project @ 2004-04-22 18:12:31 by jwe] jwe parents: 4858 diff changeset	418
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	419 boolNDArray t2 = t1.all ();
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	420
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	421 retval = t2(0);
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	422 }
4875 e674c7111b88 [project @ 2004-04-22 18:12:31 by jwe] jwe parents: 4858 diff changeset	423
3220 3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	424 return retval;
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	425 }
3deb1105fbc1 [project @ 1998-11-19 00:06:30 by jwe] jwe parents: 3219 diff changeset	426
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	427 template <typename MT>
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	428 bool
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	429 octave_base_matrix<MT>::print_as_scalar (void) const
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	430 {
4654 a9b22513b7a6 [project @ 2003-11-24 18:56:35 by jwe] jwe parents: 4643 diff changeset	431 dim_vector dv = dims ();
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	432
4654 a9b22513b7a6 [project @ 2003-11-24 18:56:35 by jwe] jwe parents: 4643 diff changeset	433 return (dv.all_ones () \|\| dv.any_zero ());
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	434 }
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	435
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	436 template <typename MT>
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	437 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18100 diff changeset	438 octave_base_matrix<MT>::print (std::ostream& os, bool pr_as_read_syntax)
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	439 {
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	440 print_raw (os, pr_as_read_syntax);
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	441 newline (os);
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	442 }
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	443
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	444 template <typename MT>
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: diff changeset	445 void
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	446 octave_base_matrix<MT>::print_info (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	447 const std::string& prefix) const
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	448 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	449 matrix.print_info (os, prefix);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	450 }
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	451
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	452 template <typename MT>
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	453 void
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	454 octave_base_matrix<MT>::short_disp (std::ostream& os) const
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	455 {
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	456 if (matrix.is_empty ())
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	457 os << "[]";
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	458 else if (matrix.ndims () == 2)
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	459 {
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	460 // FIXME: should this be configurable?
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	461 octave_idx_type max_elts = 10;
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	462 octave_idx_type elts = 0;
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	463
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	464 octave_idx_type nel = matrix.numel ();
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	465
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	466 octave_idx_type nr = matrix.rows ();
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	467 octave_idx_type nc = matrix.columns ();
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	468
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	469 os << "[";
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	470
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	471 for (octave_idx_type i = 0; i < nr; i++)
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	472 {
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	473 for (octave_idx_type j = 0; j < nc; j++)
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	474 {
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	475 std::ostringstream buf;
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	476 octave_print_internal (buf, matrix(j*nr+i));
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	477 std::string tmp = buf.str ();
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	478 size_t pos = tmp.find_first_not_of (" ");
19216 4b6f87c6739f Fix out_of_range from substr in short_disp for GUI symtab (bug #43351) Andreas Weber <andy.weber.aw@gmail.com> parents: 17875 diff changeset	479 if (pos != std::string::npos)
4b6f87c6739f Fix out_of_range from substr in short_disp for GUI symtab (bug #43351) Andreas Weber <andy.weber.aw@gmail.com> parents: 17875 diff changeset	480 os << tmp.substr (pos);
4b6f87c6739f Fix out_of_range from substr in short_disp for GUI symtab (bug #43351) Andreas Weber <andy.weber.aw@gmail.com> parents: 17875 diff changeset	481 else if (! tmp.empty ())
4b6f87c6739f Fix out_of_range from substr in short_disp for GUI symtab (bug #43351) Andreas Weber <andy.weber.aw@gmail.com> parents: 17875 diff changeset	482 os << tmp[0];
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	483
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	484 if (++elts >= max_elts)
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	485 goto done;
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	486
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	487 if (j < nc - 1)
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	488 os << ", ";
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	489 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	490
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	491 if (i < nr - 1 && elts < max_elts)
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	492 os << "; ";
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	493 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	494
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	495 done:
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	496
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	497 if (nel <= max_elts)
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	498 os << "]";
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	499 }
17875 8fde5edabedd Display '...' for ND-arrays in GUI Variable window. Rik <rik@octave.org> parents: 17870 diff changeset	500 else
8fde5edabedd Display '...' for ND-arrays in GUI Variable window. Rik <rik@octave.org> parents: 17870 diff changeset	501 os << "...";
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	502 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	503
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	504 template <typename MT>
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	505 octave_value
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	506 octave_base_matrix<MT>::fast_elem_extract (octave_idx_type n) const
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	507 {
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	508 if (n < matrix.numel ())
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	509 return matrix(n);
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	510 else
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	511 return octave_value ();
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	512 }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	513
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21118 diff changeset	514 template <typename MT>
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	515 bool
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	516 octave_base_matrix<MT>::fast_elem_insert (octave_idx_type n,
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	517 const octave_value& x)
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	518 {
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	519 if (n < matrix.numel ())
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	520 {
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	521 // Don't use builtin_type () here to avoid an extra VM call.
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	522 typedef typename MT::element_type ET;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	523 const builtin_type_t btyp = class_to_btyp<ET>::btyp;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	524 if (btyp == btyp_unknown) // Dead branch?
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	525 return false;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	526
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	527 // Set up the pointer to the proper place.
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	528 void here = reinterpret_cast<void > (&matrix(n));
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	529 // Ask x to store there if it can.
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	530 return x.get_rep ().fast_elem_insert_self (here, btyp);
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	531 }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	532 else
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	533 return false;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	534 }

Mercurial > jwe > octave

annotate libinterp/octave-value/ov-base-mat.cc @ 21139:538b57866b90