Merge branch 'develop' into rm_8932

Hacene SI HADJ MOHAND
2 parents a98a1504 66b49969
Showing 5 changed files with 44 additions and 13 deletions Show diff stats
src/ExternLib/FramesTransformation/ProcessFramesTransformation.cc
src/ExternLib/GetClbInfoByIndex/GetClbInfoByIndex.hh
src/ExternLib/StatisticProcesses/MinMaxMeanStatistic.hh
src/InternLib/Resampling.hh
src/Parameters/DataTypeMath.hh
@@ -66,7 +66,7 @@ TimeStamp ProcessFramesTransformation::init() {
 	_toFrame   = _attributList[1];
  
 	if (_attributList.size() == 3)
-		_isPosition = (_attributList[2].compare("true") || _attributList[2].compare("1"));
+		_isPosition = ((_attributList[2].compare("true") == 0) || (_attributList[2].compare("1") == 0));
  
 	return ProcessFramesTransformationBase::init();
 }
@@ -69,7 +69,7 @@ public:
 	 * @details Create the ParamData type of the input ParamData.
 	 */
   GetClbInfoByIndex(Process& pProcess, TParamData& paramInput)
-	: Base::GetClbInfoByIndex(pProcess), _paramInput(paramInput), _paramOutput(new ParamDataTab1DDouble()) {
+	: Base::GetClbInfoByIndex(pProcess), _paramInput(paramInput), _paramOutput(new ParamDataTab1DDouble()), _maxTableSize(0) {
 	  _paramDataOutput=_paramOutput;
 	  }
  
@@ -93,6 +93,8 @@ public:
 			  BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::errno_code(AMDA_PROCESS_ERR) << AMDA::ex_msg(std::string("GetClbInfoByIndex::init - Cannot find calibInfo "+clbInfoIndexName)));
 		  }
 		  _calibrationInfoList[i]=lInfoList[clbInfoIndexName].get();
+                  if (_calibrationInfoList[i]->size() > _maxTableSize)
+                      _maxTableSize = _calibrationInfoList[i]->size();
 	  }
   }
  
@@ -102,7 +104,16 @@ public:
   void  write(ParamDataIndexInfo &pParamDataIndexInfo) {
     unsigned int index = pParamDataIndexInfo._startIndex;
     for (; index< pParamDataIndexInfo._startIndex + pParamDataIndexInfo._nbDataToProcess; index++) {
-    	_paramOutput->pushTime(_paramInput.getTime(index));
+         _paramOutput->pushTime(_paramInput.getTime(index));
+         if (isNAN(_paramInput.getDataList()[index]))  {
+             std::vector<double> emptyVec;
+             if (_maxTableSize > 0) {
+                 emptyVec.resize(_maxTableSize);
+                 emptyVec << NotANumber();
+             }
+             _paramOutput->getDataList().push_back(emptyVec);
+             continue;
+         }
     	_paramOutput->getDataList().push_back(*(_calibrationInfoList[(int)floor(_paramInput.getDataList()[index])]));
     }
   }
@@ -119,6 +130,8 @@ private:
   ParamDataTab1DDouble *_paramOutput;
  
  
+  double _maxTableSize;
+
 	/**
 	 * @brief map of calibrationInfo.
 	 * @detail for expression #getClbInfo($ETableN;0:ImaEner_0;1:ImaEner_1)
@@ -56,6 +56,9 @@ namespace AMDA {
                 _paramInput(param), _timeIntervalList(pTimeIntervalList),
                 _currentTimeInterval(_timeIntervalList->begin()),
                 _funcType(funcType), _dimDef("unknown") {
+                    ElementType fillValue;
+                    fillValue << NotANumber();
+                    initDimSize(fillValue);
                     resetData(StatisticOperation<TResultData>::_resultData);
                 }
  
@@ -154,6 +157,16 @@ namespace AMDA {
                 }
  
             private:
+                template<typename Type>
+                void initDimSize(Type &/*a*/) {
+                    _dimDef.str("1");
+                }
+
+                template<typename Type>
+                void initDimSize(std::vector<Type> &/*a*/) {
+                    _dimDef.str("unknown");
+                }
+
  
                 template<typename Type>
                 void resetData(Type &a) {
@@ -168,8 +181,6 @@ namespace AMDA {
  
                 template<typename Type>
                 void computeMin(Type &a) {
-                    _dimDef.str("1");
-
                     if (isNAN(a))
                         return;
  
@@ -210,8 +221,6 @@ namespace AMDA {
  
                 template<typename Type>
                 void computeMax(Type &a) {
-                    _dimDef.str("1");
-
                     if (isNAN(a))
                         return;
  
@@ -253,8 +262,6 @@ namespace AMDA {
  
                 template<typename Type>
                 void addForMean(Type &a) {
-                    _dimDef.str("1");
-
                     if (isNAN(a))
                         return;
  
@@ -296,8 +303,6 @@ namespace AMDA {
  
                 template<typename Type>
                 void addForRMS(Type &a) {
-                    _dimDef.str("1");
-
                     if (isNAN(a))
                         return;
  
@@ -339,7 +344,6 @@ namespace AMDA {
  
                 template<typename Type>
                 void generateVector(Type &a) {
-                    _dimDef.str("1");
                     if (isNAN(a))
                         return;
                     if (isNAN(StatisticOperation<TResultData>::_resultData._result))
@@ -467,7 +467,7 @@ public:
 				_leftEffect = false;
 			} else {
 				if (_markerPtr->getTargetTime() <= timeCurrent) {
-					while (_markerPtr->getTargetTime() <= timeCurrent) {
+					while ((_markerPtr->getTargetTime() <= timeCurrent) && !_markerPtr->isFinished()) {
 						double deltaT = (float) (timeCurrent - _lastTime);
 						if (deltaT <= _gapSize) {
 							double coefT = (float) (_markerPtr->getTargetTime() - _lastTime) / deltaT;
@@ -1390,6 +1390,20 @@ std::vector&lt;Type&gt; total(const AMDA::Parameters::Tab2DData&lt;Type&gt;&amp; a, int mode) {
     return sum;
 }
  
+// Reshape a Tab2D to a vector
+template <typename Type>
+std::vector<Type> reshapeToVector(const AMDA::Parameters::Tab2DData<Type>& a) {
+    std::vector<Type> v;
+    v.resize(a.getDim1Size()*a.getDim2Size());
+    for (int r = 0; r < a.getDim1Size(); ++r) {
+        for (int c = 0; c < a.getDim2Size(); ++c) {
+            v[r*a.getDim2Size() + c] = a[r][c];
+        }
+    }
+
+    return v;
+}
+
 template <typename Type1, typename Type2>
 std::vector<Type1> operator+(AMDA::Parameters::TabRow<Type1> a, AMDA::Parameters::TabRow<Type2> b) {
     std::vector<Type1> av(a);