version 1.0-3

cran · Oct 31, 2012 · 19b204b · 19b204b
1 parent 88ccb3b
commit 19b204b
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 24 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,18 +1,18 @@
 Package: NORMT3
 Title: Evaluates complex erf, erfc, Faddeeva, and density of sum of
         Gaussian and Student's t
-Version: 1.0-2
-Date: 17/03/2010
+Version: 1.0-3
+Date: 31/10/2012
 Author: Guy Nason <g.p.nason@bristol.ac.uk>
 Maintainer: Guy Nason <g.p.nason@bristol.ac.uk>
 Depends: R (>= 2.0)
 Description: Evaluates the probability density function of the sum of
         the Gaussian and Student's t density on 3 degrees of freedom.
         Evaluates the p.d.f. of the sphered Student's t density
-        function. Also evaluates the erf, and erfc functions on
+        function.  Also evaluates the erf, and erfc functions on
         complex-valued arguments. Thanks to Krishna Myneni the function
         is calculates the Faddeeva function also!
 License: GPL-2
-Packaged: 2012-10-29 08:57:20 UTC; ripley
+Packaged: 2012-10-31 16:44:53 UTC; magpn
 Repository: CRAN
-Date/Publication: 2012-10-29 08:57:20
+Date/Publication: 2012-10-31 18:08:31
diff --git a/MD5 b/MD5
@@ -1,14 +1,14 @@
-fd5fe172ef3ae16f4cc83501ea3215dd *DESCRIPTION
-9fdfeb11f7ddba6f3aab9aaa6b1ac5dd *NAMESPACE
+d780edd1cb36af1cef46dcb8ebb59d3a *DESCRIPTION
+f4edaec4de16012de83068b8b65a4b51 *NAMESPACE
 adef3a419005deb8c91bade7964cb31c *R/dnormt3.R
 dce3e8bb5f353fda3d700bdba01f4651 *R/dst.R
 33717d45906e412719aa2035088377f4 *R/erf.R
-2b2c7491f277ea56529f7dc734267509 *R/erfc.R
-b9b9b1afbe458bdac0b8e34ad1e7163e *R/firstlib.R
-411d2dcce18a3bef73c4577aea757ed2 *R/ic1.R
-a96ad4f75bd8fb4c9386afb8366caa78 *R/is1.R
+4f69cd343f2624e50879cdbf92054eca *R/erfc.R
+11c9f1e8f8a61fc772b3f3c6b2af865c *R/ic1.R
+170b355fb6618c1a8293c80d4e63a4f0 *R/is1.R
+dfc10130789e59594bd9973b66ba9c78 *R/myInitMessages.R
 2544c29d1fdb284e4b8e0b7faa257080 *R/normt3ip.R
-ea867ba161640aaa7004b538e0982f03 *R/wofz.R
+d287740dce7aa6f773465a8ef3fbe0b9 *R/wofz.R
 69ea61dec509d31c2a8954e2e56596a6 *man/dnormt3.Rd
 e607dd933db78b0e85db55bf365174f5 *man/dst.Rd
 90037f89dc17dab9a589590bc90a910c *man/erf.Rd

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,3 @@
-# Default NAMESPACE created by R
-# Remove the previous line if you edit this file
-
 # Export all names
 exportPattern(".")
+useDynLib(NORMT3)
diff --git a/R/erfc.R b/R/erfc.R
@@ -12,6 +12,6 @@ ans <- .C("IPerfcvec",
 if (ans$error != 0)
 	stop(paste("Error code from TOMS 680 was ", ans$error))
 
-return(complex(real=ans$ansx, im=ans$ansy))
+return(complex(real=ans$ansx, imaginary=ans$ansy))
 
 }
diff --git a/R/firstlib.R b/R/firstlib.R
diff --git a/R/ic1.R b/R/ic1.R
@@ -1,7 +1,7 @@
 "ic1" <-
 function (p,d) 
 {
-cc <- complex(re=0, im=p/2)
+cc <- complex(real=0, imaginary=p/2)
 
 (sqrt(pi)/2)*exp(-(p^2)/4)*(1-Re(erf(cc) - erf(cc-d)))
 

diff --git a/R/is1.R b/R/is1.R
@@ -2,7 +2,7 @@
 function (p,d) 
 {
 
-cc <- complex(re=0, im=p/2)
+cc <- complex(real=0, imaginary=p/2)
 
 (sqrt(pi)/2)*exp(-(p^2)/4)*Im(erf(cc-d))
 }
diff --git a/R/myInitMessages.R b/R/myInitMessages.R
@@ -0,0 +1,6 @@
+".onAttach"<-
+function(...)
+{
+packageStartupMessage("NORMT3: Evaluates erf, erfc, Faddeeva functions and Gaussian/T sum densities")
+packageStartupMessage("Copyright: Guy Nason 2005-2012")
+}
diff --git a/R/wofz.R b/R/wofz.R
@@ -12,6 +12,6 @@ ans <- .C("IPwofzvec",
 if (ans$error != 0)
 	stop(paste("Error code from TOMS 680 was ", ans$error))
 
-return(complex(real=ans$ansx, im=ans$ansy))
+return(complex(real=ans$ansx, imaginary=ans$ansy))
 
 }