Mercurial > hg > octave-nkf
comparison liboctave/dNDArray.h @ 4902:bd043a433918
[project @ 2004-06-14 18:46:20 by jwe]
author | jwe |
---|---|
date | Mon, 14 Jun 2004 18:49:09 +0000 |
parents | 9f7ef92b50b0 |
children | c638c144d4da |
comparison
equal
deleted
inserted
replaced
4901:35bfb4e0b96b | 4902:bd043a433918 |
---|---|
27 #pragma interface | 27 #pragma interface |
28 #endif | 28 #endif |
29 | 29 |
30 #include "MArrayN.h" | 30 #include "MArrayN.h" |
31 #include "dMatrix.h" | 31 #include "dMatrix.h" |
32 #include "intNDArray.h" | |
32 | 33 |
33 #include "mx-defs.h" | 34 #include "mx-defs.h" |
34 #include "mx-op-defs.h" | 35 #include "mx-op-defs.h" |
35 | 36 |
36 #include "data-conv.h" | 37 #include "data-conv.h" |
52 | 53 |
53 NDArray (const Matrix& a) : MArrayN<double> (a) { } | 54 NDArray (const Matrix& a) : MArrayN<double> (a) { } |
54 | 55 |
55 NDArray (const MArrayN<double>& a) : MArrayN<double> (a) { } | 56 NDArray (const MArrayN<double>& a) : MArrayN<double> (a) { } |
56 | 57 |
57 NDArray (const ArrayN<double>& a) : MArrayN<double> (a) { } | 58 template <class U> |
58 | 59 explicit NDArray (const intNDArray<U>& a) : MArrayN<double> (a) { } |
59 explicit NDArray (const boolNDArray& a); | |
60 | |
61 explicit NDArray (const charNDArray& a); | |
62 | 60 |
63 NDArray& operator = (const NDArray& a) | 61 NDArray& operator = (const NDArray& a) |
64 { | 62 { |
65 MArrayN<double>::operator = (a); | 63 MArrayN<double>::operator = (a); |
66 return *this; | 64 return *this; |
107 friend NDArray real (const ComplexNDArray& a); | 105 friend NDArray real (const ComplexNDArray& a); |
108 friend NDArray imag (const ComplexNDArray& a); | 106 friend NDArray imag (const ComplexNDArray& a); |
109 | 107 |
110 Matrix matrix_value (void) const; | 108 Matrix matrix_value (void) const; |
111 | 109 |
112 NDArray squeeze (void) const { return ArrayN<double>::squeeze (); } | 110 NDArray squeeze (void) const { return MArrayN<double>::squeeze (); } |
113 | 111 |
114 static void increment_index (Array<int>& ra_idx, | 112 static void increment_index (Array<int>& ra_idx, |
115 const dim_vector& dimensions, | 113 const dim_vector& dimensions, |
116 int start_dimension = 0); | 114 int start_dimension = 0); |
117 | 115 |