comparison liboctave/dMatrix.h @ 11570:57632dea2446

attempt better backward compatibility for Array constructors
author John W. Eaton <jwe@octave.org>
date Wed, 19 Jan 2011 17:55:56 -0500
parents fd0a3ac60b0e
children a83bad07f7e3
comparison
equal deleted inserted replaced
11569:7e9a111cae20 11570:57632dea2446
42 42
43 typedef void (*solve_singularity_handler) (double rcon); 43 typedef void (*solve_singularity_handler) (double rcon);
44 44
45 Matrix (void) : MArray<double> () { } 45 Matrix (void) : MArray<double> () { }
46 46
47 Matrix (octave_idx_type r, octave_idx_type c) : MArray<double> (r, c) { } 47 Matrix (octave_idx_type r, octave_idx_type c)
48 48 : MArray<double> (dim_vector (r, c)) { }
49 Matrix (octave_idx_type r, octave_idx_type c, double val) : MArray<double> (r, c, val) { } 49
50 Matrix (octave_idx_type r, octave_idx_type c, double val)
51 : MArray<double> (dim_vector (r, c), val) { }
50 52
51 Matrix (const dim_vector& dv) : MArray<double> (dv.redim (2)) { } 53 Matrix (const dim_vector& dv) : MArray<double> (dv.redim (2)) { }
52 54
53 Matrix (const dim_vector& dv, double val) : MArray<double> (dv.redim (2), val) { } 55 Matrix (const dim_vector& dv, double val)
56 : MArray<double> (dv.redim (2), val) { }
54 57
55 Matrix (const Matrix& a) : MArray<double> (a) { } 58 Matrix (const Matrix& a) : MArray<double> (a) { }
56 59
57 template <class U> 60 template <class U>
58 Matrix (const MArray<U>& a) : MArray<double> (a.as_matrix ()) { } 61 Matrix (const MArray<U>& a) : MArray<double> (a.as_matrix ()) { }