Changeset 621 for XIOS/trunk/src/filter/axis_inverse.cpp

Timestamp:

06/22/15 13:36:21 (9 years ago)

Author:

mhnguyen

Message:

Implementing generic transformation algorithm (local commit)

+) Change a little bit to make sure everything work in order

Test
+) test_new_features passe with inverse

File:

• XIOS/trunk/src/filter/axis_inverse.cpp (modified) (2 diffs)

XIOS/trunk/src/filter/axis_inverse.cpp

@@ -4 +4 @@
 
 CAxisInverse::CAxisInverse(CAxis* axisDestination, CAxis* axisSource)
- : CAxisAlgorithmTransformation(axisDestination)
+ : CConcreteAlgo()
 {
   if (axisDestination->size.getValue() != axisSource->size.getValue())
@@ -14 +14 @@
   }
 
+
   axisDestGlobalSize_ = axisDestination->size.getValue();
+  int niDest = axisDestination->ni.getValue();
+  int ibeginDest = axisDestination->ibegin.getValue();
 
-  this->computeIndexSourceMapping();
+  for (int idx = 0; idx < niDest; ++idx) axisDestGlobalIndex_.push_back(ibeginDest+idx);
 }
 
-void CAxisInverse::computeIndexSourceMapping()
+void CAxisInverse::computeIndexSourceMapping(const std::map<int, std::vector<int> >& transformationMappingOfPreviousAlgo)
 {
   std::map<int, std::vector<int> >& transMap = this->transformationMapping_;
-  if (!transMap.empty()) transMap.clear();
-
-  int globalIndexSize = axisDestGlobalIndex_.size();
-  for (int idx = 0; idx < globalIndexSize; ++idx)
-    transMap[axisDestGlobalIndex_[idx]].push_back(axisDestGlobalSize_-axisDestGlobalIndex_[idx]-1);
+  if (transformationMappingOfPreviousAlgo.empty())
+  {
+    int globalIndexSize = axisDestGlobalIndex_.size();
+    for (int idx = 0; idx < globalIndexSize; ++idx)
+      transMap[axisDestGlobalIndex_[idx]].push_back(axisDestGlobalSize_-axisDestGlobalIndex_[idx]-1);
+  }
+  else
+  {
+    std::map<int, std::vector<int> >::const_iterator itb = transformationMappingOfPreviousAlgo.begin(), it,
+                                                     ite = transformationMappingOfPreviousAlgo.end();
+    for (it = itb; it != ite; ++it)
+    {
+      transMap[it->first].push_back(axisDestGlobalSize_-it->first-1);
+    }
+  }
 }
 
-
 }