grom zero

Hacene SI HADJ MOHAND
1 parent 1aae861e
Showing 2 changed files with 2 additions and 162 deletions Show diff stats
src/ExternLib/DataFiltering/DataFiltering.hh
src/ExternLib/DataFiltering/DataFilteringCreator.hh
@@ -190,167 +190,7 @@ namespace AMDA {
  
             };
  
-            template <typename ElemType>
-            class DataFiltering1D : public Operation {
-            public:
-                // constructor 
-
-                DataFiltering1D(Process& pProcess, ParamDataSpec<std::vector<ElemType> >& paramInput, double factor = Default::_factor, int nPoints = Default::_nPoints) :
-                Operation(pProcess),
-                _paramInput(paramInput),
-                _paramOutput(new ParamDataSpec<std::vector<ElemType> >()),
-                _factor(factor),
-                _nPoints(nPoints),
-                _container(new FilteringContainer1D<ElemType> ()){
-                    _paramDataOutput = _paramOutput;
-                }
-
-                virtual ~DataFiltering1D() {
-                }
-
-                void write(ParamDataIndexInfo &pParamDataIndexInfo) {
-                    
-                    // init container 
-                   
-                    int size = _paramInput.get(pParamDataIndexInfo._startIndex).size();
-                    std::vector<int> vectInt(size,0);
-                    _container->_size = vectInt;
-                    /**
-                    _container->_nFilteredPoints.resize(size,0);
-                    _container->_ave.resize(size,0);
-                    _container->_sum.resize(size,0);
-                    _container->_sumsq.resize(size,0);
-                    _container->_sig.resize(size,0);
-                 */
-                    for (unsigned int _index = pParamDataIndexInfo._startIndex;
-                            _index < pParamDataIndexInfo._startIndex + pParamDataIndexInfo._nbDataToProcess;
-                            ++_index) {
-                        double crtTime = _paramInput.getTime(_index);
-                        std::vector<ElemType> inputElt = _paramInput.get(_index);
-                        
-                         _paramOutput->pushTime(crtTime);
-                         _paramOutput->getDataList().push_back(inputElt);
-                                 /**
-
-                        // initialiser et remplir container
-                        if (*std::min_element(std::begin(_container._size), std::end(_container._size)) < _nPoints) {
-
-                            _container._values.push_back(inputElt);
-                            _container._times.push_back(crtTime);
-                            for (int i = 0; i < size; i++) {
-                                if (!isNAN(inputElt[i])) {
-                                    _container._sum[i] += inputElt[i];
-                                    _container._sumsq[i] += inputElt[i]*inputElt[i];
-                                    _container._size[i] += 1;
-                                }
-                            }
-                        } else {
-                            for (int i = 0; i < size; i++) {
-                                _container._ave[i] = (ElemType) _container._sum[i] / _container._size[i];
-                                _container._sig[i] = std::sqrt((_container._sumsq[i] - _container._sum[i] * _container._sum[i] / _container._size[i]) / _container._size[i]);
-                            }
-
-                            // filter Elements
-                            for (auto elt = _container._values.begin(); elt != _container._values.end(); ++elt) {
-                                int i;
-                                for (auto it = elt->begin(); it != elt->end(); ++it) {
-                                    i = it - elt->begin();
-                                    ElemType crt_val = *it;
-                                    if (isNAN(crt_val)) {
-                                        continue;
-                                    }
-
-                                    if (std::abs(crt_val - _container._ave[i]) > _factor * _container._sig[i]) {
-                                        _container._sum[i] -= crt_val;
-                                        _container._sumsq[i] -= crt_val*crt_val;
-                                        _container._size[i] -= 1;
-                                        _container._nFilteredPoints[i] += 1;
-                                        *it << NotANumber();
-                                    }
-                                }
-                            }
-                            _paramOutput->pushTime(_container._times.front());
-                            _paramOutput->getDataList().push_back(_container._values.front());
-                            _container._values.pop_front();
-                            _container._times.pop_front();
-                            for (int i = 0; i < size; i++) {
-                                if (!isNAN(_container._values.front()[i])) {
-                                    _container._size[i] -= 1;
-                                    _container._sum[i] -= _container._values.front()[i];
-                                    _container._sumsq[i] -= _container._values.front()[i] * _container._values.front()[i];
-                                }
-                                if (!isNAN(inputElt[i])) {
-                                    _container._sum[i] += inputElt[i];
-                                    _container._sumsq[i] += inputElt[i] * inputElt[i];
-                                    _container._size[i] += 1;
-                                }
-                            }
-                            _container._values.push_back(inputElt);
-                            _container._times.push_back(crtTime);
-                        }
-                        // last value filter and write
-                        if (_index == pParamDataIndexInfo._startIndex + pParamDataIndexInfo._nbDataToProcess - 1) {
-                               for (int i = 0; i < size; i++) {
-                            _container._ave[i] = (ElemType) _container._sum[i] / _container._size[i];
-                            _container._sig[i] = std::sqrt((_container._sumsq[i] - _container._sum[i] * _container._sum[i] / _container._size[i]) / _container._size[i]);
-                               }
-                            for (auto elt = _container._values.begin(); elt != _container._values.end(); ++elt) {
-                                int i;
-                                for (auto it = elt->begin(); it != elt->end(); ++it) {
-                                    i = it - elt->begin();
-                                    ElemType crt_val = *it;
-                                    if (isNAN(crt_val)) {
-                                        continue;
-                                    }
-
-                                    if (std::abs(crt_val - _container._ave[i]) > _factor * _container._sig[i]) {
-                                        _container._sum[i] -= crt_val;
-                                        _container._sumsq[i] -= crt_val*crt_val;
-                                        _container._size[i] -= 1;
-                                        _container._nFilteredPoints[i] += 1;
-                                        *it << NotANumber();
-                                    }
-                                }
-                            }
-
-                            std::list<double>::iterator itTimes = _container._times.begin();
-                            for (auto elt : _container._values) {
-                                _paramOutput->pushTime(*itTimes);
-                                _paramOutput->getDataList().push_back(elt);
-                                ++itTimes;
-                            }
-                        }
-                                  * */
-                    }
-                }
-
-            private:
-                /**
-                 * input data
-                 */
-                ParamDataSpec<std::vector<ElemType> >& _paramInput;
-
-                /**
-                 * oupout filtered data 
-                 */
-                ParamDataSpec<std::vector<ElemType> >* _paramOutput;
-
-                /**
-                 * factor in term of sigma used in the filtering   
-                 */
-                double _factor;
-
-                /**
-                 Number of point used in the fitering algorithm
-                 */
-                int _nPoints;
-
-                /**
-                 * Data container used during filtering 
-                 */
-                FilteringContainer1D<ElemType>* _container;
-
-            };
+            
         }
     }
 }
@@ -173,7 +173,7 @@ namespace AMDA {
             }
             template <typename Type>
            void create1DOperation() {
-               _operation = new DataFiltering::DataFiltering1D<Type>(_process, dynamic_cast<ParamDataSpec<std::vector<Type>>&> (_paramData), _factor, _nPoints);
+
            }
  
             Process &_process;