ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/brains/DataStorage.cpp
(Generate patch)

Comparing branches/new_design/OOPSE-3.0/src/brains/DataStorage.cpp (file contents):
Revision 1774, Thu Oct 28 22:34:02 2004 UTC vs.
Revision 1775 by tim, Wed Nov 24 17:42:37 2004 UTC

# Line 65 | Line 65 | int DataStorage::getSize() {
65          std::cerr << "size does not match"<< std::endl;        
66      }
67  
68 <    if (storageLayout_ & dslUnitVector && unitVector.size() != size_) {
68 >    if (storageLayout_ & dslUnitFrame && unitFrame.size() != size_) {
69          //error
70          std::cerr << "size does not match"<< std::endl;        
71      }
# Line 107 | Line 107 | void DataStorage::resize(int newSize) {
107          internalResize(angularMomentum, newSize);
108      }
109  
110 <    if (storageLayout_ & dslUnitVector) {
111 <        internalResize(unitVector, newSize);
110 >    if (storageLayout_ & dslUnitFrame) {
111 >        internalResize(unitFrame, newSize);
112      }
113      
114      if (storageLayout_ & dslZAngle) {
# Line 143 | Line 143 | void DataStorage::reserve(int size) {
143          angularMomentum.reserve(size);
144      }
145  
146 <    if (storageLayout_ & dslUnitVector) {
147 <        unitVector.reserve(size);
146 >    if (storageLayout_ & dslUnitFrame) {
147 >        unitFrame.reserve(size);
148      }
149      
150      if (storageLayout_ & dslZAngle) {
# Line 182 | Line 182 | void DataStorage::copy(int source, int num, int target
182          interalCopy(angularMomentum, source, num, target);
183      }
184  
185 <    if (storageLayout_ & dslUnitVector) {
186 <        interalCopy(unitVector, source, num, target);
185 >    if (storageLayout_ & dslUnitFrame) {
186 >        interalCopy(unitFrame, source, num, target);
187      }
188      
189      if (storageLayout_ & dslZAngle) {
# Line 229 | Line 229 | double* DataStorage::getArrayPointer(int whichArray) {
229              return internalGetArrayPointer(angularMomentum);
230              break;
231              
232 <        case dslUnitVector:
233 <            return internalGetArrayPointer(unitVector);
232 >        case dslUnitFrame:
233 >            return internalGetArrayPointer(unitFrame);
234              break;
235              
236          case dslZAngle:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines