Mercurial > octave-nkf

comparison libinterp/octave-value/ov-range.h @ 17787:175b392e91fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use GNU style coding conventions for code in libinterp/ * libinterp/corefcn/Cell.h, libinterp/corefcn/__contourc__.cc, libinterp/corefcn/__dispatch__.cc, libinterp/corefcn/__lin_interpn__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc, libinterp/corefcn/balance.cc, libinterp/corefcn/besselj.cc, libinterp/corefcn/betainc.cc, libinterp/corefcn/bitfcns.cc, libinterp/corefcn/bsxfun.cc, libinterp/corefcn/c-file-ptr-stream.cc, libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/cellfun.cc, libinterp/corefcn/colloc.cc, libinterp/corefcn/comment-list.h, libinterp/corefcn/conv2.cc, libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/data.cc, libinterp/corefcn/debug.cc, libinterp/corefcn/defaults.cc, libinterp/corefcn/defaults.in.h, libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc, libinterp/corefcn/det.cc, libinterp/corefcn/dirfns.cc, libinterp/corefcn/display.cc, libinterp/corefcn/dlmread.cc, libinterp/corefcn/dot.cc, libinterp/corefcn/dynamic-ld.cc, libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/eig.cc, libinterp/corefcn/ellipj.cc, libinterp/corefcn/error.cc, libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h, libinterp/corefcn/fft.cc, libinterp/corefcn/fft2.cc, libinterp/corefcn/fftn.cc, libinterp/corefcn/file-io.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gammainc.cc, libinterp/corefcn/gcd.cc, libinterp/corefcn/getgrent.cc, libinterp/corefcn/getpwent.cc, libinterp/corefcn/getrusage.cc, libinterp/corefcn/givens.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h, libinterp/corefcn/help.cc, libinterp/corefcn/hess.cc, libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc, libinterp/corefcn/input.h, libinterp/corefcn/inv.cc, libinterp/corefcn/jit-ir.h, libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/jit-util.h, libinterp/corefcn/kron.cc, libinterp/corefcn/load-path.cc, libinterp/corefcn/load-path.h, libinterp/corefcn/load-save.cc, libinterp/corefcn/load-save.h, libinterp/corefcn/lookup.cc, libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-hdf5.h, libinterp/corefcn/ls-mat-ascii.cc, libinterp/corefcn/ls-mat-ascii.h, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h, libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/lsode.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc, libinterp/corefcn/mappers.cc, libinterp/corefcn/matrix_type.cc, libinterp/corefcn/max.cc, libinterp/corefcn/md5sum.cc, libinterp/corefcn/mex.cc, libinterp/corefcn/mexproto.h, libinterp/corefcn/mgorth.cc, libinterp/corefcn/mxarray.in.h, libinterp/corefcn/nproc.cc, libinterp/corefcn/oct-hist.cc, libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-stdstrm.h, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h, libinterp/corefcn/octave-link.cc, libinterp/corefcn/octave-link.h, libinterp/corefcn/pager.cc, libinterp/corefcn/pinv.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/procstream.h, libinterp/corefcn/profiler.cc, libinterp/corefcn/pt-jit.cc, libinterp/corefcn/pt-jit.h, libinterp/corefcn/quad.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/qz.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/rcond.cc, libinterp/corefcn/regexp.cc, libinterp/corefcn/schur.cc, libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sighandlers.h, libinterp/corefcn/sparse-xdiv.cc, libinterp/corefcn/sparse-xdiv.h, libinterp/corefcn/sparse-xpow.cc, libinterp/corefcn/sparse.cc, libinterp/corefcn/spparms.cc, libinterp/corefcn/sqrtm.cc, libinterp/corefcn/str2double.cc, libinterp/corefcn/strfind.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc, libinterp/corefcn/svd.cc, libinterp/corefcn/syl.cc, libinterp/corefcn/symtab.cc, libinterp/corefcn/symtab.h, libinterp/corefcn/syscalls.cc, libinterp/corefcn/sysdep.cc, libinterp/corefcn/sysdep.h, libinterp/corefcn/time.cc, libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h, libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc, libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h, libinterp/corefcn/typecast.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/variables.h, libinterp/corefcn/xdiv.cc, libinterp/corefcn/xdiv.h, libinterp/corefcn/xnorm.h, libinterp/corefcn/xpow.cc, libinterp/corefcn/xpow.h, libinterp/corefcn/zfstream.cc, libinterp/corefcn/zfstream.h, libinterp/dldfcn/__delaunayn__.cc, libinterp/dldfcn/__dsearchn__.cc, libinterp/dldfcn/__eigs__.cc, libinterp/dldfcn/__fltk_uigetfile__.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__init_gnuplot__.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/dldfcn/amd.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/chol.cc, libinterp/dldfcn/colamd.cc, libinterp/dldfcn/convhulln.cc, libinterp/dldfcn/dmperm.cc, libinterp/dldfcn/fftw.cc, libinterp/dldfcn/qr.cc, libinterp/dldfcn/symbfact.cc, libinterp/dldfcn/symrcm.cc, libinterp/dldfcn/tsearch.cc, libinterp/octave-value/ov-base-diag.cc, libinterp/octave-value/ov-base-diag.h, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-base-int.h, libinterp/octave-value/ov-base-mat.h, libinterp/octave-value/ov-base-scalar.cc, libinterp/octave-value/ov-base-scalar.h, libinterp/octave-value/ov-base-sparse.cc, libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.cc, libinterp/octave-value/ov-base.h, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-bool-mat.h, libinterp/octave-value/ov-bool-sparse.cc, libinterp/octave-value/ov-bool-sparse.h, libinterp/octave-value/ov-bool.cc, libinterp/octave-value/ov-bool.h, libinterp/octave-value/ov-builtin.cc, libinterp/octave-value/ov-builtin.h, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-cell.h, libinterp/octave-value/ov-ch-mat.cc, libinterp/octave-value/ov-ch-mat.h, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-colon.h, libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-complex.h, libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-diag.h, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-mat.h, libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-cx-sparse.h, libinterp/octave-value/ov-dld-fcn.h, libinterp/octave-value/ov-fcn-handle.cc, libinterp/octave-value/ov-fcn-handle.h, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-fcn-inline.h, libinterp/octave-value/ov-fcn.h, libinterp/octave-value/ov-float.cc, libinterp/octave-value/ov-float.h, libinterp/octave-value/ov-flt-complex.cc, libinterp/octave-value/ov-flt-complex.h, libinterp/octave-value/ov-flt-cx-diag.cc, libinterp/octave-value/ov-flt-cx-diag.h, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-cx-mat.h, libinterp/octave-value/ov-flt-re-diag.cc, libinterp/octave-value/ov-flt-re-diag.h, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-flt-re-mat.h, libinterp/octave-value/ov-int16.cc, libinterp/octave-value/ov-int32.cc, libinterp/octave-value/ov-int64.cc, libinterp/octave-value/ov-int8.cc, libinterp/octave-value/ov-intx.h, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-lazy-idx.h, libinterp/octave-value/ov-mex-fcn.cc, libinterp/octave-value/ov-mex-fcn.h, libinterp/octave-value/ov-null-mat.cc, libinterp/octave-value/ov-null-mat.h, libinterp/octave-value/ov-oncleanup.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-perm.h, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-diag.cc, libinterp/octave-value/ov-re-diag.h, libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-re-mat.h, libinterp/octave-value/ov-re-sparse.cc, libinterp/octave-value/ov-re-sparse.h, libinterp/octave-value/ov-scalar.cc, libinterp/octave-value/ov-scalar.h, libinterp/octave-value/ov-str-mat.cc, libinterp/octave-value/ov-str-mat.h, libinterp/octave-value/ov-struct.cc, libinterp/octave-value/ov-struct.h, libinterp/octave-value/ov-type-conv.h, libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov-typeinfo.h, libinterp/octave-value/ov-uint16.cc, libinterp/octave-value/ov-uint32.cc, libinterp/octave-value/ov-uint64.cc, libinterp/octave-value/ov-uint8.cc, libinterp/octave-value/ov-usr-fcn.cc, libinterp/octave-value/ov-usr-fcn.h, libinterp/octave-value/ov.cc, libinterp/octave-value/ov.h, libinterp/octave.cc, libinterp/operators/op-b-bm.cc, libinterp/operators/op-b-sbm.cc, libinterp/operators/op-bm-b.cc, libinterp/operators/op-bm-bm.cc, libinterp/operators/op-cdm-cdm.cc, libinterp/operators/op-chm.cc, libinterp/operators/op-class.cc, libinterp/operators/op-cm-cm.cc, libinterp/operators/op-cm-cs.cc, libinterp/operators/op-cm-s.cc, libinterp/operators/op-cm-scm.cc, libinterp/operators/op-cm-sm.cc, libinterp/operators/op-cs-cm.cc, libinterp/operators/op-cs-cs.cc, libinterp/operators/op-cs-scm.cc, libinterp/operators/op-cs-sm.cc, libinterp/operators/op-dm-dm.cc, libinterp/operators/op-dm-scm.cc, libinterp/operators/op-double-conv.cc, libinterp/operators/op-fcdm-fcdm.cc, libinterp/operators/op-fcm-fcm.cc, libinterp/operators/op-fcm-fcs.cc, libinterp/operators/op-fcm-fm.cc, libinterp/operators/op-fcm-fs.cc, libinterp/operators/op-fcs-fcm.cc, libinterp/operators/op-fcs-fcs.cc, libinterp/operators/op-fcs-fm.cc, libinterp/operators/op-fcs-fs.cc, libinterp/operators/op-fdm-fdm.cc, libinterp/operators/op-float-conv.cc, libinterp/operators/op-fm-fcm.cc, libinterp/operators/op-fm-fcs.cc, libinterp/operators/op-fm-fm.cc, libinterp/operators/op-fm-fs.cc, libinterp/operators/op-fs-fcm.cc, libinterp/operators/op-fs-fcs.cc, libinterp/operators/op-fs-fm.cc, libinterp/operators/op-fs-fs.cc, libinterp/operators/op-m-cm.cc, libinterp/operators/op-m-cs.cc, libinterp/operators/op-m-m.cc, libinterp/operators/op-m-s.cc, libinterp/operators/op-m-scm.cc, libinterp/operators/op-m-sm.cc, libinterp/operators/op-pm-scm.cc, libinterp/operators/op-range.cc, libinterp/operators/op-s-cm.cc, libinterp/operators/op-s-cs.cc, libinterp/operators/op-s-scm.cc, libinterp/operators/op-sbm-b.cc, libinterp/operators/op-sbm-bm.cc, libinterp/operators/op-sbm-sbm.cc, libinterp/operators/op-scm-cm.cc, libinterp/operators/op-scm-cs.cc, libinterp/operators/op-scm-m.cc, libinterp/operators/op-scm-s.cc, libinterp/operators/op-scm-scm.cc, libinterp/operators/op-scm-sm.cc, libinterp/operators/op-sm-cm.cc, libinterp/operators/op-sm-m.cc, libinterp/operators/op-sm-s.cc, libinterp/operators/op-sm-scm.cc, libinterp/operators/op-sm-sm.cc, libinterp/operators/op-str-m.cc, libinterp/operators/op-str-s.cc, libinterp/operators/op-str-str.cc, libinterp/operators/ops.h, libinterp/parse-tree/lex.h, libinterp/parse-tree/parse.h, libinterp/parse-tree/pt-arg-list.cc, libinterp/parse-tree/pt-arg-list.h, libinterp/parse-tree/pt-assign.cc, libinterp/parse-tree/pt-assign.h, libinterp/parse-tree/pt-binop.cc, libinterp/parse-tree/pt-binop.h, libinterp/parse-tree/pt-bp.h, libinterp/parse-tree/pt-cbinop.cc, libinterp/parse-tree/pt-check.cc, libinterp/parse-tree/pt-colon.cc, libinterp/parse-tree/pt-colon.h, libinterp/parse-tree/pt-const.cc, libinterp/parse-tree/pt-decl.cc, libinterp/parse-tree/pt-decl.h, libinterp/parse-tree/pt-eval.cc, libinterp/parse-tree/pt-except.h, libinterp/parse-tree/pt-exp.h, libinterp/parse-tree/pt-fcn-handle.cc, libinterp/parse-tree/pt-id.cc, libinterp/parse-tree/pt-id.h, libinterp/parse-tree/pt-idx.cc, libinterp/parse-tree/pt-idx.h, libinterp/parse-tree/pt-loop.h, libinterp/parse-tree/pt-mat.cc, libinterp/parse-tree/pt-misc.cc, libinterp/parse-tree/pt-misc.h, libinterp/parse-tree/pt-pr-code.cc, libinterp/parse-tree/pt-select.h, libinterp/parse-tree/pt-stmt.h, libinterp/parse-tree/token.h, libinterp/version.cc: Use GNU style coding conventions for code in libinterp/
author Rik <rik@octave.org>
date Mon, 28 Oct 2013 19:51:46 -0700
parents d63878346099
children ebb3ef964372
comparison
equal deleted inserted replaced
17786:34d9812a943b 17787:175b392e91fe
56 octave_range (void) 56 octave_range (void)
57 : octave_base_value (), range (), idx_cache () { } 57 : octave_base_value (), range (), idx_cache () { }
58 58
59 octave_range (double base, double limit, double inc) 59 octave_range (double base, double limit, double inc)
60 : octave_base_value (), range (base, limit, inc), idx_cache () 60 : octave_base_value (), range (base, limit, inc), idx_cache ()
61 { 61 {
62 if (range.nelem () < 0) 62 if (range.nelem () < 0)
63 ::error ("invalid range"); 63 ::error ("invalid range");
64 } 64 }
65 65
66 octave_range (const Range& r) 66 octave_range (const Range& r)
67 : octave_base_value (), range (r), idx_cache () 67 : octave_base_value (), range (r), idx_cache ()
68 { 68 {
69 if (range.nelem () < 0 && range.nelem () != -2) 69 if (range.nelem () < 0 && range.nelem () != -2)
70 ::error ("invalid range"); 70 ::error ("invalid range");
71 } 71 }
72 72
73 octave_range (const octave_range& r) 73 octave_range (const octave_range& r)
74 : octave_base_value (), range (r.range), 74 : octave_base_value (), range (r.range),
75 idx_cache (r.idx_cache ? new idx_vector (*r.idx_cache) : 0) 75 idx_cache (r.idx_cache ? new idx_vector (*r.idx_cache) : 0)
76 { } 76 { }
77 77
78 octave_range (const Range& r, const idx_vector& cache) 78 octave_range (const Range& r, const idx_vector& cache)
79 : octave_base_value (), range (r), idx_cache () 79 : octave_base_value (), range (r), idx_cache ()
80 { 80 {
81 set_idx_cache (cache); 81 set_idx_cache (cache);
82 } 82 }
83 83
84 ~octave_range (void) { clear_cached_info (); } 84 ~octave_range (void) { clear_cached_info (); }
85 85
86 octave_base_value *clone (void) const { return new octave_range (*this); } 86 octave_base_value *clone (void) const { return new octave_range (*this); }
87 87
97 octave_value subsref (const std::string& type, 97 octave_value subsref (const std::string& type,
98 const std::list<octave_value_list>& idx); 98 const std::list<octave_value_list>& idx);
99 99
100 octave_value_list subsref (const std::string& type, 100 octave_value_list subsref (const std::string& type,
101 const std::list<octave_value_list>& idx, int) 101 const std::list<octave_value_list>& idx, int)
102 { return subsref (type, idx); } 102 { return subsref (type, idx); }
103 103
104 octave_value do_index_op (const octave_value_list& idx, 104 octave_value do_index_op (const octave_value_list& idx,
105 bool resize_ok = false); 105 bool resize_ok = false);
106 106
107 idx_vector index_vector (void) const; 107 idx_vector index_vector (void) const;
108 108
109 dim_vector dims (void) const 109 dim_vector dims (void) const
110 { 110 {
111 octave_idx_type n = range.nelem (); 111 octave_idx_type n = range.nelem ();
112 return dim_vector (n > 0, n); 112 return dim_vector (n > 0, n);
113 } 113 }
114 114
115 octave_value resize (const dim_vector& dv, bool fill = false) const; 115 octave_value resize (const dim_vector& dv, bool fill = false) const;
116 116
117 117
118 size_t byte_size (void) const { return 3 * sizeof (double); } 118 size_t byte_size (void) const { return 3 * sizeof (double); }
119 119
120 octave_value reshape (const dim_vector& new_dims) const 120 octave_value reshape (const dim_vector& new_dims) const
121 { return NDArray (array_value ().reshape (new_dims)); } 121 { return NDArray (array_value ().reshape (new_dims)); }
122 122
123 octave_value permute (const Array<int>& vec, bool inv = false) const 123 octave_value permute (const Array<int>& vec, bool inv = false) const
124 { return NDArray (array_value ().permute (vec, inv)); } 124 { return NDArray (array_value ().permute (vec, inv)); }
125 125
126 octave_value squeeze (void) const { return range; } 126 octave_value squeeze (void) const { return range; }
127 127
128 octave_value full_value (void) const { return range.matrix_value (); } 128 octave_value full_value (void) const { return range.matrix_value (); }
129 129
140 octave_value diag (octave_idx_type k = 0) const; 140 octave_value diag (octave_idx_type k = 0) const;
141 141
142 octave_value diag (octave_idx_type m, octave_idx_type n) const; 142 octave_value diag (octave_idx_type m, octave_idx_type n) const;
143 143
144 octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const 144 octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const
145 { return range.sort (dim, mode); } 145 { return range.sort (dim, mode); }
146 146
147 octave_value sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0, 147 octave_value sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0,
148 sortmode mode = ASCENDING) const 148 sortmode mode = ASCENDING) const
149 { return range.sort (sidx, dim, mode); } 149 { return range.sort (sidx, dim, mode); }
150 150
151 sortmode is_sorted (sortmode mode = UNSORTED) const 151 sortmode is_sorted (sortmode mode = UNSORTED) const
152 { return range.is_sorted (mode); } 152 { return range.is_sorted (mode); }
153 153
154 Array<octave_idx_type> sort_rows_idx (sortmode) const 154 Array<octave_idx_type> sort_rows_idx (sortmode) const
155 { return Array<octave_idx_type> (dim_vector (1, 0)); } 155 { return Array<octave_idx_type> (dim_vector (1, 0)); }
156 156
157 sortmode is_sorted_rows (sortmode mode = UNSORTED) const 157 sortmode is_sorted_rows (sortmode mode = UNSORTED) const
158 { return mode ? mode : ASCENDING; } 158 { return mode ? mode : ASCENDING; }
159 159
160 builtin_type_t builtin_type (void) const { return btyp_double; } 160 builtin_type_t builtin_type (void) const { return btyp_double; }
161 161
162 bool is_real_type (void) const { return true; } 162 bool is_real_type (void) const { return true; }
163 163
172 double double_value (bool = false) const; 172 double double_value (bool = false) const;
173 173
174 float float_value (bool = false) const; 174 float float_value (bool = false) const;
175 175
176 double scalar_value (bool frc_str_conv = false) const 176 double scalar_value (bool frc_str_conv = false) const
177 { return double_value (frc_str_conv); } 177 { return double_value (frc_str_conv); }
178 178
179 float float_scalar_value (bool frc_str_conv = false) const 179 float float_scalar_value (bool frc_str_conv = false) const
180 { return float_value (frc_str_conv); } 180 { return float_value (frc_str_conv); }
181 181
182 Matrix matrix_value (bool = false) const 182 Matrix matrix_value (bool = false) const
183 { return range.matrix_value (); } 183 { return range.matrix_value (); }
184 184
185 FloatMatrix float_matrix_value (bool = false) const 185 FloatMatrix float_matrix_value (bool = false) const
186 { return range.matrix_value (); } 186 { return range.matrix_value (); }
187 187
188 NDArray array_value (bool = false) const 188 NDArray array_value (bool = false) const
189 { return range.matrix_value (); } 189 { return range.matrix_value (); }
190 190
191 FloatNDArray float_array_value (bool = false) const 191 FloatNDArray float_array_value (bool = false) const
192 { return FloatMatrix (range.matrix_value ()); } 192 { return FloatMatrix (range.matrix_value ()); }
193 193
194 charNDArray char_array_value (bool = false) const; 194 charNDArray char_array_value (bool = false) const;
195 195
196 // FIXME -- it would be better to have Range::intXNDArray_value 196 // FIXME: it would be better to have Range::intXNDArray_value
197 // functions to avoid the intermediate conversion to a matrix 197 // functions to avoid the intermediate conversion to a matrix
198 // object. 198 // object.
199 199
200 int8NDArray 200 int8NDArray
201 int8_array_value (void) const { return int8NDArray (array_value ()); } 201 int8_array_value (void) const { return int8NDArray (array_value ()); }
220 220
221 uint64NDArray 221 uint64NDArray
222 uint64_array_value (void) const { return uint64NDArray (array_value ()); } 222 uint64_array_value (void) const { return uint64NDArray (array_value ()); }
223 223
224 SparseMatrix sparse_matrix_value (bool = false) const 224 SparseMatrix sparse_matrix_value (bool = false) const
225 { return SparseMatrix (range.matrix_value ()); } 225 { return SparseMatrix (range.matrix_value ()); }
226 226
227 SparseComplexMatrix sparse_complex_matrix_value (bool = false) const 227 SparseComplexMatrix sparse_complex_matrix_value (bool = false) const
228 { return SparseComplexMatrix (sparse_matrix_value ()); } 228 { return SparseComplexMatrix (sparse_matrix_value ()); }
229 229
230 Complex complex_value (bool = false) const; 230 Complex complex_value (bool = false) const;
231 231
232 FloatComplex float_complex_value (bool = false) const; 232 FloatComplex float_complex_value (bool = false) const;
233 233
234 boolNDArray bool_array_value (bool warn = false) const; 234 boolNDArray bool_array_value (bool warn = false) const;
235 235
236 ComplexMatrix complex_matrix_value (bool = false) const 236 ComplexMatrix complex_matrix_value (bool = false) const
237 { return ComplexMatrix (range.matrix_value ()); } 237 { return ComplexMatrix (range.matrix_value ()); }
238 238
239 FloatComplexMatrix float_complex_matrix_value (bool = false) const 239 FloatComplexMatrix float_complex_matrix_value (bool = false) const
240 { return FloatComplexMatrix (range.matrix_value ()); } 240 { return FloatComplexMatrix (range.matrix_value ()); }
241 241
242 ComplexNDArray complex_array_value (bool = false) const 242 ComplexNDArray complex_array_value (bool = false) const
243 { return ComplexMatrix (range.matrix_value ()); } 243 { return ComplexMatrix (range.matrix_value ()); }
244 244
245 FloatComplexNDArray float_complex_array_value (bool = false) const 245 FloatComplexNDArray float_complex_array_value (bool = false) const
246 { return FloatComplexMatrix (range.matrix_value ()); } 246 { return FloatComplexMatrix (range.matrix_value ()); }
247 247
248 Range range_value (void) const { return range; } 248 Range range_value (void) const { return range; }
249 249
250 octave_value convert_to_str_internal (bool pad, bool force, char type) const; 250 octave_value convert_to_str_internal (bool pad, bool force, char type) const;
251 251
273 #endif 273 #endif
274 274
275 int write (octave_stream& os, int block_size, 275 int write (octave_stream& os, int block_size,
276 oct_data_conv::data_type output_type, int skip, 276 oct_data_conv::data_type output_type, int skip,
277 oct_mach_info::float_format flt_fmt) const 277 oct_mach_info::float_format flt_fmt) const
278 { 278 {
279 // FIXME -- could be more memory efficient by having a 279 // FIXME: could be more memory efficient by having a
280 // special case of the octave_stream::write method for ranges. 280 // special case of the octave_stream::write method for ranges.
281 281
282 return os.write (matrix_value (), block_size, output_type, skip, 282 return os.write (matrix_value (), block_size, output_type, skip, flt_fmt);
283 flt_fmt); 283 }
284 }
285 284
286 mxArray *as_mxArray (void) const; 285 mxArray *as_mxArray (void) const;
287 286
288 octave_value map (unary_mapper_t umap) const 287 octave_value map (unary_mapper_t umap) const
289 { 288 {
290 octave_matrix m (matrix_value ()); 289 octave_matrix m (matrix_value ());
291 return m.map (umap); 290 return m.map (umap);
292 } 291 }
293 292
294 private: 293 private:
295 294
296 Range range; 295 Range range;
297 296
298 idx_vector set_idx_cache (const idx_vector& idx) const 297 idx_vector set_idx_cache (const idx_vector& idx) const
299 { 298 {
300 delete idx_cache; 299 delete idx_cache;
301 idx_cache = idx ? new idx_vector (idx) : 0; 300 idx_cache = idx ? new idx_vector (idx) : 0;
302 return idx; 301 return idx;
303 } 302 }
304 303
305 void clear_cached_info (void) const 304 void clear_cached_info (void) const
306 { 305 {
307 delete idx_cache; idx_cache = 0; 306 delete idx_cache; idx_cache = 0;
308 } 307 }
309 308
310 mutable idx_vector *idx_cache; 309 mutable idx_vector *idx_cache;
311 310
312 // No assignment. 311 // No assignment.
313 312