Add no data suport for local data ParamGet (#6094)

Benjamin Renard
1 parent 1b3811f0
Showing 5 changed files with 108 additions and 5 deletions Show diff stats
src/ParamGetImpl/LocalFileInterface/LocalParamData.hh
src/ParamGetImpl/LocalFileInterface/ParamGetLocalFile.cc
src/ParamGetImpl/LocalFileInterface/Pusher.hh
src/ParamGetImpl/LocalFileInterface/VirtualInstrumentInterval.cc
src/ParamGetImpl/LocalFileInterface/VirtualInstrumentInterval.hh
@@ -67,7 +67,7 @@ public:
 	 */
 	LocalParamDataPacket(void) : _isInit(false), _containerType(CONTAINER_SCALAR),
 		_paramType(TYPE_UNKNOWN), _nbData(0), _nbMaxData(0), _dims(NULL), _size(0),
-		_times(NULL), _datas(NULL)
+		_times(NULL), _datas(NULL), _noData(false), _startTime(0.), _stopTime(0.)
 	{
 	}
  
@@ -407,6 +407,24 @@ public:
 		return true;
 	}
  
+	bool isNoData() {
+		return _noData;
+	}
+
+	double getStartTime() {
+		return _startTime;
+	}
+
+	double getStopTime() {
+		return _stopTime;
+	}
+
+	void setNoData(double startTime, double stopTime) {
+		_noData = true;
+		_startTime = startTime;
+		_stopTime  = stopTime;
+	}
+
 private:
 	/*
 	 * @brief Flag to know if the packet is init
@@ -452,6 +470,12 @@ private:
 	 * @brief record data buffer
 	 */
 	void*              _datas;
+
+	bool               _noData;
+
+	double             _startTime;
+
+	double             _stopTime;
 };
  
 } /* LocalFileInterface */
@@ -135,7 +135,17 @@ unsigned int ParamGetLocalFile::write()
 	if (lPacket) {
 		_pusher->setFillValue(_fillValue);
 		do {
-			result += _pusher->put(lPacket);
+			if (lPacket->isNoData()) {
+				LOG4CXX_DEBUG(gLogger, "ParamGetLocalFile::write => no data packet");
+				_paramData->getTimeList().push_back(lPacket->getStartTime());
+				_pusher->putNaN();
+				_paramData->getTimeList().push_back(lPacket->getStopTime());
+				_pusher->putNaN();
+				result += 2;
+			}
+			else {
+				result += _pusher->put(lPacket);
+			}
 			delete lPacket;
 			lPacket = _paramFlow->tryGet(_paramId);
 		} while(lPacket);
@@ -60,6 +60,8 @@ public:
 	 */
 	virtual int put(LocalParamDataPacket *packet) = 0;
  
+	virtual void putNaN() = 0;
+
 protected:
 	/*
 	 * @brief Pointer to the paramData
@@ -164,6 +166,17 @@ public:
 		return packet->getNbData();
 	}
  
+	virtual void putNaN() {
+		_specParamData->getDataList().resize(1);
+		ElemenType nanElem = ElemenType(_dim1,_dim2);
+		for(int i = 0; i < _dim1; ++i) {
+			for(int j = 0; j < _dim2; ++j) {
+				nanElem[i][j] = ((BaseElemenType)NAN);
+			}
+		}
+		_specParamData->getDataList().push_back(nanElem);
+	}
+
 	/*
 	 * @brief ParamData creation
 	 */
@@ -238,6 +251,14 @@ public:
 		return packet->getNbData();
 	}
  
+	virtual void putNaN() {
+		_specParamData->getDataList().resize(1);
+		ElemenType nanElem = ElemenType();
+		nanElem.resize(_dim1);
+		nanElem << NotANumber();
+		_specParamData->getDataList().push_back(nanElem);
+	}
+
 	/*
 	 * @brief ParamData creation
 	 */
@@ -306,6 +327,11 @@ public:
 		return packet->getNbData();
 	}
  
+	virtual void putNaN() {
+		_specParamData->getDataList().resize(1);
+		_specParamData->getDataList().push_back((BaseElemenType)NAN);
+	}
+
 	SpecParamData* createParamData() {
 		return new SpecParamData();
 	}
@@ -29,7 +29,8 @@ VirtualInstrumentInterval::VirtualInstrumentInterval(VirtualInstrument&amp; pVI,
 	_timeIntToProcessChanged(false),
 	_noMoreTimeInt(false),
 	_crtFileIndex(0),
-	_crtRecordIndex(0)
+	_crtRecordIndex(0),
+	_nodata(false)
 {
 	_step = &VirtualInstrumentInterval::writeData;
  
@@ -66,6 +67,9 @@ unsigned int VirtualInstrumentInterval::writeData()
 		return 0;
 	}
  
+	if (_nodata)
+		return writeNoData();
+
 	double lStopTime  = (*_currentTimeIntToProcess)._stopTime;
  
 	int crtIntervalRecIndex  = _crtRecordIndex;
@@ -167,8 +171,40 @@ unsigned int VirtualInstrumentInterval::writeEmptyData()
 	return 0;
 }
  
+unsigned int VirtualInstrumentInterval::writeNoData()
+{
+	LOG4CXX_INFO(gLogger, "VirtualInstrumentInterval::writeNoData");
+
+	double crtStartTime = _currentTimeIntToProcess->_startTime;
+	double crtStopTime = _currentTimeIntToProcess->_stopTime;
+
+	// If there is an other TimeInterval to process, change _step function to retrieve data from server.
+	if( (_currentTimeIntToProcess != _timeIntervalList.end()) && setTimeInterval()) {
+		// Time interval set to the next.
+		_timeIntToProcessChanged = true;
+	} else {
+		_noMoreTimeInt = true;
+		if (!_nodata)
+			_step = &VirtualInstrumentInterval::writeData;
+		else
+			_step = &VirtualInstrumentInterval::writeEmptyData;
+	}
+
+	for(auto paramInfo : _paramFlowSPtr->getParamInfoMap())
+	{
+		std::string paramId = paramInfo.first;
+		LocalParamDataPacket *noDataPacket= new LocalParamDataPacket();
+		noDataPacket->setNoData(crtStartTime, crtStopTime);
+		_paramFlowSPtr->push(paramId, noDataPacket);
+	}
+
+	return 0;
+}
+
 bool VirtualInstrumentInterval::setTimeInterval()
 {
+	_nodata = false;
+
 	if (_currentTimeIntToProcess == _timeIntervalList.end()) {
 		_currentTimeIntToProcess = _timeIntervalList.begin();
 	} else if (++_currentTimeIntToProcess != _timeIntervalList.end()) {
@@ -185,8 +221,11 @@ bool VirtualInstrumentInterval::setTimeInterval()
  
 	if (lStopTime < _vi.getGlobalStartTime() || lStartTime > _vi.getGlobalStopTime())
 	{
-		LOG4CXX_ERROR(gLogger, 	"VirtualInstrumentInterval::setTimeInterval - Cannot get data for this time interval - Outside of global start and global stop definition");
-		BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::errno_code(AMDA_OUTOFTIME_ERR) << AMDA::ex_msg("Cannot get data for this time interval - Outside of global start and global stop definition"));
+		_nodata = true;
+		return true;
+
+		//LOG4CXX_ERROR(gLogger, 	"VirtualInstrumentInterval::setTimeInterval - Cannot get data for this time interval - Outside of global start and global stop definition");
+		//BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::errno_code(AMDA_OUTOFTIME_ERR) << AMDA::ex_msg("Cannot get data for this time interval - Outside of global start and global stop definition"));
 	}
  
 	LOG4CXX_DEBUG(gLogger, "VirtualInstrumentInterval => start time: " << lStartTime << " lStopTime: " << lStopTime);
@@ -99,6 +99,8 @@ private:
 	 */
 	unsigned int writeEmptyData();
  
+	unsigned int writeNoData();
+
 	unsigned int (VirtualInstrumentInterval::*_step)();
  
 	/*
@@ -125,6 +127,8 @@ private:
 	int _crtFileIndex;
  
 	int _crtRecordIndex;
+
+	bool _nodata;
 };
  
 } /* namespace LocalFileInterface */