octave: libinterp/octave-value/ov-range.cc annotate

annotate libinterp/octave-value/ov-range.cc @ 22327:d0562b3159c7

move more classes inside octave namespace * ov-complex.cc, quit.h, lo-array-errwarn.h, lo-array-errwarn.cc, lo-array-gripes.cc: Move classes inside octave namespace. * NEWS, file-editor-tab.cc, Cell.cc, __qp__.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, error.cc, error.h, errwarn.cc, errwarn.h, file-io.cc, gcd.cc, graphics.cc, graphics.in.h, gripes.cc, gripes.h, input.cc, interpreter.cc, interpreter.h, inv.cc, jit-typeinfo.cc, load-path.cc, ls-mat-ascii.cc, ls-mat5.cc, lsode.cc, mex.cc, oct-handle.h, oct-map.cc, oct-stream.cc, quad.cc, rand.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, sub2ind.cc, toplev.cc, utils.cc, variables.cc, xdiv.cc, xpow.cc, __eigs__.cc, __init_gnuplot__.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-class.cc, ov-classdef.cc, ov-complex.h, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-float.cc, ov-float.h, ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-oncleanup.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov.cc, op-cs-cs.cc, op-fcs-fcs.cc, op-fs-fs.cc, op-int.h, op-s-s.cc, ops.h, oct-parse.in.yy, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt.cc, Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MDiagArray2.cc, MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, quit.cc, quit.h, gepbalance.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h, Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h, cmd-edit.cc, lo-array-errwarn.cc, lo-array-errwarn.h, lo-array-gripes.cc, lo-array-gripes.h, oct-binmap.h: Update to use namespace.

author	John W. Eaton <jwe@octave.org>
date	Wed, 17 Aug 2016 03:41:42 -0400
parents	bac0d6f07a3e
children	34ce5be04942

rev	line source
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1 /*
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22296 diff changeset	3 Copyright (C) 1996-2016 John W. Eaton
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	4
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	6
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	10 option) any later version.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	11
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	15 for more details.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	16
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	19 <http://www.gnu.org/licenses/>.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	20
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	21 */
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21211 diff changeset	24 # include "config.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	25 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	26
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3219 diff changeset	27 #include <iostream>
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	28
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	29 #include "dNDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	30 #include "fNDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	31 #include "int8NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	32 #include "int16NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	33 #include "int32NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	34 #include "int64NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	35 #include "uint8NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	36 #include "uint16NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	37 #include "uint32NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	38 #include "uint64NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	39
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	40 #include "lo-ieee.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	41 #include "lo-utils.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	42
10605 1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	43 #include "defun.h"
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	44 #include "variables.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21022 diff changeset	45 #include "errwarn.h"
15149 62a35ae7d6a2 use forward decls for mxArray in ov.h and ov-base.h John W. Eaton <jwe@octave.org> parents: 15057 diff changeset	46 #include "mxarray.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	47 #include "ops.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20893 diff changeset	48 #include "ovl.h"
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	49 #include "oct-hdf5.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	50 #include "ov-range.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	51 #include "ov-re-mat.h"
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	52 #include "ov-scalar.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	53 #include "pr-output.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	54
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	55 #include "byte-swap.h"
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	56 #include "ls-ascii-helper.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	57 #include "ls-hdf5.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	58 #include "ls-utils.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	59
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	60 // If TRUE, allow ranges with non-integer elements as array indices.
18130 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	61 static bool Vallow_noninteger_range_as_index = true;
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	62
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4478 diff changeset	63 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_range, "range", "double");
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	64
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5731 diff changeset	65 static octave_base_value *
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5731 diff changeset	66 default_numeric_conversion_function (const octave_base_value& a)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	67 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21575 diff changeset	68 const octave_range& v = dynamic_cast<const octave_range&> (a);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	69
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	70 return new octave_matrix (v.matrix_value ());
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	71 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	72
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	73 octave_base_value::type_conv_info
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	74 octave_range::numeric_conversion_function (void) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	75 {
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	76 return octave_base_value::type_conv_info (default_numeric_conversion_function,
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	77 octave_matrix::static_type_id ());
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	78 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	79
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5731 diff changeset	80 octave_base_value *
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	81 octave_range::try_narrowing_conversion (void)
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	82 {
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5731 diff changeset	83 octave_base_value *retval = 0;
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	84
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	85 switch (range.numel ())
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	86 {
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	87 case 1:
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	88 retval = new octave_scalar (range.base ());
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	89 break;
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	90
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	91 case 0:
4417 5cca7b5d6b34 [project @ 2003-05-25 02:40:35 by jwe] jwe parents: 4358 diff changeset	92 retval = new octave_matrix (Matrix (1, 0));
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	93 break;
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	94
8971 967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	95 case -2:
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	96 retval = new octave_matrix (range.matrix_value ());
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	97 break;
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	98
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	99 default:
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	100 break;
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	101 }
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	102
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	103 return retval;
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	104 }
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2376 diff changeset	105
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	106 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	107 octave_range::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	108 const std::list<octave_value_list>& idx)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	109 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	110 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	111
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	112 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	113 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	114 case '(':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	115 retval = do_index_op (idx.front ());
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	116 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	117
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	118 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	119 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	120 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	121 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	122 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: 3523 diff changeset	123 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	124 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	125
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	126 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	127 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	128 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	129
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	130 return retval.next_subsref (type, idx);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	131 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	132
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3523 diff changeset	133 octave_value
5885 bd3041e30d97 [project @ 2006-07-14 20:29:35 by jwe] jwe parents: 5781 diff changeset	134 octave_range::do_index_op (const octave_value_list& idx, bool resize_ok)
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	135 {
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	136 if (idx.length () == 1 && ! resize_ok)
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	137 {
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	138 octave_value retval;
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	139
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	140 // The range can handle a single subscript.
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	141
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	142 try
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	143 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	144 idx_vector i = idx(0).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	145
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	146 if (i.is_scalar () && i(0) < range.numel ())
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	147 retval = range.elem (i(0));
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	148 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	149 retval = range.index (i);
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	150 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	151 catch (octave::index_exception& e)
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	152 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	153 // More info may be added later before displaying error.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	154
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	155 e.set_pos_if_unset (1, 1);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20228 diff changeset	156 throw;
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	157 }
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	158
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	159 return retval;
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	160 }
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	161 else
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	162 {
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	163 octave_value tmp (new octave_matrix (range.matrix_value ()));
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	164
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	165 return tmp.do_index_op (idx, resize_ok);
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	166 }
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	167 }
a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	168
10605 1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	169 idx_vector
18130 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	170 octave_range::index_vector (bool require_integers) const
10605 1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	171 {
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	172 if (idx_cache)
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	173 return *idx_cache;
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	174 else
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	175 {
18130 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	176 if (require_integers
e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	177 \|\| ! Vallow_noninteger_range_as_index
10616 d61caf612f1e optimize order of conditions in octave_range::index_vector Jaroslav Hajek <highegg@gmail.com> parents: 10613 diff changeset	178 \|\| range.all_elements_are_ints ())
10605 1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	179 return set_idx_cache (idx_vector (range));
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	180 else
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	181 {
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	182 warning_with_id ("Octave:noninteger-range-as-index",
10609 58bcda68ac11 improve warning/error message John W. Eaton <jwe@octave.org> parents: 10605 diff changeset	183 "non-integer range used as index");
10605 1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	184
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	185 return octave_value (matrix_value ()).round ().index_vector ();
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	186 }
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	187 }
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	188 }
1834132fb50b allow non-integer ranges as indices conditionally John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	189
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	190 double
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	191 octave_range::double_value (bool) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	192 {
4102 cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4066 diff changeset	193 double retval = lo_ieee_nan_value ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	194
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	195 octave_idx_type nel = range.numel ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	196
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	197 if (nel == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	198 err_invalid_conversion ("range", "real scalar");
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	199
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	200 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	201 "range", "real scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	202
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	203 retval = range.base ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	204
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	205 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	206 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	207
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	208 float
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	209 octave_range::float_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	210 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	211 float retval = lo_ieee_float_nan_value ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	212
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	213 octave_idx_type nel = range.numel ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	214
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	215 if (nel == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	216 err_invalid_conversion ("range", "real scalar");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	217
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	218 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	219 "range", "real scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	220
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	221 retval = range.base ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	222
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	223 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	224 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	225
9146 a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	226 charNDArray
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	227 octave_range::char_array_value (bool) const
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	228 {
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	229 const Matrix matrix = range.matrix_value ();
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	230 charNDArray retval (dims ());
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	231
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	232 octave_idx_type nel = numel ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	233
9146 a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	234 for (octave_idx_type i = 0; i < nel; i++)
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	235 retval.elem (i) = static_cast<char>(matrix.elem (i));
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	236
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	237 return retval;
a48c500e48e1 support range->string conversions Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	238 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	239
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	240 octave_value
4017 0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 3933 diff changeset	241 octave_range::all (int dim) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	242 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	243 // FIXME: this is a potential waste of memory.
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	244
a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	245 Matrix m = range.matrix_value ();
a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	246
4017 0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 3933 diff changeset	247 return m.all (dim);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	248 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	249
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	250 octave_value
4017 0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 3933 diff changeset	251 octave_range::any (int dim) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	252 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	253 // FIXME: this is a potential waste of memory.
4017 0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 3933 diff changeset	254
0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 3933 diff changeset	255 Matrix m = range.matrix_value ();
0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 3933 diff changeset	256
0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 3933 diff changeset	257 return m.any (dim);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	258 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	259
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	260 octave_value
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	261 octave_range::diag (octave_idx_type k) const
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	262 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	263 return
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	264 (k == 0
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	265 ? octave_value (DiagMatrix (DiagArray2<double> (range.matrix_value ())))
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	266 : octave_value (range.diag (k)));
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	267 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	268
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	269 octave_value
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	270 octave_range::diag (octave_idx_type m, octave_idx_type n) const
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	271 {
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	272 Matrix mat = range.matrix_value ();
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	273
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	274 return mat.diag (m, n);
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14469 diff changeset	275 }
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	276
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	277 // Return true if this range has all true elements (non-zero, not NaN/NA).
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	278 // A range cannot have NaN/NA.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	279 bool
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	280 octave_range::is_true (void) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	281 {
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	282 bool retval = false;
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	283
20988 8b8d8c6c0e64 Add new member function is_empty to Range type. Use it. Rik <rik@octave.org> parents: 20974 diff changeset	284 if (! range.is_empty ())
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	285 {
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	286 if (dims ().numel () > 1)
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	287 warn_array_as_logical (dims ());
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	288
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	289 Range r = range_value ();
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	290 double base = r.base ();
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	291 double limit = r.limit ();
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	292
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	293 // Can't be zero if we start and finish on the same size of 0
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	294 if (((base > 0 && limit > 0) \|\| (base < 0 && limit < 0)) && numel () > 0)
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	295 retval = true;
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	296 else
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	297 {
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	298 /*
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	299 // This tells us whether one element is 0, if arithmetic is exact.
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	300 double steps_to_zero = base / r.inc ();
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	301
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	302 retval = (steps_to_zero != floor (steps_to_zero));
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	303 */
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	304
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	305 // FIXME: this is a waste of memory.
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	306 Matrix m ((range.matrix_value ().all ()).all ());
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	307
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	308 retval = ! m.is_empty () && m(0, 0) != 0.0;
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	309 }
2436 a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	310 }
a628e881be66 [project @ 1996-10-29 22:08:28 by jwe] jwe parents: 2427 diff changeset	311
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	312 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	313 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	314
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	315 Complex
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	316 octave_range::complex_value (bool) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	317 {
4102 cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4066 diff changeset	318 double tmp = lo_ieee_nan_value ();
cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4066 diff changeset	319
cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4066 diff changeset	320 Complex retval (tmp, tmp);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	321
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	322 octave_idx_type nel = range.numel ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	323
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	324 if (nel == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	325 err_invalid_conversion ("range", "complex scalar");
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	326
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	327 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	328 "range", "complex scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	329
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	330 retval = range.base ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	331
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	332 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	333 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	334
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	335 FloatComplex
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	336 octave_range::float_complex_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	337 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	338 float tmp = lo_ieee_float_nan_value ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	339
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	340 FloatComplex retval (tmp, tmp);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	341
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	342 octave_idx_type nel = range.numel ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	343
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	344 if (nel == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	345 err_invalid_conversion ("range", "complex scalar");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	346
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	347 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	348 "range", "complex scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	349
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	350 retval = range.base ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	351
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	352 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	353 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	354
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	355 boolNDArray
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	356 octave_range::bool_array_value (bool warn) const
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	357 {
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	358 Matrix m = range.matrix_value ();
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	359
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	360 if (m.any_element_is_nan ())
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	361 octave::err_nan_to_logical_conversion ();
21120 499b851fbfae Replace pattern if/err_XXX/else/code with if/err_XXX/ code. Rik <rik@octave.org> parents: 21118 diff changeset	362 if (warn && m.any_element_not_one_or_zero ())
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21022 diff changeset	363 warn_logical_conversion ();
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	364
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	365 return boolNDArray (m);
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	366 }
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	367
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	368 octave_value
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5307 diff changeset	369 octave_range::resize (const dim_vector& dv, bool fill) const
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	370 {
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	371 NDArray retval = array_value ();
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5307 diff changeset	372 if (fill)
14616 13cc11418393 improve handling of default resize fill value for arrays John W. Eaton <jwe@octave.org> parents: 14557 diff changeset	373 retval.resize (dv, 0);
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5307 diff changeset	374 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	375 retval.resize (dv);
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	376 return retval;
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5307 diff changeset	377 }
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5307 diff changeset	378
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	379 octave_value
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	380 octave_range::convert_to_str_internal (bool pad, bool force, char type) const
2449 31d5588dbb61 [project @ 1996-10-30 22:58:44 by jwe] jwe parents: 2436 diff changeset	381 {
31d5588dbb61 [project @ 1996-10-30 22:58:44 by jwe] jwe parents: 2436 diff changeset	382 octave_value tmp (range.matrix_value ());
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	383 return tmp.convert_to_str (pad, force, type);
2449 31d5588dbb61 [project @ 1996-10-30 22:58:44 by jwe] jwe parents: 2436 diff changeset	384 }
31d5588dbb61 [project @ 1996-10-30 22:58:44 by jwe] jwe parents: 2436 diff changeset	385
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	386 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	387 octave_range::as_double (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	388 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	389 return range;
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	390 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	391
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	392 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	393 octave_range::as_single (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	394 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	395 return FloatMatrix (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	396 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	397
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	398 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	399 octave_range::as_int8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	400 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	401 return int8NDArray (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	402 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	403
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	404 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	405 octave_range::as_int16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	406 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	407 return int16NDArray (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	408 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	409
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	410 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	411 octave_range::as_int32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	412 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	413 return int32NDArray (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	414 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	415
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	416 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	417 octave_range::as_int64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	418 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	419 return int64NDArray (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	420 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	421
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	422 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	423 octave_range::as_uint8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	424 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	425 return uint8NDArray (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	426 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	427
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	428 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	429 octave_range::as_uint16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	430 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	431 return uint16NDArray (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	432 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	433
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	434 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	435 octave_range::as_uint32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	436 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	437 return uint32NDArray (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	438 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	439
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	440 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	441 octave_range::as_uint64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	442 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	443 return uint64NDArray (range.matrix_value ());
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	444 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	445
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	446 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18132 diff changeset	447 octave_range::print (std::ostream& os, bool pr_as_read_syntax)
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	448 {
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	449 print_raw (os, pr_as_read_syntax);
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	450 newline (os);
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	451 }
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	452
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	453 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	454 octave_range::print_raw (std::ostream& os, bool pr_as_read_syntax) const
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	455 {
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	456 octave_print_internal (os, range, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	457 current_print_indent_level ());
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	458 }
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	459
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	460 bool
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	461 octave_range::print_name_tag (std::ostream& os, const std::string& name) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	462 {
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	463 bool retval = false;
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	464
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	465 octave_idx_type n = range.numel ();
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	466
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	467 indent (os);
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	468
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	469 if (n == 0 \|\| n == 1)
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	470 os << name << " = ";
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	471 else
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	472 {
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	473 os << name << " =";
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	474 newline (os);
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12863 diff changeset	475 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12863 diff changeset	476 newline (os);
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12863 diff changeset	477
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	478 retval = true;
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	479 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	480
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	481 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	482 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	483
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	484 void
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	485 octave_range::short_disp (std::ostream& os) const
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	486 {
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	487 octave_idx_type len = range.numel ();
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	488
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	489 if (len == 0)
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	490 os << "[]";
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	491 else
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	492 {
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	493 os << range.base () << ":";
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	494
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	495 if (len > 1)
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	496 {
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	497 if (range.inc () != 1)
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	498 os << range.inc () << ":";
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	499
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	500 os << range.limit ();
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	501 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	502 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	503 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	504
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	505 // Skip white space and comments on stream IS.
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	506
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	507 static void
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	508 skip_comments (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	509 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	510 char c = '\0';
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	511 while (is.get (c))
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	512 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	513 if (c == ' ' \|\| c == '\t' \|\| c == '\n')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	514 ; // Skip whitespace on way to beginning of next line.
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	515 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	516 break;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	517 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	518
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	519 skip_until_newline (is, false);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	520 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	521
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	522 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6686 diff changeset	523 octave_range::save_ascii (std::ostream& os)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	524 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	525 Range r = range_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	526 double base = r.base ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	527 double limit = r.limit ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	528 double inc = r.inc ();
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	529 octave_idx_type len = r.numel ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	530
10735 d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	531 if (inc != 0)
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	532 os << "# base, limit, increment\n";
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	533 else
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	534 os << "# base, length, increment\n";
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	535
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	536 octave_write_double (os, base);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	537 os << " ";
10735 d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	538 if (inc != 0)
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	539 octave_write_double (os, limit);
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	540 else
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	541 os << len;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	542 os << " ";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	543 octave_write_double (os, inc);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	544 os << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	545
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	546 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	547 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	548
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	549 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	550 octave_range::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	551 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	552 // # base, limit, range comment added by save ().
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	553 skip_comments (is);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	554
10735 d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	555 double base, limit, inc;
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	556 is >> base >> limit >> inc;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	557
20893 384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	558 if (! is)
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20853 diff changeset	559 error ("load: failed to load range constant");
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	560
10735 d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	561 if (inc != 0)
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	562 range = Range (base, limit, inc);
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	563 else
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	564 range = Range (base, inc, static_cast<octave_idx_type> (limit));
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	565
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	566 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	567 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	568
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	569 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	570 octave_range::save_binary (std::ostream& os, bool& /* save_as_floats */)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	571 {
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	572 char tmp = LS_DOUBLE;
8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	573 os.write (reinterpret_cast<char *> (&tmp), 1);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	574 Range r = range_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	575 double bas = r.base ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	576 double lim = r.limit ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	577 double inc = r.inc ();
10735 d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	578 if (inc == 0)
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	579 lim = r.numel ();
10735 d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	580
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	581 os.write (reinterpret_cast<char *> (&bas), 8);
8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	582 os.write (reinterpret_cast<char *> (&lim), 8);
8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	583 os.write (reinterpret_cast<char *> (&inc), 8);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	584
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	585 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	586 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	587
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	588 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	589 octave_range::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	590 octave::mach_info::float_format /* fmt */)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	591 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	592 char tmp;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	593 if (! is.read (reinterpret_cast<char *> (&tmp), 1))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	594 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	595 double bas, lim, inc;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	596 if (! is.read (reinterpret_cast<char *> (&bas), 8))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	597 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	598 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	599 swap_bytes<8> (&bas);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	600 if (! is.read (reinterpret_cast<char *> (&lim), 8))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	601 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	602 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	603 swap_bytes<8> (&lim);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	604 if (! is.read (reinterpret_cast<char *> (&inc), 8))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	605 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	606 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	607 swap_bytes<8> (&inc);
10735 d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	608 if (inc != 0)
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	609 range = Range (bas, lim, inc);
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	610 else
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	611 range = Range (bas, inc, static_cast<octave_idx_type> (lim));
d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	612
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	613 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	614 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	615
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	616 #if defined (HAVE_HDF5)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	617
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	618 // The following subroutines creates an HDF5 representation of the way
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	619 // we will store Octave range types (triplets of floating-point numbers).
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	620 // NUM_TYPE is the HDF5 numeric type to use for storage (e.g.
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21739 diff changeset	621 // H5T_NATIVE_DOUBLE to save as 'double'). Note that any necessary
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	622 // conversions are handled automatically by HDF5.
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	623
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	624 static hid_t
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	625 hdf5_make_range_type (hid_t num_type)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	626 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	627 hid_t type_id = H5Tcreate (H5T_COMPOUND, sizeof (double) * 3);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	628
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	629 H5Tinsert (type_id, "base", 0 * sizeof (double), num_type);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	630 H5Tinsert (type_id, "limit", 1 * sizeof (double), num_type);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	631 H5Tinsert (type_id, "increment", 2 * sizeof (double), num_type);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	632
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	633 return type_id;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	634 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	635
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	636 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	637
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	638 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	639 octave_range::save_hdf5 (octave_hdf5_id loc_id, const char *name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	640 bool /* save_as_floats */)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	641 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	642 bool retval = false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	643
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	644 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	645
4792 d2038299c683 [project @ 2004-02-20 18:44:43 by jwe] jwe parents: 4687 diff changeset	646 hsize_t dimens[3];
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17870 diff changeset	647 hid_t space_hid, type_hid, data_hid;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17870 diff changeset	648 space_hid = type_hid = data_hid = -1;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	649
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4792 diff changeset	650 space_hid = H5Screate_simple (0, dimens, 0);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	651 if (space_hid < 0) return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	652
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	653 type_hid = hdf5_make_range_type (H5T_NATIVE_DOUBLE);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	654 if (type_hid < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	655 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	656 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	657 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	658 }
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	659 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	660 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20988 diff changeset	661 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	662 #else
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20988 diff changeset	663 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	664 #endif
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	665 if (data_hid < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	666 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	667 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	668 H5Tclose (type_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	669 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	670 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	671
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	672 Range r = range_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	673 double range_vals[3];
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	674 range_vals[0] = r.base ();
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	675 range_vals[1] = r.inc () != 0 ? r.limit () : r.numel ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	676 range_vals[2] = r.inc ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	677
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20988 diff changeset	678 if (H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
11176 2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	679 range_vals) >= 0)
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	680 {
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	681 octave_idx_type nel = r.numel ();
11176 2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	682 retval = hdf5_add_scalar_attr (data_hid, H5T_NATIVE_IDX,
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	683 "OCTAVE_RANGE_NELEM", &nel) >= 0;
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	684 }
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	685 else
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	686 retval = false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	688 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	689 H5Tclose (type_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	690 H5Sclose (space_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	691
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	692 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	693 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	694 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	695
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	696 warn_save ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	697 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	698
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	699 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	700 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	701
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	702 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	703 octave_range::load_hdf5 (octave_hdf5_id loc_id, const char *name)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	704 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	705 bool retval = false;
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	706
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	707 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	708
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	709 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20988 diff changeset	710 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	711 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	712 hid_t data_hid = H5Dopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	713 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	714 hid_t type_hid = H5Dget_type (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	715
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	716 hid_t range_type = hdf5_make_range_type (H5T_NATIVE_DOUBLE);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	717
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	718 if (! hdf5_types_compatible (type_hid, range_type))
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	719 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	720 H5Tclose (range_type);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	721 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	722 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	723 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	724
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	725 hid_t space_hid = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	726 hsize_t rank = H5Sget_simple_extent_ndims (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	727
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	728 if (rank != 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	729 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	730 H5Tclose (range_type);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	731 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	732 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	733 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	734 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	735
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	736 double rangevals[3];
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20988 diff changeset	737 if (H5Dread (data_hid, range_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	738 rangevals) >= 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	739 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	740 retval = true;
11176 2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	741 octave_idx_type nel;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	742 if (hdf5_get_scalar_attr (data_hid, H5T_NATIVE_IDX,
11176 2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	743 "OCTAVE_RANGE_NELEM", &nel))
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	744 range = Range (rangevals[0], rangevals[2], nel);
10735 d899b2ee6a37 fix saving/loading of constant ranges (bug #30289) Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	745 else
11176 2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	746 {
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	747 if (rangevals[2] != 0)
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	748 range = Range (rangevals[0], rangevals[1], rangevals[2]);
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	749 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	750 range = Range (rangevals[0], rangevals[2],
11176 2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	751 static_cast<octave_idx_type> (rangevals[1]));
2271261f088a Address precision issue in ranges saved to HDF5 files David Bateman <dbateman@free.fr> parents: 11129 diff changeset	752 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	753 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	754
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	755 H5Tclose (range_type);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	756 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	757 H5Dclose (data_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	758
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	759 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	760 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	761 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	762
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	763 warn_load ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	764 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19861 diff changeset	765
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	766 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	767 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	768
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	769 mxArray *
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	770 octave_range::as_mxArray (void) const
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	771 {
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	772 mxArray *retval = new mxArray (mxDOUBLE_CLASS, dims (), mxREAL);
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	773
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	774 double pr = static_cast<double > (retval->get_data ());
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	775
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 5958 diff changeset	776 mwSize nel = numel ();
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	777
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	778 Matrix m = matrix_value ();
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	779
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	780 const double *p = m.data ();
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	781
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 5958 diff changeset	782 for (mwSize i = 0; i < nel; i++)
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	783 pr[i] = p[i];
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	784
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	785 return retval;
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5885 diff changeset	786 }
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	787
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18416 diff changeset	788 octave_value
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18416 diff changeset	789 octave_range::fast_elem_extract (octave_idx_type n) const
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18416 diff changeset	790 {
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	791 return (n < range.numel ()) ? octave_value (range.elem (n))
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	792 : octave_value ();
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18416 diff changeset	793 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18416 diff changeset	794
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	795 DEFUN (allow_noninteger_range_as_index, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	796 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	797 @deftypefn {} {@var{val} =} allow_noninteger_range_as_index ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	798 @deftypefnx {} {@var{old_val} =} allow_noninteger_range_as_index (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	799 @deftypefnx {} {} allow_noninteger_range_as_index (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	800 Query or set the internal variable that controls whether non-integer
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	801 ranges are allowed as indices.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	802
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	803 This might be useful for @sc{matlab} compatibility; however, it is still not
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	804 entirely compatible because @sc{matlab} treats the range expression
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	805 differently in different contexts.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	806
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	807 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	808 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	809 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	810 @end deftypefn */)
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	811 {
18130 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	812 static bool warned = false;
e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	813 if (! warned)
e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	814 {
e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	815 warned = true;
e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	816 warning_with_id ("Octave:deprecated-function",
e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	817 "allow_noninteger_range_as_index is obsolete and will be removed from a future version of Octave");
e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	818 }
e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17870 diff changeset	819
10613 e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	820 return SET_INTERNAL_VARIABLE (allow_noninteger_range_as_index);
e103fb2182ce use internal variable instead of warning state to control whether to allow non-integer ranges as indices John W. Eaton <jwe@octave.org> parents: 10609 diff changeset	821 }
12863 8f9702abe3e3 test: Add validation for allow_noninteger_range_as_index() Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	822
8f9702abe3e3 test: Add validation for allow_noninteger_range_as_index() Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	823 /*
8f9702abe3e3 test: Add validation for allow_noninteger_range_as_index() Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	824 %!test
8f9702abe3e3 test: Add validation for allow_noninteger_range_as_index() Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	825 %! x = 0:10;
21575 bc9aa534bc29 maint: Clean up BIST tests so they don't produce warnings. Rik <rik@octave.org> parents: 21301 diff changeset	826 %! warning ("off", "Octave:deprecated-function", "local");
13846 10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	827 %! save = allow_noninteger_range_as_index ();
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	828 %! warn_state = warning ("query", "Octave:noninteger-range-as-index");
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	829 %! unwind_protect
14040 a64f8b6f63e9 test: simplify test for allow_noninteger_range_as_index Rik <octave@nomad.inbox5.com> parents: 13951 diff changeset	830 %! allow_noninteger_range_as_index (false);
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	831 %! fail ("x(2.1:5)");
13846 10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	832 %! assert (x(2:5), 1:4);
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	833 %! allow_noninteger_range_as_index (true);
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	834 %! warning ("off", "Octave:noninteger-range-as-index");
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	835 %! assert (x(2.49:5), 1:3);
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	836 %! assert (x(2.5:5), 2:4);
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	837 %! assert (x(2.51:5), 2:4);
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	838 %! unwind_protect_cleanup
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	839 %! allow_noninteger_range_as_index (save);
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	840 %! warning (warn_state.state, warn_state.identifier);
10a5c8155756 * ov-range.cc: Also disable warning for noninteger index in test. John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	841 %! end_unwind_protect
12863 8f9702abe3e3 test: Add validation for allow_noninteger_range_as_index() Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	842 */

Mercurial > octave

annotate libinterp/octave-value/ov-range.cc @ 22327:d0562b3159c7