comparison liboctave/fNDArray.h @ 8981:ed5055b0a476

fix & simplify ndarray->matrix conversions
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 14 Mar 2009 19:42:50 +0100
parents d91fa4b20bbb
children a48fba01e4ac
comparison
equal deleted inserted replaced
8980:80d499b82ff3 8981:ed5055b0a476
119 friend OCTAVE_API FloatNDArray real (const FloatComplexNDArray& a); 119 friend OCTAVE_API FloatNDArray real (const FloatComplexNDArray& a);
120 friend OCTAVE_API FloatNDArray imag (const FloatComplexNDArray& a); 120 friend OCTAVE_API FloatNDArray imag (const FloatComplexNDArray& a);
121 121
122 friend class FloatComplexNDArray; 122 friend class FloatComplexNDArray;
123 123
124 Matrix matrix_value (void) const; 124 FloatMatrix matrix_value (void) const;
125 125
126 FloatNDArray squeeze (void) const { return MArrayN<float>::squeeze (); } 126 FloatNDArray squeeze (void) const { return MArrayN<float>::squeeze (); }
127 127
128 static void increment_index (Array<octave_idx_type>& ra_idx, 128 static void increment_index (Array<octave_idx_type>& ra_idx,
129 const dim_vector& dimensions, 129 const dim_vector& dimensions,