Mercurial > hg > octave-lyh

comparison liboctave/chNDArray.h @ 9732:b4fdfee405b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove ArrayN<T> + fix nonhom. diag-scalar ops
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 16 Oct 2009 13:12:31 +0200
parents b29504415a2e
children f80c566bc751
comparison
equal deleted inserted replaced
9731:7b9cbaad68d6 9732:b4fdfee405b5
53 53
54 charNDArray (const std::string& s) : MArrayN<char> (charMatrix (s)) { } 54 charNDArray (const std::string& s) : MArrayN<char> (charMatrix (s)) { }
55 55
56 charNDArray (const string_vector& s) : MArrayN<char> (charMatrix (s)) { } 56 charNDArray (const string_vector& s) : MArrayN<char> (charMatrix (s)) { }
57 57
58 charNDArray (const ArrayN<char>& a) : MArrayN<char> (a) { } 58 charNDArray (const Array<char>& a) : MArrayN<char> (a) { }
59 59
60 charNDArray& operator = (const charNDArray& a) 60 charNDArray& operator = (const charNDArray& a)
61 { 61 {
62 MArrayN<char>::operator = (a); 62 MArrayN<char>::operator = (a);
63 return *this; 63 return *this;
75 charNDArray& insert (const charNDArray& a, octave_idx_type r, octave_idx_type c); 75 charNDArray& insert (const charNDArray& a, octave_idx_type r, octave_idx_type c);
76 charNDArray& insert (const charNDArray& a, const Array<octave_idx_type>& ra_idx); 76 charNDArray& insert (const charNDArray& a, const Array<octave_idx_type>& ra_idx);
77 77
78 charMatrix matrix_value (void) const; 78 charMatrix matrix_value (void) const;
79 79
80 charNDArray squeeze (void) const { return ArrayN<char>::squeeze (); } 80 charNDArray squeeze (void) const { return Array<char>::squeeze (); }
81 81
82 static void increment_index (Array<octave_idx_type>& ra_idx, 82 static void increment_index (Array<octave_idx_type>& ra_idx,
83 const dim_vector& dimensions, 83 const dim_vector& dimensions,
84 int start_dimension = 0); 84 int start_dimension = 0);
85 85