Fix bug with sliding functions (#6547)

Benjamin Renard
1 parent b358ee7d
Showing 1 changed file with 59 additions and 45 deletions Show diff stats
src/ExternLib/StatisticFunctions/AbstractFunc.hh
@@ -95,7 +95,7 @@ public:
 		}
 		++_currentTimeInterval;
 		_needInit = true;
-		clear();
+                resetFunc();
 	}
  
 	virtual bool nextTarget() = 0;
@@ -104,9 +104,9 @@ public:
  
 	virtual double getSampling() = 0;
  
-	virtual void init(double crtTime) = 0;
-
-	virtual void clear() = 0;
+	virtual void init() = 0;
+        
+        virtual void resetFunc() = 0;
  
 private:
 	TimeIntervalListSPtr _timeIntervalList;
@@ -144,48 +144,53 @@ public:
 	virtual void pushData(double time, InputElemType& elem) = 0;
  
 	virtual OutputElemType compute() = 0;
-
+        
 	/**
 	 * @overload Operation::write(ParamDataIndexInfo &pParamDataIndexInfo)
 	 */
  
 	void write(ParamDataIndexInfo &pParamDataIndexInfo) {
-		bool isTerminated = false;
 		if ((pParamDataIndexInfo._nbDataToProcess > 0)) {
 			if (pParamDataIndexInfo._startIndex == 0) {
 				_nanVal = _paramInput.get(0);
 				_nanVal << NotANumber();
 			}
-			for (unsigned int _index = pParamDataIndexInfo._startIndex ;
+                        for (unsigned int _index = pParamDataIndexInfo._startIndex ;
 				_index < pParamDataIndexInfo._startIndex + pParamDataIndexInfo._nbDataToProcess;
 				++_index)
 			{
 				double crtTime = _paramInput.getTime(_index);
-				if (needInit()) {
-					init(crtTime);
-				}
-				InputElemType crtVal = _paramInput.get(_index);
-				while (needToChangeTarget(crtTime)) {
-					_paramOutput->pushTime(getTarget());
-                                	_paramOutput->push(compute());
-					if (!nextTarget()) {
-						isTerminated = true;
-						return;
-					}
-					clear();
-				}
-				pushData(crtTime, crtVal);
+                                InputElemType crtVal = _paramInput.get(_index);
+                                bool skip = false;
+                                if (needToChangeTarget(crtTime)) {
+                                    _paramOutput->pushTime(getTarget());
+                                    _paramOutput->push(compute());
+                                    pushData(crtTime, crtVal);
+                                    nextTarget();
+                                    bool skip = false;
+                                    while (!skip && needToChangeTarget(crtTime)) {
+                                        _paramOutput->pushTime(getTarget());
+                                        _paramOutput->push(compute());
+                                        skip = nextTarget();
+                                    }
+                                }
+                                else {
+                                    pushData(crtTime, crtVal);
+                                    if (needInit()) {
+					init();
+                                    }
+                                }
 			}
 		}
 		if (pParamDataIndexInfo._timeIntToProcessChanged || pParamDataIndexInfo._noMoreTimeInt) {
+                    if (!needInit()) {
 			do {
+                            if (inInt(getTarget())) {
 				_paramOutput->pushTime(getTarget());
 				_paramOutput->push(compute());
-				if (!nextTarget()) {
-					isTerminated = true;
-				}
-				clear();
-			} while (!isTerminated);
+                            }
+			} while (nextTarget());
+                    }
 		}
 	}
  
@@ -212,18 +217,22 @@ public:
 	virtual ~ClassicAbstractFunc() {
 	}
  
-	virtual void init(double /*crtTime*/) {
+	virtual void init() {
 		AbstractFunc<InputElemType,OutputElemType>::setTarget(AbstractFunc<InputElemType,OutputElemType>::getIntStartTime());
 		AbstractFunc<InputElemType,OutputElemType>::setNeedInit(false);
 	}
  
 	virtual bool nextTarget() {
 		double target = AbstractFunc<InputElemType,OutputElemType>::getTarget() + AbstractFunc<InputElemType,OutputElemType>::getWindowTime();
-		return AbstractFunc<InputElemType,OutputElemType>::setTarget(target);
+                bool res = AbstractFunc<InputElemType,OutputElemType>::setTarget(target);
+                while (!_mem.empty() && !AbstractFunc<InputElemType,OutputElemType>::inWindow(_mem.front().first)) {
+                    _mem.pop_front();
+                }
+                return res;
 	}
  
 	virtual bool needToChangeTarget(double crtTime) {
-		return !AbstractFunc<InputElemType,OutputElemType>::inWindow(crtTime);
+		return !AbstractFunc<InputElemType,OutputElemType>::needInit() && !AbstractFunc<InputElemType,OutputElemType>::inWindow(crtTime);
 	}
  
 	virtual double getSampling() {
@@ -233,13 +242,13 @@ public:
 	virtual void pushData(double time, InputElemType& elem) {
 		_mem.push_back(std::make_pair(time, elem));
 	}
-
-	virtual void clear() {
-		_mem.clear();
-	}
+        
+        virtual void resetFunc() {
+            _mem.clear();
+        }
  
 protected:
-	std::list<std::pair<double,InputElemType>> _mem;
+	std::list<std::pair<double,InputElemType> > _mem;
 };
  
 template <typename InputElemType, typename OutputElemType>
@@ -252,22 +261,28 @@ public:
 	virtual ~SmAbstractFunc() {
 	}
  
-	virtual void init(double crtTime) {
-		AbstractFunc<InputElemType,OutputElemType>::setTarget(crtTime);
-		AbstractFunc<InputElemType,OutputElemType>::setNeedInit(false);
+	virtual void init() {
+            if (!_targets.empty()) {
+		AbstractFunc<InputElemType,OutputElemType>::setTarget(_targets.front());
+                AbstractFunc<InputElemType,OutputElemType>::setNeedInit(false);
+                _targets.pop_front();
+            }
 	}
  
 	virtual bool nextTarget() {
 		if (!_targets.empty()) {
 			bool res = AbstractFunc<InputElemType,OutputElemType>::setTarget(_targets.front());
 			_targets.pop_front();
+                        while (!_mem.empty() && !AbstractFunc<InputElemType,OutputElemType>::inWindow(_mem.front().first)) {
+                            _mem.pop_front();
+                        }
 			return res;
 		}
 		return false;
 	}
  
 	virtual bool needToChangeTarget(double crtTime) {
-		return !AbstractFunc<InputElemType,OutputElemType>::inWindow(crtTime);
+		return !AbstractFunc<InputElemType,OutputElemType>::needInit() && !AbstractFunc<InputElemType,OutputElemType>::inWindow(crtTime) && !_targets.empty() ;
 	}
  
 	virtual double getSampling() {
@@ -278,17 +293,16 @@ public:
 		_mem.push_back(std::make_pair(time, elem));
 		_targets.push_back(time);
 	}
-
-	virtual void clear() {
-		while (!_mem.empty() && !AbstractFunc<InputElemType,OutputElemType>::inWindow(_mem.front().first)) {
-			_mem.pop_front();
-		}
-	}
+        
+        virtual void resetFunc() {
+            _mem.clear();
+            _targets.clear();
+        }
  
 protected:
 	std::list<double> _targets;
  
-	std::list<std::pair<double,OutputElemType>> _mem;
+	std::list<std::pair<double,OutputElemType> > _mem;
 };
  
 } /* namespace StatisticFunctions */