[Gmm-commits] r48 - pkg/gmm/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Apr 10 18:22:36 CEST 2012
Author: chaussep
Date: 2012-04-10 18:22:36 +0200 (Tue, 10 Apr 2012)
New Revision: 48
Modified:
pkg/gmm/R/charStable.R
Log:
fixed the warning produced by R check
Modified: pkg/gmm/R/charStable.R
===================================================================
--- pkg/gmm/R/charStable.R 2011-12-02 03:05:25 UTC (rev 47)
+++ pkg/gmm/R/charStable.R 2012-04-10 16:22:36 UTC (rev 48)
@@ -30,21 +30,21 @@
{
if(g == 0)
{
- the_car <- exp(complex(ima = d*tau))
+ the_car <- exp(complex(imaginary = d*tau))
}
else
{
re_p <- -g * abs(tau)
im_p <- d * tau
im_p[tau!=0] <- im_p[tau != 0] + re_p[tau != 0]*2/pi*b*sign(tau[tau != 0])*log(g*abs(tau[tau != 0]))
- the_car <- exp(complex(re = re_p, ima = im_p))
+ the_car <- exp(complex(real = re_p, imaginary = im_p))
}
}
else
{
if(g == 0)
{
- the_car <- exp(complex(ima = d*tau))
+ the_car <- exp(complex(imaginary = d*tau))
}
else
{
@@ -52,7 +52,7 @@
re_p <- -g^a*abs(tau)^a
im_p <- d*tau*1i
im_p[tau != 0] <- im_p[tau != 0] + re_p*( b*phi*sign(tau[tau != 0])*(abs(g*tau[tau != 0])^(1-a) - 1) )
- the_car <- exp(complex(re = re_p, ima = im_p))
+ the_car <- exp(complex(real = re_p, imaginary = im_p))
}
}
}
@@ -64,14 +64,14 @@
re_p <- -g*abs(tau)
im_p <- d*tau
im_p[tau!=0] <- im_p[tau != 0]+re_p*(b*2/pi*sign(tau[tau != 0])*log(abs(tau[tau!=0])))
- the_car <- exp(complex(re = re_p, ima = im_p))
+ the_car <- exp(complex(real = re_p, imaginary = im_p))
}
else
{
phi <- tan(pi*a/2)
re_p <- -g^a*abs(tau)^a
im_p <- re_p*(-phi*b*sign(tau)) + d*tau
- the_car <- exp(complex(re = re_p, ima = im_p))
+ the_car <- exp(complex(real = re_p, imaginary = im_p))
}
}
return(the_car)
More information about the Gmm-commits
mailing list