diff liboctave/CColVector.h @ 10350:12884915a8e4

merge MArray classes & improve Array interface
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 23 Jan 2010 21:41:03 +0100
parents cbc402e64d83
children a0728e81ed25
line wrap: on
line diff
--- a/liboctave/CColVector.h	Mon Feb 22 23:07:21 2010 -0500
+++ b/liboctave/CColVector.h	Sat Jan 23 21:41:03 2010 +0100
@@ -37,18 +37,20 @@
 
 public:
 
-  ComplexColumnVector (void) : MArray<Complex> () { }
+  ComplexColumnVector (void) : MArray<Complex> (0, 1) { }
 
-  explicit ComplexColumnVector (octave_idx_type n) : MArray<Complex> (n) { }
+  explicit ComplexColumnVector (octave_idx_type n) : MArray<Complex> (n, 1) { }
 
-  explicit ComplexColumnVector (const dim_vector& dv) : MArray<Complex> (dv) { }
+  explicit ComplexColumnVector (const dim_vector& dv) 
+    : MArray<Complex> (dv.as_column ()) { }
 
   ComplexColumnVector (octave_idx_type n, const Complex& val)
-    : MArray<Complex> (n, val) { }
+    : MArray<Complex> (n, 1, val) { }
 
   ComplexColumnVector (const ComplexColumnVector& a) : MArray<Complex> (a) { }
 
-  ComplexColumnVector (const MArray<Complex>& a) : MArray<Complex> (a) { }
+  ComplexColumnVector (const MArray<Complex>& a) : MArray<Complex> (a.as_column ()) { }
+  ComplexColumnVector (const Array<Complex>& a) : MArray<Complex> (a.as_column ()) { }
 
   explicit ComplexColumnVector (const ColumnVector& a);
 
@@ -124,9 +126,15 @@
   friend OCTAVE_API std::ostream& operator << (std::ostream& os, const ComplexColumnVector& a);
   friend OCTAVE_API std::istream& operator >> (std::istream& is, ComplexColumnVector& a);
 
+  void resize (octave_idx_type n, const Complex& rfv = Array<Complex>::resize_fill_value ())
+    { Array<Complex>::resize (n, 1, rfv); }
+
+  void clear (octave_idx_type n)
+    { Array<Complex>::clear (n, 1); }
+
 private:
 
-  ComplexColumnVector (Complex *d, octave_idx_type l) : MArray<Complex> (d, l) { }
+  ComplexColumnVector (Complex *d, octave_idx_type l) : MArray<Complex> (d, l, 1) { }
 };
 
 MARRAY_FORWARD_DEFS (MArray, ComplexColumnVector, Complex)