Mercurial > octave-nkf
annotate src/ov-range.cc @ 12863:8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
* ov-range.cc: Add validation for allow_noninteger_range_as_index()
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Tue, 19 Jul 2011 13:24:49 -0700 |
| parents | 12df7854fa7c |
| children | 969ed305dde5 |
| rev | line source |
|---|---|
| 2376 | 1 /* |
| 2 | |
| 11523 | 3 Copyright (C) 1996-2011 John W. Eaton |
| 2376 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2376 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2376 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 3503 | 27 #include <iostream> |
| 2901 | 28 |
| 2376 | 29 #include "lo-ieee.h" |
| 30 #include "lo-utils.h" | |
| 31 | |
|
10605
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
32 #include "defun.h" |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
33 #include "variables.h" |
| 2376 | 34 #include "gripes.h" |
| 35 #include "ops.h" | |
| 3933 | 36 #include "oct-obj.h" |
| 2376 | 37 #include "ov-range.h" |
| 38 #include "ov-re-mat.h" | |
| 2410 | 39 #include "ov-scalar.h" |
| 2376 | 40 #include "pr-output.h" |
| 41 | |
| 4687 | 42 #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
|
43 #include "ls-ascii-helper.h" |
| 4687 | 44 #include "ls-hdf5.h" |
| 45 #include "ls-utils.h" | |
| 46 | |
|
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
|
47 // If TRUE, allow ranges with non-integer elements as array indices. |
|
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
|
48 bool Vallow_noninteger_range_as_index = false; |
|
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
|
49 |
| 3219 | 50 DEFINE_OCTAVE_ALLOCATOR (octave_range); |
| 2376 | 51 |
| 4612 | 52 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_range, "range", "double"); |
| 2376 | 53 |
| 5759 | 54 static octave_base_value * |
| 55 default_numeric_conversion_function (const octave_base_value& a) | |
| 2376 | 56 { |
| 57 CAST_CONV_ARG (const octave_range&); | |
| 58 | |
| 59 return new octave_matrix (v.matrix_value ()); | |
| 60 } | |
| 61 | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
62 octave_base_value::type_conv_info |
| 2376 | 63 octave_range::numeric_conversion_function (void) const |
| 64 { | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
65 return octave_base_value::type_conv_info (default_numeric_conversion_function, |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
66 octave_matrix::static_type_id ()); |
| 2376 | 67 } |
| 68 | |
| 5759 | 69 octave_base_value * |
| 2410 | 70 octave_range::try_narrowing_conversion (void) |
| 71 { | |
| 5759 | 72 octave_base_value *retval = 0; |
| 2410 | 73 |
| 74 switch (range.nelem ()) | |
| 75 { | |
| 76 case 1: | |
| 77 retval = new octave_scalar (range.base ()); | |
| 78 break; | |
| 79 | |
| 80 case 0: | |
| 4417 | 81 retval = new octave_matrix (Matrix (1, 0)); |
| 2410 | 82 break; |
| 83 | |
| 8971 | 84 case -2: |
| 85 retval = new octave_matrix (range.matrix_value ()); | |
| 86 break; | |
| 87 | |
| 2410 | 88 default: |
| 89 break; | |
| 90 } | |
| 91 | |
| 92 return retval; | |
| 93 } | |
| 94 | |
| 2436 | 95 octave_value |
| 4247 | 96 octave_range::subsref (const std::string& type, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
97 const std::list<octave_value_list>& idx) |
| 3933 | 98 { |
| 99 octave_value retval; | |
| 100 | |
| 101 switch (type[0]) | |
| 102 { | |
| 103 case '(': | |
| 104 retval = do_index_op (idx.front ()); | |
| 105 break; | |
| 106 | |
| 107 case '{': | |
| 108 case '.': | |
| 109 { | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
110 std::string nm = type_name (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
111 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); |
| 3933 | 112 } |
| 113 break; | |
| 114 | |
| 115 default: | |
| 116 panic_impossible (); | |
| 117 } | |
| 118 | |
| 119 return retval.next_subsref (type, idx); | |
| 120 } | |
| 121 | |
| 122 octave_value | |
| 5885 | 123 octave_range::do_index_op (const octave_value_list& idx, bool resize_ok) |
| 2436 | 124 { |
|
9986
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
125 if (idx.length () == 1 && ! resize_ok) |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
126 { |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
127 octave_value retval; |
| 2436 | 128 |
|
9986
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
129 // The range can handle a single subscript. |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
130 idx_vector i = idx(0).index_vector (); |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
131 if (! error_state) |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
132 { |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
133 if (i.is_scalar () && i(0) < range.nelem ()) |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
134 retval = range.elem (i(0)); |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
135 else |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
136 retval = range.index (i); |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
137 } |
| 2436 | 138 |
|
9986
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
139 return retval; |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
140 } |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
141 else |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
142 { |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
143 octave_value tmp (new octave_matrix (range.matrix_value ())); |
| 2436 | 144 |
|
9986
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
145 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
|
146 } |
| 2436 | 147 } |
| 148 | |
|
10605
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
149 idx_vector |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
150 octave_range::index_vector (void) const |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
151 { |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
152 if (idx_cache) |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
153 return *idx_cache; |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
154 else |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
155 { |
|
10616
d61caf612f1e
optimize order of conditions in octave_range::index_vector
Jaroslav Hajek <highegg@gmail.com>
parents:
10613
diff
changeset
|
156 if (! Vallow_noninteger_range_as_index |
|
d61caf612f1e
optimize order of conditions in octave_range::index_vector
Jaroslav Hajek <highegg@gmail.com>
parents:
10613
diff
changeset
|
157 || range.all_elements_are_ints ()) |
|
10605
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
158 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
|
159 else |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
160 { |
|
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
|
161 warning_with_id ("Octave:noninteger-range-as-index", |
|
10609
58bcda68ac11
improve warning/error message
John W. Eaton <jwe@octave.org>
parents:
10605
diff
changeset
|
162 "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
|
163 |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
164 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
|
165 } |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
166 } |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
167 } |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10315
diff
changeset
|
168 |
| 2376 | 169 double |
| 170 octave_range::double_value (bool) const | |
| 171 { | |
| 4102 | 172 double retval = lo_ieee_nan_value (); |
| 2376 | 173 |
| 5275 | 174 octave_idx_type nel = range.nelem (); |
| 2376 | 175 |
| 4455 | 176 if (nel > 0) |
| 177 { | |
| 5781 | 178 gripe_implicit_conversion ("Octave:array-as-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
179 "range", "real scalar"); |
| 4455 | 180 |
| 181 retval = range.base (); | |
| 182 } | |
| 2376 | 183 else |
| 184 gripe_invalid_conversion ("range", "real scalar"); | |
| 185 | |
| 186 return retval; | |
| 187 } | |
| 188 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
189 float |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
190 octave_range::float_value (bool) const |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
191 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
192 float retval = lo_ieee_float_nan_value (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
193 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
194 octave_idx_type nel = range.nelem (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
195 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
196 if (nel > 0) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
197 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
198 gripe_implicit_conversion ("Octave:array-as-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
199 "range", "real scalar"); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
200 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
201 retval = range.base (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
202 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
203 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
204 gripe_invalid_conversion ("range", "real scalar"); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
205 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
206 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
207 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
208 |
|
9146
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
209 charNDArray |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
210 octave_range::char_array_value (bool) const |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
211 { |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
212 const Matrix matrix = range.matrix_value (); |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
213 charNDArray retval (dims ()); |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
214 |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
215 octave_idx_type nel = numel (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
216 |
|
9146
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
217 for (octave_idx_type i = 0; i < nel; i++) |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
218 retval.elem (i) = static_cast<char>(matrix.elem (i)); |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
219 |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
220 return retval; |
|
a48c500e48e1
support range->string conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
221 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
222 |
| 2376 | 223 octave_value |
| 4017 | 224 octave_range::all (int dim) const |
| 2376 | 225 { |
| 5775 | 226 // FIXME -- this is a potential waste of memory. |
| 2436 | 227 |
| 228 Matrix m = range.matrix_value (); | |
| 229 | |
| 4017 | 230 return m.all (dim); |
| 2376 | 231 } |
| 232 | |
| 233 octave_value | |
| 4017 | 234 octave_range::any (int dim) const |
| 2376 | 235 { |
| 5775 | 236 // FIXME -- this is a potential waste of memory. |
| 4017 | 237 |
| 238 Matrix m = range.matrix_value (); | |
| 239 | |
| 240 return m.any (dim); | |
| 2376 | 241 } |
| 242 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
243 octave_value |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
244 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
|
245 { |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
246 return (k == 0 |
|
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
247 ? octave_value (DiagMatrix (DiagArray2<double> (range.matrix_value ()))) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
248 : octave_value (range.diag (k))); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
249 } |
|
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
250 |
|
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
251 |
| 2376 | 252 bool |
| 253 octave_range::is_true (void) const | |
| 254 { | |
| 255 bool retval = false; | |
| 2436 | 256 |
| 4478 | 257 if (range.nelem () != 0) |
| 2436 | 258 { |
| 5775 | 259 // FIXME -- this is a potential waste of memory. |
| 2436 | 260 |
| 261 Matrix m ((range.matrix_value () . all ()) . all ()); | |
| 262 | |
| 263 retval = (m.rows () == 1 && m.columns () == 1 && m (0, 0) != 0.0); | |
| 264 } | |
| 265 | |
| 2376 | 266 return retval; |
| 267 } | |
| 268 | |
| 269 Complex | |
| 270 octave_range::complex_value (bool) const | |
| 271 { | |
| 4102 | 272 double tmp = lo_ieee_nan_value (); |
| 273 | |
| 274 Complex retval (tmp, tmp); | |
| 2376 | 275 |
| 5275 | 276 octave_idx_type nel = range.nelem (); |
| 2376 | 277 |
| 4455 | 278 if (nel > 0) |
| 279 { | |
| 5781 | 280 gripe_implicit_conversion ("Octave:array-as-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
281 "range", "complex scalar"); |
| 4455 | 282 |
| 283 retval = range.base (); | |
| 284 } | |
| 2376 | 285 else |
| 286 gripe_invalid_conversion ("range", "complex scalar"); | |
| 287 | |
| 288 return retval; | |
| 289 } | |
| 290 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
291 FloatComplex |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
292 octave_range::float_complex_value (bool) const |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
293 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
294 float tmp = lo_ieee_float_nan_value (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
295 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
296 FloatComplex retval (tmp, tmp); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
297 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
298 octave_idx_type nel = range.nelem (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
299 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
300 if (nel > 0) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
301 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
302 gripe_implicit_conversion ("Octave:array-as-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
303 "range", "complex scalar"); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
304 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
305 retval = range.base (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
306 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
307 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
308 gripe_invalid_conversion ("range", "complex scalar"); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
309 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
310 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
311 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
312 |
|
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
|
313 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
|
314 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
|
315 { |
|
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
|
316 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
|
317 |
|
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
|
318 if (m.any_element_is_nan ()) |
|
11129
0de5cc44e690
use gripe functions for NaN to logical and NaN to character conversions more consistently
John W. Eaton <jwe@octave.org>
parents:
10840
diff
changeset
|
319 gripe_nan_to_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
|
320 else if (warn && m.any_element_not_one_or_zero ()) |
|
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
|
321 gripe_logical_conversion (); |
|
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
|
322 |
|
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
|
323 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
|
324 } |
|
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
|
325 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
326 octave_value |
| 5731 | 327 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
|
328 { |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
329 NDArray retval = array_value (); |
| 5731 | 330 if (fill) |
|
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
|
331 retval.resize (dv, NDArray::resize_fill_value ()); |
| 5731 | 332 else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
333 retval.resize (dv); |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
334 return retval; |
| 5731 | 335 } |
| 336 | |
| 2376 | 337 octave_value |
| 5279 | 338 octave_range::convert_to_str_internal (bool pad, bool force, char type) const |
| 2449 | 339 { |
| 340 octave_value tmp (range.matrix_value ()); | |
| 5279 | 341 return tmp.convert_to_str (pad, force, type); |
| 2449 | 342 } |
| 343 | |
| 2376 | 344 void |
| 3523 | 345 octave_range::print (std::ostream& os, bool pr_as_read_syntax) const |
| 2901 | 346 { |
| 347 print_raw (os, pr_as_read_syntax); | |
| 348 newline (os); | |
| 349 } | |
| 350 | |
| 351 void | |
| 3523 | 352 octave_range::print_raw (std::ostream& os, bool pr_as_read_syntax) const |
| 2901 | 353 { |
| 354 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
|
355 current_print_indent_level ()); |
| 2901 | 356 } |
| 357 | |
| 358 bool | |
| 3523 | 359 octave_range::print_name_tag (std::ostream& os, const std::string& name) const |
| 2376 | 360 { |
| 2901 | 361 bool retval = false; |
| 362 | |
| 5275 | 363 octave_idx_type n = range.nelem (); |
| 2901 | 364 |
| 365 indent (os); | |
| 366 | |
| 367 if (n == 0 || n == 1) | |
| 368 os << name << " = "; | |
| 369 else | |
| 370 { | |
| 371 os << name << " ="; | |
| 372 newline (os); | |
| 373 newline (os); | |
| 374 retval = true; | |
| 375 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
376 |
| 2901 | 377 return retval; |
| 2376 | 378 } |
| 379 | |
| 4687 | 380 // Skip white space and comments on stream IS. |
| 381 | |
| 382 static void | |
| 383 skip_comments (std::istream& is) | |
| 384 { | |
| 385 char c = '\0'; | |
| 386 while (is.get (c)) | |
| 387 { | |
| 388 if (c == ' ' || c == '\t' || c == '\n') | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
389 ; // Skip whitespace on way to beginning of next line. |
| 4687 | 390 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
391 break; |
| 4687 | 392 } |
| 393 | |
|
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
|
394 skip_until_newline (is, false); |
| 4687 | 395 } |
| 396 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
397 bool |
| 6974 | 398 octave_range::save_ascii (std::ostream& os) |
| 4687 | 399 { |
| 400 Range r = range_value (); | |
| 401 double base = r.base (); | |
| 402 double limit = r.limit (); | |
| 403 double inc = r.inc (); | |
|
10735
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
404 octave_idx_type len = r.nelem (); |
| 4687 | 405 |
|
10735
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
406 if (inc != 0) |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
407 os << "# base, limit, increment\n"; |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
408 else |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
409 os << "# base, length, increment\n"; |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
410 |
| 4687 | 411 octave_write_double (os, base); |
| 412 os << " "; | |
|
10735
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
413 if (inc != 0) |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
414 octave_write_double (os, limit); |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
415 else |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
416 os << len; |
| 4687 | 417 os << " "; |
| 418 octave_write_double (os, inc); | |
| 419 os << "\n"; | |
| 420 | |
| 421 return true; | |
| 422 } | |
| 423 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
424 bool |
| 4687 | 425 octave_range::load_ascii (std::istream& is) |
| 426 { | |
| 427 // # base, limit, range comment added by save (). | |
| 428 skip_comments (is); | |
| 429 | |
|
10735
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
430 double base, limit, inc; |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
431 is >> base >> limit >> inc; |
| 4687 | 432 |
| 433 if (!is) | |
| 434 { | |
| 435 error ("load: failed to load range constant"); | |
| 436 return false; | |
| 437 } | |
| 438 | |
|
10735
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
439 if (inc != 0) |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
440 range = Range (base, limit, inc); |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
441 else |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
442 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
|
443 |
| 4687 | 444 return true; |
| 445 } | |
| 446 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
447 bool |
| 4687 | 448 octave_range::save_binary (std::ostream& os, bool& /* save_as_floats */) |
| 449 { | |
| 5760 | 450 char tmp = LS_DOUBLE; |
| 451 os.write (reinterpret_cast<char *> (&tmp), 1); | |
| 4687 | 452 Range r = range_value (); |
| 453 double bas = r.base (); | |
| 454 double lim = r.limit (); | |
| 455 double inc = r.inc (); | |
|
10735
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
456 if (inc == 0) |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
457 lim = r.nelem (); |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
458 |
| 5760 | 459 os.write (reinterpret_cast<char *> (&bas), 8); |
| 460 os.write (reinterpret_cast<char *> (&lim), 8); | |
| 461 os.write (reinterpret_cast<char *> (&inc), 8); | |
| 4687 | 462 |
| 463 return true; | |
| 464 } | |
| 465 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
466 bool |
| 4687 | 467 octave_range::load_binary (std::istream& is, bool swap, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
468 oct_mach_info::float_format /* fmt */) |
| 4687 | 469 { |
| 470 char tmp; | |
| 5760 | 471 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
| 4687 | 472 return false; |
| 473 double bas, lim, inc; | |
| 5760 | 474 if (! is.read (reinterpret_cast<char *> (&bas), 8)) |
| 4687 | 475 return false; |
| 476 if (swap) | |
| 4944 | 477 swap_bytes<8> (&bas); |
| 5760 | 478 if (! is.read (reinterpret_cast<char *> (&lim), 8)) |
| 4687 | 479 return false; |
| 480 if (swap) | |
| 4944 | 481 swap_bytes<8> (&lim); |
| 5760 | 482 if (! is.read (reinterpret_cast<char *> (&inc), 8)) |
| 4687 | 483 return false; |
| 484 if (swap) | |
| 4944 | 485 swap_bytes<8> (&inc); |
|
10735
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
486 if (inc != 0) |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
487 range = Range (bas, lim, inc); |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
488 else |
|
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
489 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
|
490 |
| 4687 | 491 return true; |
| 492 } | |
| 493 | |
| 494 #if defined (HAVE_HDF5) | |
| 4944 | 495 |
| 4687 | 496 // 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
|
497 // 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
|
498 // NUM_TYPE is the HDF5 numeric type to use for storage (e.g. |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
499 // H5T_NATIVE_DOUBLE to save as 'double'). Note that any necessary |
| 4687 | 500 // conversions are handled automatically by HDF5. |
| 501 | |
| 502 static hid_t | |
| 503 hdf5_make_range_type (hid_t num_type) | |
| 504 { | |
| 505 hid_t type_id = H5Tcreate (H5T_COMPOUND, sizeof (double) * 3); | |
| 506 | |
| 507 H5Tinsert (type_id, "base", 0 * sizeof (double), num_type); | |
| 508 H5Tinsert (type_id, "limit", 1 * sizeof (double), num_type); | |
| 509 H5Tinsert (type_id, "increment", 2 * sizeof (double), num_type); | |
| 510 | |
| 511 return type_id; | |
| 512 } | |
| 513 | |
| 514 bool | |
| 515 octave_range::save_hdf5 (hid_t loc_id, const char *name, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
516 bool /* save_as_floats */) |
| 4687 | 517 { |
| 4792 | 518 hsize_t dimens[3]; |
| 4687 | 519 hid_t space_hid = -1, type_hid = -1, data_hid = -1; |
| 520 bool retval = true; | |
| 521 | |
| 4815 | 522 space_hid = H5Screate_simple (0, dimens, 0); |
| 4687 | 523 if (space_hid < 0) return false; |
| 524 | |
| 525 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
|
526 if (type_hid < 0) |
| 4687 | 527 { |
| 528 H5Sclose (space_hid); | |
| 529 return false; | |
| 530 } | |
|
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
|
531 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
532 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
533 H5P_DEFAULT, H5P_DEFAULT, 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
|
534 #else |
| 4687 | 535 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, 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
|
536 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
537 if (data_hid < 0) |
| 4687 | 538 { |
| 539 H5Sclose (space_hid); | |
| 540 H5Tclose (type_hid); | |
| 541 return false; | |
| 542 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
543 |
| 4687 | 544 Range r = range_value (); |
| 545 double range_vals[3]; | |
| 546 range_vals[0] = r.base (); | |
|
10735
d899b2ee6a37
fix saving/loading of constant ranges (bug #30289)
Jaroslav Hajek <highegg@gmail.com>
parents:
10711
diff
changeset
|
547 range_vals[1] = r.inc () != 0 ? r.limit () : r.nelem (); |
| 4687 | 548 range_vals[2] = r.inc (); |
| 549 | |
|
11176
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
550 if (H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
551 range_vals) >= 0) |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
552 { |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
553 octave_idx_type nel = r.nelem (); |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
554 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
|
555 "OCTAVE_RANGE_NELEM", &nel) >= 0; |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
556 } |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
557 else |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
558 retval = false; |
| 4687 | 559 |
| 560 H5Dclose (data_hid); | |
| 561 H5Tclose (type_hid); | |
| 562 H5Sclose (space_hid); | |
| 4837 | 563 |
| 4687 | 564 return retval; |
| 565 } | |
| 566 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
567 bool |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9146
diff
changeset
|
568 octave_range::load_hdf5 (hid_t loc_id, const char *name) |
| 4687 | 569 { |
| 570 bool retval = false; | |
| 4837 | 571 |
|
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
|
572 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
573 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
574 #else |
| 4687 | 575 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
|
576 #endif |
| 4687 | 577 hid_t type_hid = H5Dget_type (data_hid); |
| 578 | |
| 579 hid_t range_type = hdf5_make_range_type (H5T_NATIVE_DOUBLE); | |
| 580 | |
| 581 if (! hdf5_types_compatible (type_hid, range_type)) | |
| 582 { | |
| 4837 | 583 H5Tclose (range_type); |
| 4687 | 584 H5Dclose (data_hid); |
| 585 return false; | |
| 586 } | |
| 587 | |
| 588 hid_t space_hid = H5Dget_space (data_hid); | |
| 589 hsize_t rank = H5Sget_simple_extent_ndims (space_hid); | |
| 590 | |
| 591 if (rank != 0) | |
| 592 { | |
| 4837 | 593 H5Tclose (range_type); |
| 4687 | 594 H5Sclose (space_hid); |
| 595 H5Dclose (data_hid); | |
| 596 return false; | |
| 597 } | |
| 598 | |
| 599 double rangevals[3]; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
600 if (H5Dread (data_hid, range_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
601 rangevals) >= 0) |
| 4687 | 602 { |
| 603 retval = true; | |
|
11176
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
604 octave_idx_type nel; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
605 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
|
606 "OCTAVE_RANGE_NELEM", &nel)) |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
607 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
|
608 else |
|
11176
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
609 { |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
610 if (rangevals[2] != 0) |
|
2271261f088a
Address precision issue in ranges saved to HDF5 files
David Bateman <dbateman@free.fr>
parents:
11129
diff
changeset
|
611 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
|
612 else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
613 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
|
614 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
|
615 } |
| 4687 | 616 } |
| 617 | |
| 4837 | 618 H5Tclose (range_type); |
| 4687 | 619 H5Sclose (space_hid); |
| 620 H5Dclose (data_hid); | |
| 4837 | 621 |
| 4687 | 622 return retval; |
| 623 } | |
| 4944 | 624 |
| 4687 | 625 #endif |
| 626 | |
| 5900 | 627 mxArray * |
| 628 octave_range::as_mxArray (void) const | |
| 629 { | |
| 630 mxArray *retval = new mxArray (mxDOUBLE_CLASS, dims (), mxREAL); | |
| 631 | |
| 632 double *pr = static_cast<double *> (retval->get_data ()); | |
| 633 | |
| 6686 | 634 mwSize nel = numel (); |
| 5900 | 635 |
| 636 Matrix m = matrix_value (); | |
| 637 | |
| 638 const double *p = m.data (); | |
| 639 | |
| 6686 | 640 for (mwSize i = 0; i < nel; i++) |
| 5900 | 641 pr[i] = p[i]; |
| 642 | |
| 643 return retval; | |
| 644 } | |
|
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
|
645 |
|
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
|
646 DEFUN (allow_noninteger_range_as_index, args, nargout, |
|
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
|
647 "-*- texinfo -*-\n\ |
| 10840 | 648 @deftypefn {Built-in Function} {@var{val} =} allow_noninteger_range_as_index ()\n\ |
|
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
|
649 @deftypefnx {Built-in Function} {@var{old_val} =} allow_noninteger_range_as_index (@var{new_val})\n\ |
|
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
|
650 Query or set the internal variable that controls whether non-integer\n\ |
|
10711
fbd7843974fa
Periodic grammar check of documentation files to ensure common format.
Rik <octave@nomad.inbox5.com>
parents:
10616
diff
changeset
|
651 ranges are allowed as indices. This might be useful for @sc{matlab}\n\ |
|
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
|
652 compatibility; however, it is still not entirely compatible because\n\ |
|
10711
fbd7843974fa
Periodic grammar check of documentation files to ensure common format.
Rik <octave@nomad.inbox5.com>
parents:
10616
diff
changeset
|
653 @sc{matlab} treats the range expression differently in different contexts.\n\ |
|
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
|
654 @end deftypefn") |
|
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
|
655 { |
|
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
|
656 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
|
657 } |
|
12863
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
658 |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
659 /* |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
660 %!test |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
661 %! x = 0:10; |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
662 %! save = allow_noninteger_range_as_index (0); |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
663 %! fail ('x(2.1:5)'); |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
664 %! assert (x(2:5), 1:4); |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
665 %! allow_noninteger_range_as_index (1); |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
666 %! assert (x(2.49:5), 1:3); |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
667 %! assert (x(2.5:5), 2:4); |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
668 %! assert (x(2.51:5), 2:4); |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
669 %! allow_noninteger_range_as_index (save); |
|
8f9702abe3e3
test: Add validation for allow_noninteger_range_as_index()
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
670 */ |