Mercurial > octave
diff liboctave/idx-vector.h @ 9894:83bd7f34f9da
improve idx_vector->octave_value conversion
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Tue, 01 Dec 2009 10:41:52 +0100 |
| parents | cddd5c3d5f04 |
| children | 43a29eeda994 |
line wrap: on
line diff
--- a/liboctave/idx-vector.h Mon Nov 30 16:17:04 2009 -0800 +++ b/liboctave/idx-vector.h Tue Dec 01 10:41:52 2009 +0100 @@ -195,6 +195,8 @@ std::ostream& print (std::ostream& os) const; + Range unconvert (void) const; + private: DECLARE_OCTAVE_ALLOCATOR @@ -248,6 +250,8 @@ std::ostream& print (std::ostream& os) const; + double unconvert (void) const; + private: DECLARE_OCTAVE_ALLOCATOR @@ -308,6 +312,8 @@ std::ostream& print (std::ostream& os) const; + Array<double> unconvert (void) const; + private: DECLARE_OCTAVE_ALLOCATOR @@ -373,6 +379,8 @@ std::ostream& print (std::ostream& os) const; + Array<bool> unconvert (void) const; + private: DECLARE_OCTAVE_ALLOCATOR @@ -927,10 +935,10 @@ // If the index is a mask, convert it to index vector. idx_vector unmask (void) const; - // Unconverts the index to a scalar, Range or double array. - // Note that the index class can be changed, if it's a mask index. + // Unconverts the index to a scalar, Range, double array or a mask. void unconvert (idx_class_type& iclass, - double& scalar, Range& range, Array<double>& array); + double& scalar, Range& range, + Array<double>& array, Array<bool>& mask) const; // FIXME -- these are here for compatibility. They should be removed // when no longer in use.