# HG changeset patch # User Jaroslav Hajek # Date 1268812006 -3600 # Node ID 6c19d6fcd7e551593e44fbe0d2c9cbca5f31db2f # Parent ad29dbbc3f709abd18b61ed65920fbc4bcbbfd70 up to 7th-order dim_vector constructors diff -r ad29dbbc3f70 -r 6c19d6fcd7e5 liboctave/ChangeLog --- a/liboctave/ChangeLog Tue Mar 16 17:03:55 2010 -0400 +++ b/liboctave/ChangeLog Wed Mar 17 08:46:46 2010 +0100 @@ -1,3 +1,7 @@ +2010-03-17 Jaroslav Hajek + + * dim-vector.h: Provide constructors up to order 7. + 2010-03-16 Jaroslav Hajek * lo-specfun.cc: Substitute cbrt and cbrtf if needed. diff -r ad29dbbc3f70 -r 6c19d6fcd7e5 liboctave/dim-vector.h --- a/liboctave/dim-vector.h Tue Mar 16 17:03:55 2010 -0400 +++ b/liboctave/dim-vector.h Wed Mar 17 08:46:46 2010 +0100 @@ -140,14 +140,14 @@ rep[1] = 1; } - explicit dim_vector (octave_idx_type r, octave_idx_type c) + dim_vector (octave_idx_type r, octave_idx_type c) : rep (newrep (2)) { rep[0] = r; rep[1] = c; } - explicit dim_vector (octave_idx_type r, octave_idx_type c, octave_idx_type p) + dim_vector (octave_idx_type r, octave_idx_type c, octave_idx_type p) : rep (newrep (3)) { rep[0] = r; @@ -155,6 +155,53 @@ rep[2] = p; } + dim_vector (octave_idx_type r, octave_idx_type c, octave_idx_type p, + octave_idx_type q) + : rep (newrep (4)) + { + rep[0] = r; + rep[1] = c; + rep[2] = p; + rep[3] = q; + } + + dim_vector (octave_idx_type r, octave_idx_type c, octave_idx_type p, + octave_idx_type q, octave_idx_type s) + : rep (newrep (5)) + { + rep[0] = r; + rep[1] = c; + rep[2] = p; + rep[3] = q; + rep[4] = s; + } + + dim_vector (octave_idx_type r, octave_idx_type c, octave_idx_type p, + octave_idx_type q, octave_idx_type s, octave_idx_type t) + : rep (newrep (6)) + { + rep[0] = r; + rep[1] = c; + rep[2] = p; + rep[3] = q; + rep[4] = s; + rep[5] = t; + } + + dim_vector (octave_idx_type r, octave_idx_type c, octave_idx_type p, + octave_idx_type q, octave_idx_type s, octave_idx_type t, + octave_idx_type u) + : rep (newrep (7)) + { + rep[0] = r; + rep[1] = c; + rep[2] = p; + rep[3] = q; + rep[4] = s; + rep[5] = t; + rep[6] = u; + } + dim_vector (const octave_idx_type *vec, size_t vec_size) : rep (newrep (vec_size)) {