[Prob-commits] r45 - in pkg: . R

[noreply at r-forge.r-project.org]

Author: gkerns
Date: 2013-12-11 15:34:30 +0100 (Wed, 11 Dec 2013)
New Revision: 45

Modified:
   pkg/DESCRIPTION
   pkg/R/characteristicfunctions.r
   pkg/R/misc.r
Log:
getting prob ready for CRAN


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-11-20 20:55:25 UTC (rev 44)
+++ pkg/DESCRIPTION	2013-12-11 14:34:30 UTC (rev 45)
@@ -14,5 +14,5 @@
  large numbers, adding random variables, and finding marginal distributions.
  Characteristic functions for all base R distributions are included.
 License: GPL (>= 3)
-URL: http://prob.r-forge.r-project.org, http://people.ysu.edu/~gkerns
+URL: http://prob.r-forge.r-project.org, http://people.ysu.edu/~gkerns/
 

Modified: pkg/R/characteristicfunctions.r
===================================================================
--- pkg/R/characteristicfunctions.r	2013-11-20 20:55:25 UTC (rev 44)
+++ pkg/R/characteristicfunctions.r	2013-12-11 14:34:30 UTC (rev 45)
@@ -7,7 +7,7 @@
     if (shape1 <=0 || shape2 <=0)
         stop("shape1, shape2 must be positive")
     if (identical(all.equal(ncp, 0), TRUE)){
-        require(fAsianOptions)
+        # require(fAsianOptions)
         kummerM(1i*t, shape1, shape1 + shape2)
     } else {
         fr <- function(x) cos(t*x)*dbeta(x, shape1, shape2, ncp)
@@ -47,7 +47,7 @@
 cff <- function(t, df1, df2, ncp, kmax = 10){
     if (df1 <= 0 || df2 <= 0  )
         stop("df1 and df2 must be positive")
-    require(fAsianOptions)
+    # require(fAsianOptions)
     if( identical(all.equal(ncp, 0), TRUE) ){
         gamma((df1+df2)/2) / gamma(df2/2) * kummerU(-1i*df2*t/df1, df1/2, 1 - df2/2)
     } else {

Modified: pkg/R/misc.r
===================================================================
--- pkg/R/misc.r	2013-11-20 20:55:25 UTC (rev 44)
+++ pkg/R/misc.r	2013-12-11 14:34:30 UTC (rev 45)
@@ -35,7 +35,7 @@
 `permsn` <- function (x, m)
 {
 
-    require(combinat)
+    # require(combinat)
     if (is.numeric(x) && length(x) == 1 && x > 0 && trunc(x) == x)
 
         x <- seq(x)