prep ticket

Hacene SI HADJ MOHAND
1 parent 3ccf1509
Showing 1 changed file with 51 additions and 31 deletions Show diff stats
src/ExternLib/StatisticFunctions/SpectrumFunc.hh
@@ -25,84 +25,104 @@ namespace AMDA {
     namespace Parameters {
         namespace StatisticFunctions {
-              template <typename InputElemType>
+            template <typename InputElemType>
             std::vector<double> fft(int N, std::vector<InputElemType> &xn) {
                 /**
                  * 
                  * @param N number of points in the dft
                  * @param xn date vector 
                  */
-                
+
                 int len = xn.size();
                 std::vector<double> output;
                 output.resize(N);
                 output << NotANumber();
-                
+
                 double Xr;
                 double Xi;
-                 int counter;
-             
+                int counter;
+
                 int k, n = 0;
                 for (k = 0; k < N; k++) {
                     Xr = 0;
                     Xi = 0;
                     counter = 0;
                     for (n = 0; n < len; n++) {
-                        if(!isNAN(xn[n])){  
-                        Xr = Xr + (double) xn[n]*cos(2*3.141592*k*n/N);
-                        Xi  = Xi+ (double) xn[n] *sin(2*3.141592*k*n/N);
-                        counter += 1;
+                        if (!isNAN(xn[n])) {
+                            Xr = Xr + (double) xn[n] * cos(2 * 3.141592 * k * n / N);
+                            Xi = Xi + (double) xn[n] * sin(2 * 3.141592 * k * n / N);
+                            counter += 1;
                         }
                     }
                     if (counter == 0)
-                        break; 
-                        output[k] = std::sqrt(Xr*Xr + Xi*Xi);
+                        break;
+                    output[k] = std::sqrt(Xr * Xr + Xi * Xi);
                 }
-                return  output;
+                return output;
             }
             template <typename InputElemType>
-            std::vector<double> computeFourierSpectrum(std::list<std::pair<double, InputElemType>>&mem) {
-                  int nFft = 16;
-                  std::vector<double> result;
-                  result.resize(nFft);
-                  
-                if(mem.empty())
-                    return result;
-                  
-                std::vector<InputElemType> vals_;
-                for(auto val:mem){
-                        vals_.push_back(val.second);
+            std::vector<double> getUniformData(std::list<std::pair<double, InputElemType>>&mem, double sampling, double windowtime) {
+                bool constantSampling = true;
+                auto it_1 = mem.begin();
+                it_1++;
+                for (auto it = mem.begin(); it != mem.end(); it++) {
+                    if (*it != mem.back()) {
+                        InputElemType first = it->first;
+                        InputElemType second = it_1->first;
+                        it_1++;
+                        if (second - first != sampling)
+                            constantSampling = false;
+                    }
                 }
-                
-                if(! vals_.empty())
-                    return fft(nFft,vals_);
+
+                std::vector<double> vals_;
+                for (auto val : mem) {
+                    vals_.push_back((double) val.second);
+                }
+                return vals_;
+            }
+
+            template <typename InputElemType>
+            std::vector<double> computeFourierSpectrum(std::list<std::pair<double, InputElemType>>&mem, double sampling, double windowtime) {
+
+                std::vector<double> result;
+
+
+                if (mem.empty())
+                    return result;
                 return result;
             }
-/**
+            /**
              * @class SpectrumFunc
              * @brief 
              * @details This class implements AbstractFunc.
              */
             template <typename InputElemType>
-            class SpectrumFunc : public ClassicAbstractFunc<InputElemType,  std::vector<double>> {
-            public:
+            class SpectrumFunc : public ClassicAbstractFunc<InputElemType, std::vector<double>>
+            {
+                public:
                 /**
                  * @brief Constructor.
                  */
                 SpectrumFunc(Process& pProcess, TimeIntervalListSPtr pTimeIntervalList, ParamDataSpec<InputElemType>& paramInput, double windowtime)
-                : ClassicAbstractFunc<InputElemType, std::vector<double>>(pProcess, pTimeIntervalList, paramInput, windowtime) {
+                        : ClassicAbstractFunc<InputElemType, std::vector<double>>(pProcess, pTimeIntervalList, paramInput, windowtime),
+                        _min_sampling(paramInput.getMinSampling()),
+                        _windowtime(windowtime) {
                 }
                 virtual ~SpectrumFunc() {
                 }
                 std::vector<double> compute() {
-                    return computeFourierSpectrum(ClassicAbstractFunc<InputElemType, std::vector<double>>::_mem);
+                    return computeFourierSpectrum(ClassicAbstractFunc<InputElemType, std::vector<double>>::_mem, _min_sampling, _windowtime);
                 }
+                private:
+                double _min_sampling;
+                double _windowtime;
             };