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

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

Author: ben_graeler
Date: 2013-02-08 09:38:15 +0100 (Fri, 08 Feb 2013)
New Revision: 85

Removed:
   pkg/src/
Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
   pkg/R/wrappingCFunctions.R
   spcopula_0.1-1.tar.gz
   spcopula_0.1-1.zip
Log:
- removed C-code and point to R-wrappers in VineCopula instead

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-02-07 17:44:41 UTC (rev 84)
+++ pkg/DESCRIPTION	2013-02-08 08:38:15 UTC (rev 85)
@@ -2,7 +2,7 @@
 Type: Package
 Title: copula driven spatial analysis
 Version: 0.1-1
-Date: 2013-02-07
+Date: 2013-02-08
 Author: Benedikt Graeler
 Maintainer: Benedikt Graeler <ben.graeler at uni-muenster.de>
 Description: This package provides a framework to analyse via copulas spatial and spatio-temporal data provided in the format of the spacetime package. Additionally, support for calculating different multivariate return periods is implemented.

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2013-02-07 17:44:41 UTC (rev 84)
+++ pkg/NAMESPACE	2013-02-08 08:38:15 UTC (rev 85)
@@ -49,4 +49,4 @@
 exportClasses(surClaytonCopula, r90ClaytonCopula, r270ClaytonCopula)
 exportClasses(surGumbelCopula, r90GumbelCopula, r270GumbelCopula)
 
-useDynLib("spcopula")
\ No newline at end of file
+# useDynLib("spcopula")
\ No newline at end of file

Modified: pkg/R/wrappingCFunctions.R
===================================================================
--- pkg/R/wrappingCFunctions.R	2013-02-07 17:44:41 UTC (rev 84)
+++ pkg/R/wrappingCFunctions.R	2013-02-08 08:38:15 UTC (rev 85)
@@ -1,32 +1,45 @@
 # wrapping C functions to be used in spcopula
 
-RHfunc1 <- function(fam, n, u, param) {
+RHfunc1 <- function(fam, n, u, param) { 
   if(is.na(param[2]))
     param[2] <- 0
-  .C("Hfunc1", as.integer(fam), as.integer(n), as.double(u[,2]), as.double(u[,1]), 
-     as.double(param[1]), as.double(param[2]), as.double(rep(0, n)), 
-     PACKAGE = "spcopula")
+  VineCopula:::RHfunc1(fam, n, u, param)
+#   .C("Hfunc1", as.integer(fam), as.integer(n), as.double(u[,2]), as.double(u[,1]), 
+#      as.double(param[1]), as.double(param[2]), as.double(rep(0, n)), 
+#      PACKAGE = "spcopula")
 }
 
-RHfunc2 <- function(fam, n, u, param) {
-  .C("Hfunc2", as.integer(fam), as.integer(n), as.double(u[,1]), as.double(u[,2]), 
-     as.double(param[1]), as.double(param[2]), as.double(rep(0, n)), 
-     PACKAGE = "spcopula")
+RHfunc2 <- function(fam, n, u, param) { 
+  if(is.na(param[2]))
+    param[2] <- 0
+  VineCopula:::RHfunc2(fam, n, u, param)
+#   .C("Hfunc2", as.integer(fam), as.integer(n), as.double(u[,1]), as.double(u[,2]), 
+#      as.double(param[1]), as.double(param[2]), as.double(rep(0, n)), 
+#      PACKAGE = "spcopula")
 }
     
-RLL_mod_separate <- function(fam, n, u, param) {
-  .C("LL_mod_seperate", as.integer(fam), as.integer(n), as.double(u[,1]), 
-     as.double(u[,2]), as.double(param[1]), as.double(param[2]), 
-     as.double(rep(0, n)), PACKAGE = "spcopula")
+RLL_mod_separate <- function(fam, n, u, param) { 
+  if(is.na(param[2]))
+    param[2] <- 0
+  VineCopula:::RLL_mod_separate(fam, n, u, param)
+#   .C("LL_mod_seperate", as.integer(fam), as.integer(n), as.double(u[,1]), 
+#      as.double(u[,2]), as.double(param[1]), as.double(param[2]), 
+#      as.double(rep(0, n)), PACKAGE = "spcopula")
 }
 
 RarchCDF <- function(fam, n, u, param) {
-  .C("archCDF", as.double(u[,1]), as.double(u[,2]), as.integer(n), as.double(param),
-     as.integer(fam), as.double(rep(0, n)), PACKAGE = "spcopula")
+  if(is.na(param[2]))
+    param[2] <- 0
+  VineCopula:::RarchCDF(fam, n, u, param)
+#   .C("archCDF", as.double(u[,1]), as.double(u[,2]), as.integer(n), as.double(param),
+#      as.integer(fam), as.double(rep(0, n)), PACKAGE = "spcopula")
 }
 
 Rpcc <- function(fam, n, param) {
-  .C("pcc", as.integer(n), as.integer(2), as.integer(fam), as.integer(1), 
-     as.double(param[1]), as.double(param[2]), as.double(rep(0, n * 2)), 
-     PACKAGE = "spcopula")
+  if(is.na(param[2]))
+    param[2] <- 0
+  VineCopula:::Rpcc(fam, n, param)
+#   .C("pcc", as.integer(n), as.integer(2), as.integer(fam), as.integer(1), 
+#      as.double(param[1]), as.double(param[2]), as.double(rep(0, n * 2)), 
+#      PACKAGE = "spcopula")
 }
\ No newline at end of file

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

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