Diff: GPA.h

Revision:

6:2cc56521aa16

Parent:

3:769ce5f06d3e

Child:

7:72982ede2ff6

--- a/GPA.h	Mon Apr 09 09:26:58 2018 +0000
+++ b/GPA.h	Tue Apr 10 11:44:36 2018 +0000
@@ -3,15 +3,17 @@
 public:
 
     GPA(float fMin, float fMax, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1);
+    GPA(float f0, float f1, float *fexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1);
+    GPA(float *fexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1);
 
     float operator()(float inp, float out) {
-        return update(inp, out);
+        return update((double)inp, (double)out);
     }
 
     virtual ~GPA();
 
     void     reset();
-    float    update(float inp, float out);
+    float    update(double inp, double out);
 
     void     printGPAfexcDes();
     void     printGPAmeasPara();
@@ -22,34 +24,34 @@
     int    NfexcDes;
     int    NperMin;
     int    NmeasMin;
-    float  Ts;
-    float *fexcDes;
-    float  aAexcDes;
-    float  bAexcDes;
+    double  Ts;
+    double *fexcDes;
+    double  aAexcDes;
+    double  bAexcDes;
 
-    float  fnyq;
-    float  pi2;
-    float  pi2Ts;
-    float  piDiv2;
+    double  fnyq;
+    double  pi2;
+    double  pi2Ts;
+    double  piDiv2;
 
     int    Nmeas;
     int    Nper;
-    float  fexc;
-    float  fexcPast;
+    double  fexc;
+    double  fexcPast;
     int    ii;
     int    jj;
-    float  scaleG;
-    float  cr;
-    float  ci;
-    float *sU;
-    float *sY;
-    float  sinarg;
+    double  scaleG;
+    double  cr;
+    double  ci;
+    double *sU;
+    double *sY;
+    double  sinarg;
     int    NmeasTotal;
-    float  Aexc;
-    float  pi2Tsfexc;
+    double  Aexc;
+    double  pi2Tsfexc;
 
-    void   fexcDesLogspace(float fMin, float fMax, int NfexcDes);
-    void   calcGPAmeasPara(float fexcDes_i);
+    void   fexcDesLogspace(double fMin, double fMax, int NfexcDes);
+    void   calcGPAmeasPara(double fexcDes_i);
     void   printLine();
 
 };
\ No newline at end of file