Changeset 4054 in Sophya for trunk/Eval/JET/smtx.cc
- Timestamp:
- Mar 17, 2012, 11:13:26 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Eval/JET/smtx.cc
r3257 r4054 17 17 template <class T> 18 18 SimpleMatrix<T>::SimpleMatrix() 19 : MtxSize(), JETExpression<T, JETExpMtx<T> >(), dbv_(&data_, this) 19 : MtxSize(), JETExpression<T, JETExpMtx<T> >(), dbv_(&data_, this), 20 data_p_(NULL) 20 21 { 21 22 this->Expression().JETExpMtxSet(&data_, this); … … 24 25 template <class T> 25 26 SimpleMatrix<T>::SimpleMatrix(sa_size_t nr, sa_size_t nc) 26 : MtxSize(nr, nc), JETExpression<T, JETExpMtx<T> >(), data_(nr*nc), dbv_(&data_, this) 27 : MtxSize(nr, nc), JETExpression<T, JETExpMtx<T> >(), data_(nr*nc), dbv_(&data_, this), 28 data_p_(data_.Begin()) 27 29 { 28 30 this->Expression().JETExpMtxSet(&data_, this); … … 31 33 template <class T> 32 34 SimpleMatrix<T>::SimpleMatrix(const SimpleMatrix & m) 33 : MtxSize(m), JETExpression<T, JETExpMtx<T> >(), data_(m.data_), dbv_(&data_, this) 35 : MtxSize(m), JETExpression<T, JETExpMtx<T> >(), data_(m.data_), dbv_(&data_, this), 36 data_p_(data_.Begin()) 34 37 { 35 38 this->Expression().JETExpMtxSet(&data_, this); … … 38 41 template <class T> 39 42 SimpleMatrix<T>::SimpleMatrix(const SimpleMatrix & m, bool share) 40 : MtxSize(m), JETExpression<T, JETExpMtx<T> >(dbv_), data_(m.data_, share), dbv_(&data_, this) 43 : MtxSize(m), JETExpression<T, JETExpMtx<T> >(dbv_), data_(m.data_, share), dbv_(&data_, this), 44 data_p_(data_.Begin()) 41 45 { 42 46 } … … 55 59 MtxSize::ReSize(a); 56 60 data_.Realloc(nrow_*ncol_); 61 data_p_=data_.Begin(); 57 62 return; 58 63 } … … 70 75 throw(SzMismatchError("SimpleMatrix::Set() Size(a) != Size(b)")); 71 76 data_ = b.data_; 77 data_p_=data_.Begin(); 72 78 return(*this); 73 79 } … … 88 94 throw RangeCheckError("SimpleMatrix<T>::Init(T c. T s) Size=0"); 89 95 for(sa_size_t k=0; k<nrow_*ncol_; k++) { 90 data_ (k)= c; c += step;96 data_p_[k] = c; c += step; 91 97 } 92 98 return(*this);
Note:
See TracChangeset
for help on using the changeset viewer.