#7318 - Done

Erdogan Furkan
1 parent b942a2cc
Showing 2 changed files with 18 additions and 3 deletions Show diff stats
src/ExternLib/StatisticFunctions/AbstractFunc.hh
src/ExternLib/StatisticFunctions/ProcessStatisticFunctions.cc
@@ -369,7 +369,8 @@ public:
  
 	virtual void pushData(double time, InputElemType& elem) {
 		_mem.push_back(std::make_pair(time, elem));
-		_targets.push_back(time);
+		if (time >= AbstractFunc<InputElemType,OutputElemType>::getIntStartTime() && time <= AbstractFunc<InputElemType,OutputElemType>::getIntStopTime())
+			_targets.push_back(time);
 	}
  
     virtual void resetFunc() {
@@ -17,9 +17,12 @@
 #include "ProcessStatisticFunctions.hh"
 #include "ParamMgr.hh"
  
+#include "TimeInterval.hh"
+
 using namespace std;
 using namespace boost;
 using namespace log4cxx;
+using namespace TimeTableCatalog;
  
 namespace AMDA {
 namespace Parameters {
@@ -49,8 +52,19 @@ TimeStamp ProcessStatisticFunctions::init() {
 	if (_windowtime <= 0) {
 		BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::errno_code(AMDA_PROCESS_ERR) << AMDA::ex_msg(std::string("Window Time must be greater than 0.")));
 	}
-
-	TimeStamp time = _parameterInput->init( this, _timeIntervalList);
+	
+	TimeIntervalListSPtr lTimeIntervalList(new TimeIntervalList());
+
+	// Add shift time for each time interval
+	for (TimeIntervalList::iterator it = _timeIntervalList->begin(); it != _timeIntervalList->end(); ++it) {
+        if ((*it)._startTime - _windowtime/2. > 0) {
+            lTimeIntervalList->push_back(TimeInterval( (*it)._startTime - _windowtime/2., (*it)._stopTime + _windowtime/2.));
+        }
+        else {
+            lTimeIntervalList->push_back(TimeInterval( 0, (*it)._stopTime + _windowtime/2.));
+        }
+	}
+	TimeStamp time = _parameterInput->init( this, lTimeIntervalList);
  
 	_paramInput = _parameterInput->getParamData(this).get();