comparison sinest.cpp @ 3:42c078b19e9a

* Replace null-pointer hack with use of standard macro offsetof(struct,member)

   Returns the frequency estimate, in bins.
 */
 double LSESinusoid(cdouble* x, int N, double B, int M, double* c, double iH2, double& a, double& pp, double epf)
 {
   struct l_hx {int N; int k1; int k2; int M; double* c; double iH2; cdouble* x; double dhxpeak; double hxpeak;} p={N, 0, 0, M, c, iH2, x, 0, 0}; //(l_hx *)&params;
-  int dfshift=int(&((l_hx*)0)->dhxpeak);
+  int dfshift=offsetof(l_hx, dhxpeak);
 
   int inp;
   double minp=0;
   for (int i=0; i<N; i++)
   {

   No return value.
 */
 void LSESinusoid(double& f, cdouble* x, int N, double B, int M, double* c, double iH2, double& a, double& pp, double epf)
 {
   struct l_hx {int N; int k1; int k2; int M; double* c; double iH2; cdouble* x; double dhxpeak; double hxpeak;} p={N, 0, 0, M, c, iH2, x, 0, 0};
-  int dfshift=int(&((l_hx*)0)->dhxpeak);
+  int dfshift=offsetof(l_hx, dhxpeak);
 
   double inp=f;
   p.k1=ceil(inp-B); if (p.k1<0) p.k1=0;
   p.k2=floor(inp+B); if (p.k2>=p.N/2) p.k2=p.N/2-1;
   double tmp=Newton(f, ddIPWindow, &p, dfshift, epf);

   Returns the frequency estimate, in bins.
 */
 double LSESinusoid(int f1, int f2, cdouble* x, int N, double B, int M, double* c, double iH2, double& a, double& pp, double epf)
 {
   struct l_hx {int N; int k1; int k2; int M; double* c; double iH2; cdouble* x; double dhxpeak; double hxpeak;} p={N, 0, 0, M, c, iH2, x, 0, 0};
-  int dfshift=int(&((l_hx*)0)->dhxpeak);
+  int dfshift=offsetof(l_hx, dhxpeak);
 
   int inp;
   double minp=0;
   for (int i=f1; i<f2; i++)
   {

   f.
 */
 int LSESinusoid(double& f, double f1, double f2, cdouble* x, int N, double B, int M, double* c, double iH2, double& a, double& pp, double epf)
 {
   struct l_hx {int N; int k1; int k2; int M; double* c; double iH2; cdouble* x; double dhxpeak; double hxpeak;} p={N, 0, 0, M, c, iH2, x, 0, 0};//(l_hx *)&params;
-  int dfshift=int(&((l_hx*)0)->dhxpeak);
+  int dfshift=offsetof(l_hx, dhxpeak);
 
   int result=0;
   double inp=f;
   p.k1=ceil(inp-B); if (p.k1<0) p.k1=0;
   p.k2=floor(inp+B); if (p.k2>=p.N/2) p.k2=p.N/2-1;

   Returns an error bound of the frequency estimate.
 */
 double LSESinusoidMP(double& f, double f1, double f2, cdouble** x, int Fr, int N, double B, int M, double* c, double iH2, double* a, double* ph, double epf)
 {
   struct l_ip1 {int N; int k1; int k2; int M; double* c; double iH2; int L; cdouble** x; double dsip; double sip; cdouble* lmd;} p={N, 0, 0, M, c,iH2, Fr, x, 0, 0, 0};
-  int dfshift=int(&((l_ip1*)0)->dsip), fshift=int(&((l_ip1*)0)->sip);
+  int dfshift=offsetof(l_ip1, dsip), fshift=offsetof(l_ip1, sip);
 
   double inp=f;
   p.k1=ceil(inp-B); if (p.k1<0) p.k1=0;
   p.k2=floor(inp+B); if (p.k2>=p.N/2) p.k2=p.N/2-1;
   double errf=Newton1dmax(f, f1, f2, ddsIPWindow, &p, dfshift, fshift, dsIPWindow, dfshift, epf);

 */
 double LSESinusoidMPC(double& f, double f1, double f2, cdouble** x, int Fr, int N, int Offst, double B, int M, double* c, double iH2, double* a, double* ph, double epf)
 {
   struct l_ip {int N; int k1; int k2; int M; double* c; double iH2; int L; double offst_rel; cdouble** x; double sdip; double sip;}
     p={N, 0, 0, M, c,iH2, Fr, Offst*1.0/N, x, 0, 0};
-	int dfshift=int(&((l_ip*)0)->sdip), fshift=int(&((l_ip*)0)->sip);
+    int dfshift=offsetof(l_ip, sdip), fshift=offsetof(l_ip, sip);
 
   double inp=f;
   p.k1=ceil(inp-B); if (p.k1<0) p.k1=0;
   p.k2=floor(inp+B); if (p.k2>=p.N/2) p.k2=p.N/2-1;
   double errf=Newton1dmax(f, f1, f2, ddsIPWindowC, &p, dfshift, fshift, dsIPWindowC, dfshift, epf);

   int result=0;
   double inp=f2;
   int k1=ceil(inp-B); if (k1<0) k1=0;
   int k2=floor(inp+B); if (k2>=N/2) k2=N/2-1;
   struct l_hx {int N; int k1; int k2; double* c; double* d; int M; double iH2; cdouble* x; double f1; double dipwindow; double ipwindow;} p={N, k1, k2, c, d, M, iH2, x, f1, 0, 0};
-  int dfshift=int(&((l_hx*)0)->dipwindow);// fshift=int(&((l_hx*)0)->ipwindow);
+  int dfshift=offsetof(l_hx, dipwindow);// fshift=int(&((l_hx*)0)->ipwindow);
 
   double tmp=Newton(f2, ddsIPWindowDuo, &p, dfshift, epf, 100, 1e-256, fmin, fmax);
   if (tmp!=-1 && f2>fmin && f2<fmax) result=1;
   else
   {