Diff: GPA.h

Revision:

26:492c7ab05e67

Parent:

25:e46687840dd6

--- a/GPA.h	Mon Apr 09 18:23:10 2018 +0000
+++ b/GPA.h	Tue Apr 10 12:24:57 2018 +0000
@@ -3,8 +3,8 @@
 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);
+    GPA(float f0, float f1, float *fexcDes, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1);
+    GPA(float *fexcDes, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1);
 
     float operator()(float inp, float out) {
         return update((double)inp, (double)out);
@@ -18,12 +18,13 @@
     void     printGPAfexcDes();
     void     printGPAmeasPara();
     void     printGPAmeasTime();
+    void     printNfexcDes();
 
 private:
 
-    int    NfexcDes;
-    int    NperMin;
-    int    NmeasMin;
+    int     NfexcDes;
+    int     NperMin;
+    int     NmeasMin;
     double  Ts;
     double *fexcDes;
     double  aAexcDes;
@@ -34,24 +35,24 @@
     double  pi2Ts;
     double  piDiv2;
 
-    int    Nmeas;
-    int    Nper;
+    int     Nmeas;
+    int     Nper;
     double  fexc;
     double  fexcPast;
-    int    ii;
-    int    jj;
+    int     ii;
+    int     jj;
     double  scaleG;
     double  cr;
     double  ci;
     double *sU;
     double *sY;
     double  sinarg;
-    int    NmeasTotal;
+    int     NmeasTotal;
     double  Aexc;
     double  pi2Tsfexc;
 
-    void   fexcDesLogspace(double fMin, double fMax, int NfexcDes);
-    void   calcGPAmeasPara(double fexcDes_i);
-    void   printLine();
+    void    fexcDesLogspace(double fMin, double fMax, int NfexcDes);
+    void    calcGPAmeasPara(double fexcDes_i);
+    void    printLine();
 
 };
\ No newline at end of file