From 3ccf1509d9d284142dd86680b4b1a88cdd4989c8 Mon Sep 17 00:00:00 2001
From: Hacene SI HADJ MOHAND <hacene.si-hadj-mohand@akka.eu>
Date: Tue, 16 Nov 2021 14:22:29 +0100
Subject: [PATCH] computation ok

---
 src/ExternLib/StatisticFunctions/SpectrumFunc.hh              | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
 src/ExternLib/StatisticFunctions/StatisticFunctionsCreator.hh |   2 +-
 2 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/src/ExternLib/StatisticFunctions/SpectrumFunc.hh b/src/ExternLib/StatisticFunctions/SpectrumFunc.hh
index 7ec7890..fcb10eb 100644
--- a/src/ExternLib/StatisticFunctions/SpectrumFunc.hh
+++ b/src/ExternLib/StatisticFunctions/SpectrumFunc.hh
@@ -14,38 +14,96 @@
 #ifndef SPECTRUMFUNC_HH
 #define SPECTRUMFUNC_HH
 
+#include <c++/4.8.2/bits/stl_vector.h>
+#include <c++/4.8.2/bits/stl_pair.h>
+#include <c++/4.8.2/complex>
+#include <c++/4.8.2/bits/stl_list.h>
+#include <c++/4.8.2/bits/stl_bvector.h>
+
+
 namespace AMDA {
     namespace Parameters {
         namespace StatisticFunctions {
 
-            template <typename InputElemType, typename OutputElemType>
-            OutputElemType computeFourierSpectrum(std::list<std::pair<double, InputElemType>>&mem, OutputElemType& nanVal) {
-                OutputElemType result = nanVal;
+              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 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 (counter == 0)
+                        break; 
+                        output[k] = std::sqrt(Xr*Xr + Xi*Xi);
+                }
+                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);
+                }
+                
+                if(! vals_.empty())
+                    return fft(nFft,vals_);
+                
                 return result;
             }
-            
-            /**
- * @class SpectrumFunc
- * @brief 
- * @details This class implements AbstractFunc.
- */
-template <typename InputElemType, typename OutputElemType> 
-class SpectrumFunc : public ClassicAbstractFunc<InputElemType,OutputElemType> {
-public:
-	/**
-	 * @brief Constructor.
-	 */
-	SpectrumFunc(Process& pProcess, TimeIntervalListSPtr pTimeIntervalList, ParamDataSpec<InputElemType>& paramInput, double windowtime)
-	: ClassicAbstractFunc<InputElemType,OutputElemType>(pProcess, pTimeIntervalList, paramInput, windowtime) {
-	}
-
-	virtual ~SpectrumFunc() {
-	}
-
-	OutputElemType compute() {
-		return computeFourierSpectrum(ClassicAbstractFunc<InputElemType,OutputElemType>::_mem, ClassicAbstractFunc<InputElemType,OutputElemType>::_nanVal);
-	}
-};  
+
+/**
+             * @class SpectrumFunc
+             * @brief 
+             * @details This class implements AbstractFunc.
+             */
+            template <typename InputElemType>
+            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) {
+                }
+
+                virtual ~SpectrumFunc() {
+                }
+
+                std::vector<double> compute() {
+                    return computeFourierSpectrum(ClassicAbstractFunc<InputElemType, std::vector<double>>::_mem);
+                }
+            };
 
 
         }
diff --git a/src/ExternLib/StatisticFunctions/StatisticFunctionsCreator.hh b/src/ExternLib/StatisticFunctions/StatisticFunctionsCreator.hh
index 4b58fea..6d87d70 100644
--- a/src/ExternLib/StatisticFunctions/StatisticFunctionsCreator.hh
+++ b/src/ExternLib/StatisticFunctions/StatisticFunctionsCreator.hh
@@ -257,7 +257,7 @@ private:
 				_operation = new StatisticFunctions::MedianFunc<Type, Type>(_process, _timeIntervalList, dynamic_cast<ParamDataSpec<Type>&>(_paramData), _windowtime);
 				return true;
                                                             case SFT_SPECTRUM :
-				_operation = new StatisticFunctions::SpectrumFunc<Type, std::vector<Type> >(_process, _timeIntervalList, dynamic_cast<ParamDataSpec<Type >&>(_paramData), _windowtime);
+				_operation = new StatisticFunctions::SpectrumFunc<Type>(_process, _timeIntervalList, dynamic_cast<ParamDataSpec<Type >&>(_paramData), _windowtime);
 				return true;
 			default:
 				return false;
--
libgit2 0.21.2