octave: liboctave/array/Range.h annotate

annotate liboctave/array/Range.h @ 28592:e70c859c4bff

allow infinite limits on for loop ranges (bug #45143) * ov.cc (octave_value::octave_value (const Range&, bool)): If force_range is false, throw error if range is not OK. * Range.h, Range.cc (Range::ok): New function. (Range::numel_internal): Return one less than the maximum possible octave_idx_type value if infinite range is detected. (Range::init): Don't set m_limit if limit is infinite. (Range::Range (double, double)): Likewise. (Range::Range (double, double, double)): Likewise. (Range::Range (double, double, octave_idx_type): Trust supplied value of numel. * for.tst: New tests. * pt-eval.cc (tree_evaluator::visit_simple_for_command): Warn if range limit is infinite.

author	John W. Eaton <jwe@octave.org>
date	Fri, 24 Jul 2020 01:01:35 -0400
parents	455fe4a6f22c
children	b6371946f106

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 1993-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	25
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 20513 diff changeset	26 #if ! defined (octave_Range_h)
382 e02d6b664394 [project @ 1994-03-09 21:08:03 by jwe] jwe parents: 238 diff changeset	27 #define octave_Range_h 1
e02d6b664394 [project @ 1994-03-09 21:08:03 by jwe] jwe parents: 238 diff changeset	28
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21221 diff changeset	29 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21221 diff changeset	30
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	31 #include <iosfwd>
7458 1032e24f199f make sort work for ranges John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	32
4810 72a6d410a14a [project @ 2004-03-03 18:49:39 by jwe] jwe parents: 4192 diff changeset	33 #include "dMatrix.h"
28004 403df0b32204 update out_of_range error messages John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	34 #include "dim-vector.h"
7458 1032e24f199f make sort work for ranges John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	35 #include "oct-sort.h"
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	36
1860 821870c30840 [project @ 1996-02-04 10:04:58 by jwe] jwe parents: 1528 diff changeset	37 class
6108 143b556ce725 [project @ 2006-10-27 01:45:54 by jwe] jwe parents: 5347 diff changeset	38 OCTAVE_API
1860 821870c30840 [project @ 1996-02-04 10:04:58 by jwe] jwe parents: 1528 diff changeset	39 Range
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	40 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	41 public:
1860 821870c30840 [project @ 1996-02-04 10:04:58 by jwe] jwe parents: 1528 diff changeset	42
1528 dc527156c38c [project @ 1995-10-05 01:44:18 by jwe] jwe parents: 1315 diff changeset	43 Range (void)
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	44 : m_base (0), m_limit (0), m_inc (0), m_numel (0)
28402 09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	45 { }
1528 dc527156c38c [project @ 1995-10-05 01:44:18 by jwe] jwe parents: 1315 diff changeset	46
27023 fc256e9d882e use default ctors, dtors, and assignment ops in Matrix, intNDArray, and Cell John W. Eaton <jwe@octave.org> parents: 26377 diff changeset	47 Range (const Range& r) = default;
fc256e9d882e use default ctors, dtors, and assignment ops in Matrix, intNDArray, and Cell John W. Eaton <jwe@octave.org> parents: 26377 diff changeset	48
fc256e9d882e use default ctors, dtors, and assignment ops in Matrix, intNDArray, and Cell John W. Eaton <jwe@octave.org> parents: 26377 diff changeset	49 Range& operator = (const Range& r) = default;
fc256e9d882e use default ctors, dtors, and assignment ops in Matrix, intNDArray, and Cell John W. Eaton <jwe@octave.org> parents: 26377 diff changeset	50
fc256e9d882e use default ctors, dtors, and assignment ops in Matrix, intNDArray, and Cell John W. Eaton <jwe@octave.org> parents: 26377 diff changeset	51 ~Range (void) = default;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	52
1528 dc527156c38c [project @ 1995-10-05 01:44:18 by jwe] jwe parents: 1315 diff changeset	53 Range (double b, double l)
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	54 : m_base (b), m_limit (l), m_inc (1), m_numel (numel_internal ())
20513 96153b16febe Overhaul Range object in liboctave. Rik <rik@octave.org> parents: 20228 diff changeset	55 {
28592 e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	56 if (! octave::math::isinf (m_limit))
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	57 m_limit = limit_internal ();
20513 96153b16febe Overhaul Range object in liboctave. Rik <rik@octave.org> parents: 20228 diff changeset	58 }
1528 dc527156c38c [project @ 1995-10-05 01:44:18 by jwe] jwe parents: 1315 diff changeset	59
dc527156c38c [project @ 1995-10-05 01:44:18 by jwe] jwe parents: 1315 diff changeset	60 Range (double b, double l, double i)
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	61 : m_base (b), m_limit (l), m_inc (i), m_numel (numel_internal ())
20513 96153b16febe Overhaul Range object in liboctave. Rik <rik@octave.org> parents: 20228 diff changeset	62 {
28592 e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	63 if (! octave::math::isinf (m_limit))
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	64 m_limit = limit_internal ();
20513 96153b16febe Overhaul Range object in liboctave. Rik <rik@octave.org> parents: 20228 diff changeset	65 }
1528 dc527156c38c [project @ 1995-10-05 01:44:18 by jwe] jwe parents: 1315 diff changeset	66
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	67 // NOTE: The following constructor may be deprecated and removed after
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	68 // the arithmetic operators are removed.
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	69
8589 0131fa223dbc make length invariant in range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8553 diff changeset	70 // For operators' usage (to preserve element count).
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	71
16169 0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15271 diff changeset	72 Range (double b, double i, octave_idx_type n)
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	73 : m_base (b), m_limit (b + (n-1) * i), m_inc (i), m_numel (n)
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	74 {
28592 e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	75 if (! octave::math::isinf (m_limit))
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	76 m_limit = limit_internal ();
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	77 }
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	78
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	79 // The range has a finite number of elements.
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	80 bool ok (void) const
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	81 {
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	82 return (octave::math::isfinite (m_limit)
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	83 && (m_numel >= 0 \|\| m_numel == -2));
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	84 }
8589 0131fa223dbc make length invariant in range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8553 diff changeset	85
28402 09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	86 double base (void) const { return m_base; }
09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	87 double limit (void) const { return m_limit; }
09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	88 double inc (void) const { return m_inc; }
21134 2e5c1f766ac9 provide replacement hints for deprecated C++ functions John W. Eaton <jwe@octave.org> parents: 21040 diff changeset	89
28402 09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	90 octave_idx_type numel (void) const { return m_numel; }
25812 fc74c8d2a584 Clean up liboctave Range implementation. Rik <rik@octave.org> parents: 25054 diff changeset	91
28402 09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	92 dim_vector dims (void) const { return dim_vector (1, m_numel); }
28004 403df0b32204 update out_of_range error messages John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	93
24780 0d21e2a1cdfc new element access operators for Range objects John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	94 octave_idx_type rows (void) const { return 1; }
0d21e2a1cdfc new element access operators for Range objects John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	95
0d21e2a1cdfc new element access operators for Range objects John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	96 octave_idx_type cols (void) const { return numel (); }
0d21e2a1cdfc new element access operators for Range objects John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	97 octave_idx_type columns (void) const { return numel (); }
0d21e2a1cdfc new element access operators for Range objects John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	98
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	99 bool isempty (void) const { return numel () == 0; }
80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	100
2383 096529066838 [project @ 1996-10-12 17:50:47 by jwe] jwe parents: 1993 diff changeset	101 bool all_elements_are_ints (void) const;
096529066838 [project @ 1996-10-12 17:50:47 by jwe] jwe parents: 1993 diff changeset	102
645 21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe] jwe parents: 461 diff changeset	103 Matrix matrix_value (void) const;
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe] jwe parents: 461 diff changeset	104
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	105 double min (void) const;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	106 double max (void) const;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	107
7458 1032e24f199f make sort work for ranges John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	108 void sort_internal (bool ascending = true);
1032e24f199f make sort work for ranges John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	109 void sort_internal (Array<octave_idx_type>& sidx, bool ascending = true);
1032e24f199f make sort work for ranges John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	110
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7463 diff changeset	111 Matrix diag (octave_idx_type k = 0) const;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7463 diff changeset	112
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7458 diff changeset	113 Range sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const;
7458 1032e24f199f make sort work for ranges John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	114 Range sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0,
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	115 sortmode mode = ASCENDING) const;
208 380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe] jwe parents: 3 diff changeset	116
23588 0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23577 diff changeset	117 sortmode issorted (sortmode mode = ASCENDING) const;
0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23577 diff changeset	118
24859 00ecff875f8a Add nnz implementation for Range type (bug #53185). maorshutman <maorus12@gmail.com> parents: 24799 diff changeset	119 octave_idx_type nnz (void) const;
00ecff875f8a Add nnz implementation for Range type (bug #53185). maorshutman <maorus12@gmail.com> parents: 24799 diff changeset	120
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	121 // Support for single-index subscripting, without generating matrix cache.
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	122
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	123 double checkelem (octave_idx_type i) const;
24780 0d21e2a1cdfc new element access operators for Range objects John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	124 double checkelem (octave_idx_type i, octave_idx_type j) const;
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	125
16169 0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15271 diff changeset	126 double elem (octave_idx_type i) const;
24799 74a596fd6bab Fix unused variable warning in Range elem(i,j) function introduced in 0d21e2a1cdfc. Rik <rik@octave.org> parents: 24780 diff changeset	127 double elem (octave_idx_type /* i */, octave_idx_type j) const
74a596fd6bab Fix unused variable warning in Range elem(i,j) function introduced in 0d21e2a1cdfc. Rik <rik@octave.org> parents: 24780 diff changeset	128 { return elem (j); }
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	129
23487 af2f1f3dbe06 eliminate --enable-bounds-check configure option John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	130 double operator () (octave_idx_type i) const { return elem (i); }
24780 0d21e2a1cdfc new element access operators for Range objects John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	131 double operator () (octave_idx_type i, octave_idx_type j) const
0d21e2a1cdfc new element access operators for Range objects John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	132 { return elem (i, j); }
23487 af2f1f3dbe06 eliminate --enable-bounds-check configure option John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	133
9986 672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	134 Array<double> index (const idx_vector& i) const;
672e1b49e01e optimize indexing of ranges by single subscripts Jaroslav Hajek <highegg@gmail.com> parents: 8971 diff changeset	135
20513 96153b16febe Overhaul Range object in liboctave. Rik <rik@octave.org> parents: 20228 diff changeset	136 void set_base (double b);
4811 198f3712c692 [project @ 2004-03-03 19:24:33 by jwe] jwe parents: 4810 diff changeset	137
20513 96153b16febe Overhaul Range object in liboctave. Rik <rik@octave.org> parents: 20228 diff changeset	138 void set_limit (double l);
4811 198f3712c692 [project @ 2004-03-03 19:24:33 by jwe] jwe parents: 4810 diff changeset	139
20513 96153b16febe Overhaul Range object in liboctave. Rik <rik@octave.org> parents: 20228 diff changeset	140 void set_inc (double i);
1528 dc527156c38c [project @ 1995-10-05 01:44:18 by jwe] jwe parents: 1315 diff changeset	141
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	142 friend OCTAVE_API std::ostream& operator << (std::ostream& os,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	143 const Range& r);
6108 143b556ce725 [project @ 2006-10-27 01:45:54 by jwe] jwe parents: 5347 diff changeset	144 friend OCTAVE_API std::istream& operator >> (std::istream& is, Range& r);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	145
8971 967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	146 friend OCTAVE_API Range operator - (const Range& r);
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	147 friend OCTAVE_API Range operator + (double x, const Range& r);
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	148 friend OCTAVE_API Range operator + (const Range& r, double x);
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	149 friend OCTAVE_API Range operator - (double x, const Range& r);
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	150 friend OCTAVE_API Range operator - (const Range& r, double x);
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	151 friend OCTAVE_API Range operator * (double x, const Range& r);
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	152 friend OCTAVE_API Range operator * (const Range& r, double x);
967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	153
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	154 private:
1860 821870c30840 [project @ 1996-02-04 10:04:58 by jwe] jwe parents: 1528 diff changeset	155
28402 09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	156 double m_base;
09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	157 double m_limit;
09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	158 double m_inc;
1860 821870c30840 [project @ 1996-02-04 10:04:58 by jwe] jwe parents: 1528 diff changeset	159
28402 09a3c0e91e6e style update for Range class John W. Eaton <jwe@octave.org> parents: 28004 diff changeset	160 octave_idx_type m_numel;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	161
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	162 octave_idx_type numel_internal (void) const;
4811 198f3712c692 [project @ 2004-03-03 19:24:33 by jwe] jwe parents: 4810 diff changeset	163
21321 79a51b7e00b6 eliminate some copy and paste code fragments in the Range class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	164 double limit_internal (void) const;
79a51b7e00b6 eliminate some copy and paste code fragments in the Range class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	165
79a51b7e00b6 eliminate some copy and paste code fragments in the Range class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	166 void init (void);
79a51b7e00b6 eliminate some copy and paste code fragments in the Range class John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	167
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	168 protected:
8971 967a692ddfe2 fix range arithmetics Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	169
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	170 // NOTE: The following constructor may be removed when the arithmetic
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	171 // operators are removed.
18852 47d4b680d0e0 improve accuracy of range/scalar arithmetic (bug #42589) John W. Eaton <jwe@octave.org> parents: 17769 diff changeset	172
47d4b680d0e0 improve accuracy of range/scalar arithmetic (bug #42589) John W. Eaton <jwe@octave.org> parents: 17769 diff changeset	173 // For operators' usage (to allow all values to be set directly).
47d4b680d0e0 improve accuracy of range/scalar arithmetic (bug #42589) John W. Eaton <jwe@octave.org> parents: 17769 diff changeset	174 Range (double b, double l, double i, octave_idx_type n)
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	175 : m_base (b), m_limit (l), m_inc (i), m_numel (n)
28592 e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28524 diff changeset	176 { }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	177 };
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	178
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	179 OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
6108 143b556ce725 [project @ 2006-10-27 01:45:54 by jwe] jwe parents: 5347 diff changeset	180 extern OCTAVE_API Range operator - (const Range& r);
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	181
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	182 OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
8553 c7ff200e45f5 optimize range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 7620 diff changeset	183 extern OCTAVE_API Range operator + (double x, const Range& r);
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	184
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	185 OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
8553 c7ff200e45f5 optimize range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 7620 diff changeset	186 extern OCTAVE_API Range operator + (const Range& r, double x);
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	187
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	188 OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
8553 c7ff200e45f5 optimize range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 7620 diff changeset	189 extern OCTAVE_API Range operator - (double x, const Range& r);
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	190
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	191 OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
8553 c7ff200e45f5 optimize range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 7620 diff changeset	192 extern OCTAVE_API Range operator - (const Range& r, double x);
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	193
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	194 OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
8553 c7ff200e45f5 optimize range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 7620 diff changeset	195 extern OCTAVE_API Range operator * (double x, const Range& r);
28524 455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	196
455fe4a6f22c deprecate arithmetic operators for ranges; eliminate use in Octave John W. Eaton <jwe@octave.org> parents: 28402 diff changeset	197 OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
8553 c7ff200e45f5 optimize range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 7620 diff changeset	198 extern OCTAVE_API Range operator * (const Range& r, double x);
c7ff200e45f5 optimize range-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 7620 diff changeset	199
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	200 #endif

Mercurial > octave

annotate liboctave/array/Range.h @ 28592:e70c859c4bff