[spcopula-commits] r76 - / pkg pkg/R

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

Author: ben_graeler
Date: 2013-01-05 18:28:48 +0100 (Sat, 05 Jan 2013)
New Revision: 76

Added:
   spcopula_1.0.76.tar.gz
   spcopula_1.0.76.zip
Removed:
   spcopula_1.0.75.tar.gz
   spcopula_1.0.75.zip
Modified:
   pkg/DESCRIPTION
   pkg/R/empiricalCopula.R
Log:
- additional workarounds to circumvent changes in copula 0.999-6

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-01-05 13:18:11 UTC (rev 75)
+++ pkg/DESCRIPTION	2013-01-05 17:28:48 UTC (rev 76)
@@ -1,7 +1,7 @@
 Package: spcopula
 Type: Package
 Title: copula driven spatial analysis
-Version: 1.0.75
+Version: 1.0.76
 Date: 2013-01-05
 Author: Benedikt Graeler
 Maintainer: Benedikt Graeler <ben.graeler at uni-muenster.de>

Modified: pkg/R/empiricalCopula.R
===================================================================
--- pkg/R/empiricalCopula.R	2013-01-05 13:18:11 UTC (rev 75)
+++ pkg/R/empiricalCopula.R	2013-01-05 17:28:48 UTC (rev 76)
@@ -35,10 +35,22 @@
 ## jcdf ##
 # from package copula
 pempCop.C <- function(u, copula) {
-  Cn(copula at sample, u) # preferred use instead of direct C-code from copula <=0.999-5
-#   .C("RmultCn", as.double(copula at sample), as.integer(nrow(copula at sample)),
-#      copula at dimension, as.double(u), as.integer(nrow(u)), as.double(u[,1]),
-#      PACKAGE="copula")[[6]]
+#   Cn(u, copula at sample, do.pobs=F, method="C") # preferred use instead of direct C-code from copula <=0.999-5
+
+  # annoying hack, to be removed after release of copula 0.999-6 with the line above
+  if("RmultCn" %in% names(getDLLRegisteredRoutines(getLoadedDLLs()[["copula"]][["path"]])[[1]])) {
+    if(getDLLRegisteredRoutines(getLoadedDLLs()[["copula"]][["path"]])[[1]][["RmultCn"]]$numParameters == 6)
+       .C("RmultCn", as.double(copula at sample), as.integer(nrow(copula at sample)),
+         copula at dimension, as.double(u), as.integer(nrow(u)), as.double(u[,1]),
+         PACKAGE="copula")[[6]]
+    else
+      .C("RmultCn", as.double(copula at sample), as.integer(nrow(copula at sample)),
+         copula at dimension, as.double(u), as.integer(nrow(u)), as.double(u[,1]),
+         as.double(0), PACKAGE="copula")[[6]]
+  } else # copula > 0.999-5
+    .C("Cn_C", as.double(copula at sample), as.integer(nrow(copula at sample)),
+       copula at dimension, as.double(u), as.integer(nrow(u)), as.double(u[,1]),
+       as.double(0), PACKAGE="copula")[[6]]
 }
 
 setMethod("pCopula", signature("numeric", "empiricalCopula"),

Deleted: spcopula_1.0.75.tar.gz
===================================================================
(Binary files differ)

Deleted: spcopula_1.0.75.zip
===================================================================
(Binary files differ)

Added: spcopula_1.0.76.tar.gz
===================================================================
(Binary files differ)


Property changes on: spcopula_1.0.76.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: spcopula_1.0.76.zip
===================================================================
(Binary files differ)


Property changes on: spcopula_1.0.76.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream