- Timestamp:
- 12/17/20 12:55:12 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/transformation_path.cpp
r1984 r1993 7 7 donePath_ = transformationPaths.donePath_ ; 8 8 //? if (donePath_.empty()) donePath_.push_back(transformationPaths.path_) ; // entry point 9 9 if (get<1>(remainPath_)!="") return ; 10 10 11 if (!donePath_.empty()) 11 12 { … … 23 24 } 24 25 25 if (remoteIt==get<2>(remotePath).end()) get<2>(remainPath_).insert( get<2>(remainPath_).begin(), it , std::get<2>(path_).end() ) ; 26 if (remoteIt==get<2>(remotePath).end()) 27 { 28 get<0>(remainPath_) = std::get<0>(path_) ; 29 get<1>(remainPath_) = std::get<1>(path_) ; 30 get<2>(remainPath_).insert( get<2>(remainPath_).begin(), it , std::get<2>(path_).end() ) ; 31 } 26 32 else remainPath_ = path_ ; 27 33 … … 33 39 remainPath_=path_ ; 34 40 } 41 get<1>(path_).clear() ; 42 get<2>(path_).clear() ; 35 43 } 36 44 … … 38 46 { 39 47 CTransformationPaths transformationPath ; 48 /* TPath newPath = path_ ; 49 get<2>(newPath).clear() ; 50 transformationPath.donePath_.push_back(newPath) ; */ 40 51 mergePaths(transformationPath) ; 41 52 } … … 56 67 string CTransformationPaths::getNextElementId(void) 57 68 { 69 CTransformationPaths transformationPath = *this ; 70 transformationPath.removeNextTransform() ; 71 return transformationPath.getPathsId(transformationPath.donePath_) ; 72 /* 58 73 string sep="/" ; 59 74 string doneId=getPathsId(donePath_) ; … … 64 79 if (remainId=="") sep="" ; 65 80 return doneId+sep+remainId ; 81 */ 66 82 } 67 83 … … 89 105 get<1>(newPath)=get<1>(remainPath_) ; 90 106 if (!get<2>(remainPath_).empty()) get<2>(newPath).push_back(get<2>(remainPath_).front()) ; 91 donePath_.push_back(newPath); 92 get<1>(newPath)="" ; 107 if (donePath_.empty()) donePath_.push_back(newPath); 108 else 109 { 110 if (get<0>(donePath_.back())==get<0>(newPath) && get<1>(donePath_.back())==get<1>(newPath)) 111 get<2>(donePath_.back()).push_back(get<2>(newPath).front()) ; 112 else donePath_.push_back(newPath); 113 } 93 114 if (!get<2>(newPath).empty()) get<2>(remainPath_).pop_front() ; 115 if (get<2>(remainPath_).empty()) get<1>(remainPath_)="" ; 94 116 } 95 117 else
Note: See TracChangeset
for help on using the changeset viewer.