Mercurial > hg > octave-nkf

comparison liboctave/MArrayN.h @ 4513:508238e65af7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-09-19 21:40:57 by jwe]
author jwe
date Fri, 19 Sep 2003 21:41:21 +0000
parents 2bc437206787
children 7b957b442818
comparison
equal deleted inserted replaced
4512:b55eaa010770 4513:508238e65af7
27 27
28 #if !defined (octave_MArrayN_h) 28 #if !defined (octave_MArrayN_h)
29 #define octave_MArrayN_h 1 29 #define octave_MArrayN_h 1
30 30
31 #include "ArrayN.h" 31 #include "ArrayN.h"
32 // Two dimensional array with math ops. 32 #include "MArray2.h"
33 #include "dim-vector.h"
34
35 // N-dimensional array with math ops.
33 36
34 // But first, some preprocessor abuse... 37 // But first, some preprocessor abuse...
35 38
36 #include "MArray-defs.h" 39 #include "MArray-defs.h"
37
38 class Matrix;
39 40
40 MARRAY_OPS_FORWARD_DECLS (MArrayN) 41 MARRAY_OPS_FORWARD_DECLS (MArrayN)
41 42
42 template <class T> 43 template <class T>
43 class 44 class
44 MArrayN : public ArrayN<T> 45 MArrayN : public ArrayN<T>
45 { 46 {
46 protected: 47 protected:
47 48
48 MArrayN (T *d, const Array<int>& dims) : ArrayN<T> (d, dims) 49 MArrayN (T *d, const dim_vector& dims) : ArrayN<T> (d, dims) { }
49 { }
50 50
51 public: 51 public:
52 52
53 MArrayN (void) : ArrayN<T> () {} 53 MArrayN (void) : ArrayN<T> () {}
54 54
55 MArrayN (const Array<int>& dims) : ArrayN<T> (dims) 55 MArrayN (const dim_vector& dims) : ArrayN<T> (dims) { }
56 { }
57 56
58 MArrayN (const Array<int>& dims, const T& val) 57 MArrayN (const dim_vector& dims, const T& val) : ArrayN<T> (dims, val) { }
59 : ArrayN<T> (dims, val) { } 58
59 MArrayN (const Array2<T>& a) : ArrayN<T> (a) { }
60 60
61 MArrayN (const ArrayN<T>& a) : ArrayN<T> (a) { } 61 MArrayN (const ArrayN<T>& a) : ArrayN<T> (a) { }
62 62
63 //MArrayN (const Array<T>& a) : ArrayN<T> (a) { }
64
65 MArrayN (const MArrayN<T>& a) : ArrayN<T> (a) { } 63 MArrayN (const MArrayN<T>& a) : ArrayN<T> (a) { }
66
67 MArrayN (const Matrix& m) : ArrayN<T> (m) { }
68 64
69 ~MArrayN (void) { } 65 ~MArrayN (void) { }
70 66
71 MArrayN<T>& operator = (const MArrayN<T>& a) 67 MArrayN<T>& operator = (const MArrayN<T>& a)
72 { 68 {
73 ArrayN<T>::operator = (a); 69 ArrayN<T>::operator = (a);
74 return *this; 70 return *this;
75 } 71 }
76
77 }; 72 };
78 73
79 extern void 74 extern void
80 gripe_nonconformant (const char *op, Array<int>& op1_dims, Array<int>& op2_dims); 75 gripe_nonconformant (const char *op, dim_vector& op1_dims, dim_vector& op2_dims);
81 76
82 #endif 77 #endif
78
79 /*
80 ;;; Local Variables: ***
81 ;;; mode: C++ ***
82 ;;; End: ***
83 */