[spcopula-commits] r79 - / pkg/R pkg/man

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

Author: ben_graeler
Date: 2013-01-09 11:35:02 +0100 (Wed, 09 Jan 2013)
New Revision: 79

Modified:
   pkg/R/empiricalCopula.R
   pkg/R/utilities.R
   pkg/man/dependencePlot.Rd
   spcopula_0.1-1.tar.gz
   spcopula_0.1-1.zip
Log:
- changed empirical copula using now C.n instead of Cn if available in the installed copula package

Modified: pkg/R/empiricalCopula.R
===================================================================
--- pkg/R/empiricalCopula.R	2013-01-08 16:35:59 UTC (rev 78)
+++ pkg/R/empiricalCopula.R	2013-01-09 10:35:02 UTC (rev 79)
@@ -35,14 +35,11 @@
 ## jcdf ##
 # from package copula
 pempCop.C <- function(u, copula) {
-  # r-forge hack, to be removed after release of copula 0.999-6 with the line above
-  if(length(formals(Cn))==2) {
+  # r-forge hack, to be removed after release of copula 0.999-6
+  if(exists("C.n")) {
+    return(C.n(u, copula at sample, offset=0, method="C"))
+  } else
     return(Cn(copula at sample,u))
-  }
-  if (length(formals(Cn))== 5) {
-    return(Cn(u, copula at sample, do.pobs=FALSE, offset=0, method="C"))
-  }
-  stop(length(formals(Cn)))
 }
 
 setMethod("pCopula", signature("numeric", "empiricalCopula"),

Modified: pkg/R/utilities.R
===================================================================
--- pkg/R/utilities.R	2013-01-08 16:35:59 UTC (rev 78)
+++ pkg/R/utilities.R	2013-01-09 10:35:02 UTC (rev 79)
@@ -56,6 +56,6 @@
 }
 
 univScatter <- function(formula=NULL, smpl) {
-  warning("Use unitScatter instead!")
+  .Deprecated("unitScatter")
   unitScatter(formula, smpl)
 }
\ No newline at end of file

Modified: pkg/man/dependencePlot.Rd
===================================================================
--- pkg/man/dependencePlot.Rd	2013-01-08 16:35:59 UTC (rev 78)
+++ pkg/man/dependencePlot.Rd	2013-01-09 10:35:02 UTC (rev 79)
@@ -47,6 +47,6 @@
 \code{\link{smoothScatter}}
 }
 \examples{
-dependencePlot(smpl=rCopula(500,asCopula(c(-1,1))))
+\dontrun{dependencePlot(smpl=rCopula(500,asCopula(c(-1,1))))}
 }
 \keyword{plot}

Modified: spcopula_0.1-1.tar.gz
===================================================================
(Binary files differ)

Modified: spcopula_0.1-1.zip
===================================================================
(Binary files differ)