[spcopula-commits] r61 - in pkg: . R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Sep 11 10:40:18 CEST 2012
Author: ben_graeler
Date: 2012-09-11 10:40:17 +0200 (Tue, 11 Sep 2012)
New Revision: 61
Modified:
pkg/DESCRIPTION
pkg/R/BB1copula.R
pkg/R/BB6copula.R
pkg/R/BB7copula.R
pkg/R/BB8copula.R
pkg/R/ClaytonGumbelCopula.R
pkg/R/JoeCopula.R
pkg/R/asCopula.R
pkg/R/cqsCopula.R
pkg/R/spatialPreparation.R
Log:
Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/DESCRIPTION 2012-09-11 08:40:17 UTC (rev 61)
@@ -1,8 +1,8 @@
Package: spcopula
Type: Package
Title: copula driven spatial analysis
-Version: 1.0.60
-Date: 2012-06-29
+Version: 1.0.61
+Date: 2012-09-11
Author: Benedikt Graeler
Maintainer: Benedikt Graeler <ben.graeler at uni-muenster.de>
Description: This package provides a framework to analyse spatial data provided in the format of the spacetime package with copulas. Additionally, support for calculating multivariate return periods is implemented.
Modified: pkg/R/BB1copula.R
===================================================================
--- pkg/R/BB1copula.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/BB1copula.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -28,7 +28,7 @@
# constructor
BB1Copula <- function (param) {
- val <- new("BB1Copula", dimension = 2, parameters = param,
+ val <- new("BB1Copula", dimension = as.integer(2), parameters = param,
param.names = c("theta", "delta"), param.lowbnd = c(0, 1), param.upbnd = c(Inf, Inf), family=7, message = "BB1 copula family. Number 7 in CDVine.")
val
}
@@ -77,7 +77,7 @@
# constructor
surBB1Copula <- function (param) {
- val <- new("surBB1Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(0, 1), param.upbnd = c(Inf, Inf), family=17, message = "Survival BB1 copula family. Number 17 in CDVine.")
+ val <- new("surBB1Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(0, 1), param.upbnd = c(Inf, Inf), family=17, message = "Survival BB1 copula family. Number 17 in CDVine.")
val
}
@@ -124,7 +124,7 @@
# constructor
r90BB1Copula <- function (param) {
- val <- new("r90BB1Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(0, -1), family=27, message = "90 deg rotated BB1 copula family. Number 27 in CDVine.")
+ val <- new("r90BB1Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(0, -1), family=27, message = "90 deg rotated BB1 copula family. Number 27 in CDVine.")
val
}
@@ -156,7 +156,7 @@
# constructor
r270BB1Copula <- function (param) {
- val <- new("r270BB1Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(0, -1), family=37, message = "270 deg rotated BB1 copula family. Number 37 in CDVine.")
+ val <- new("r270BB1Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(0, -1), family=37, message = "270 deg rotated BB1 copula family. Number 37 in CDVine.")
val
}
Modified: pkg/R/BB6copula.R
===================================================================
--- pkg/R/BB6copula.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/BB6copula.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -28,7 +28,7 @@
# constructor
BB6Copula <- function (param) {
- val <- new("BB6Copula", dimension = 2, parameters = param,
+ val <- new("BB6Copula", dimension = as.integer(2), parameters = param,
param.names = c("theta", "delta"), param.lowbnd = c(1, 1), param.upbnd = c(Inf, Inf), family=8, message = "BB6 copula family. Number 8 in CDVine.")
val
}
@@ -78,7 +78,7 @@
# constructor
surBB6Copula <- function (param) {
- val <- new("surBB6Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(1, 1), param.upbnd = c(Inf, Inf), family=18, message = "Survival BB6 copula family. Number 18 in CDVine.")
+ val <- new("surBB6Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(1, 1), param.upbnd = c(Inf, Inf), family=18, message = "Survival BB6 copula family. Number 18 in CDVine.")
val
}
@@ -126,7 +126,7 @@
# constructor
r90BB6Copula <- function (param) {
- val <- new("r90BB6Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(-1, -1), family=28, message = "90 deg rotated BB6 copula family. Number 28 in CDVine.")
+ val <- new("r90BB6Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(-1, -1), family=28, message = "90 deg rotated BB6 copula family. Number 28 in CDVine.")
val
}
@@ -160,7 +160,7 @@
# constructor
r270BB6Copula <- function (param) {
- val <- new("r270BB6Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(-1, -1), family=38, message = "270 deg rotated BB6 copula family. Number 38 in CDVine.")
+ val <- new("r270BB6Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(-1, -1), family=38, message = "270 deg rotated BB6 copula family. Number 38 in CDVine.")
val
}
Modified: pkg/R/BB7copula.R
===================================================================
--- pkg/R/BB7copula.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/BB7copula.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -28,7 +28,7 @@
# constructor
BB7Copula <- function (param) {
- val <- new("BB7Copula", dimension = 2, parameters = param,
+ val <- new("BB7Copula", dimension = as.integer(2), parameters = param,
param.names = c("theta", "delta"), param.lowbnd = c(1, 0), param.upbnd = c(Inf, Inf), family=9, message = "BB7 copula family. Number 9 in CDVine.")
val
}
@@ -79,7 +79,7 @@
# constructor
surBB7Copula <- function (param) {
- val <- new("surBB7Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(1, 0), param.upbnd = c(Inf, Inf), family= 19, message = "Survival BB7 copula family. Number 19 in CDVine.")
+ val <- new("surBB7Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(1, 0), param.upbnd = c(Inf, Inf), family= 19, message = "Survival BB7 copula family. Number 19 in CDVine.")
return(val)
}
@@ -127,7 +127,7 @@
# constructor
r90BB7Copula <- function (param) {
- val <- new("r90BB7Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(-1, 0), family=29, message = "90 deg rotated BB7 copula family. Number 29 in CDVine.")
+ val <- new("r90BB7Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(-1, 0), family=29, message = "90 deg rotated BB7 copula family. Number 29 in CDVine.")
val
}
@@ -161,7 +161,7 @@
# constructor
r270BB7Copula <- function (param) {
- val <- new("r270BB7Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(-1, -1), family=39, message = "270 deg rotated BB7 copula family. Number 39 in CDVine.")
+ val <- new("r270BB7Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -Inf), param.upbnd = c(-1, -1), family=39, message = "270 deg rotated BB7 copula family. Number 39 in CDVine.")
val
}
Modified: pkg/R/BB8copula.R
===================================================================
--- pkg/R/BB8copula.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/BB8copula.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -28,7 +28,7 @@
# constructor
BB8Copula <- function (param) {
- val <- new("BB8Copula", dimension = 2, parameters = param,
+ val <- new("BB8Copula", dimension = as.integer(2), parameters = param,
param.names = c("theta", "delta"), param.lowbnd = c(1, 0), param.upbnd = c(Inf, 1), family=10, message = "BB8 copula family. Number 10 in CDVine.")
val
}
@@ -78,7 +78,7 @@
# constructor
surBB8Copula <- function (param) {
- val <- new("surBB8Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(1, 0), param.upbnd = c(Inf, 1), family=20, message = "Survival BB8 copula family. Number 20 in CDVine.")
+ val <- new("surBB8Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(1, 0), param.upbnd = c(Inf, 1), family=20, message = "Survival BB8 copula family. Number 20 in CDVine.")
val
}
@@ -127,7 +127,7 @@
# constructor
r90BB8Copula <- function (param) {
- val <- new("r90BB8Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -1), param.upbnd = c(-1, 0), family=30, message = "90 deg rotated BB8 copula family. Number 30 in CDVine.")
+ val <- new("r90BB8Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -1), param.upbnd = c(-1, 0), family=30, message = "90 deg rotated BB8 copula family. Number 30 in CDVine.")
val
}
@@ -161,7 +161,7 @@
# constructor
r270BB8Copula <- function (param) {
- val <- new("r270BB8Copula", dimension = 2, parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -1), param.upbnd = c(-1, 0), family=40, message = "270 deg rotated BB8 copula family. Number 40 in CDVine.")
+ val <- new("r270BB8Copula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"), param.lowbnd = c(-Inf, -1), param.upbnd = c(-1, 0), family=40, message = "270 deg rotated BB8 copula family. Number 40 in CDVine.")
val
}
Modified: pkg/R/ClaytonGumbelCopula.R
===================================================================
--- pkg/R/ClaytonGumbelCopula.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/ClaytonGumbelCopula.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -31,7 +31,7 @@
# constructor
surClaytonCopula <- function (param) {
- new("surClaytonCopula", dimension = 2, parameters = param, param.names = c("theta"),
+ new("surClaytonCopula", dimension = as.integer(2), parameters = param, param.names = c("theta"),
param.lowbnd = 0, param.upbnd = Inf, family=13,
message = "Survival Clayton copula family. Number 13 in CDVine.")
}
@@ -86,7 +86,7 @@
# constructor
r90ClaytonCopula <- function (param) {
- new("r90ClaytonCopula", dimension = 2, parameters = param, param.names = c("theta", "delta"),
+ new("r90ClaytonCopula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"),
param.lowbnd = -Inf, param.upbnd = 0, family=23,
message = "90 deg rotated Clayton copula family. Number 23 in CDVine.")
}
@@ -126,7 +126,7 @@
# constructor
r270ClaytonCopula <- function (param) {
- new("r270ClaytonCopula", dimension = 2, parameters = param, param.names = c("theta", "delta"),
+ new("r270ClaytonCopula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"),
param.lowbnd = -Inf, param.upbnd = 0, family=33,
message = "270 deg rotated Clayton copula family. Number 33 in CDVine.")
}
@@ -187,7 +187,7 @@
# constructor
surGumbelCopula <- function (param) {
- new("surGumbelCopula", dimension = 2, parameters = param, param.names = c("theta"),
+ new("surGumbelCopula", dimension = as.integer(2), parameters = param, param.names = c("theta"),
param.lowbnd = 1, param.upbnd = Inf, family=14,
message = "Survival Gumbel copula family. Number 14 in CDVine.")
}
@@ -242,7 +242,7 @@
# constructor
r90GumbelCopula <- function (param) {
- new("r90GumbelCopula", dimension = 2, parameters = param, param.names = c("theta", "delta"),
+ new("r90GumbelCopula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"),
param.lowbnd = -Inf, param.upbnd = -1, family=24,
message = "90 deg rotated Gumbel copula family. Number 24 in CDVine.")
}
@@ -282,7 +282,7 @@
# constructor
r270GumbelCopula <- function (param) {
- new("r270GumbelCopula", dimension = 2, parameters = param, param.names = c("theta", "delta"),
+ new("r270GumbelCopula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"),
param.lowbnd = -Inf, param.upbnd = -1, family=34,
message = "270 deg rotated Gumbel copula family. Number 34 in CDVine.")
}
Modified: pkg/R/JoeCopula.R
===================================================================
--- pkg/R/JoeCopula.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/JoeCopula.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -28,7 +28,7 @@
# constructor
JoeCopula <- function (param) {
- new("JoeCopula", dimension = 2, parameters = param, param.names = c("theta", "delta"),
+ new("JoeCopula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"),
param.lowbnd = 1, param.upbnd = Inf, family=6,
message = "Joe copula family. Number 6 in CDVine.")
}
@@ -84,7 +84,7 @@
# constructor
surJoeCopula <- function (param) {
- new("surJoeCopula", dimension = 2, parameters = param, param.names = c("theta", "delta"),
+ new("surJoeCopula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"),
param.lowbnd = 1, param.upbnd = Inf, family=16,
message = "Survival Joe copula family. Number 16 in CDVine.")
}
@@ -139,7 +139,7 @@
# constructor
r90JoeCopula <- function (param) {
- new("r90JoeCopula", dimension = 2, parameters = param, param.names = c("theta", "delta"),
+ new("r90JoeCopula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"),
param.lowbnd = -Inf, param.upbnd = -1, family=26,
message = "90 deg rotated Joe copula family. Number 26 in CDVine.")
}
@@ -179,7 +179,7 @@
# constructor
r270JoeCopula <- function (param) {
- new("r270JoeCopula", dimension = 2, parameters = param, param.names = c("theta", "delta"),
+ new("r270JoeCopula", dimension = as.integer(2), parameters = param, param.names = c("theta", "delta"),
param.lowbnd = -Inf, param.upbnd = -1, family=36,
message = "270 deg rotated Joe copula family. Number 36 in CDVine.")
}
Modified: pkg/R/asCopula.R
===================================================================
--- pkg/R/asCopula.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/asCopula.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -28,9 +28,9 @@
# constructor
asCopula <- function (param) {
- val <- new("asCopula", dimension = 2, parameters = param,
+ val <- new("asCopula", dimension = as.integer(2), parameters = param,
param.names = c("a", "b"), param.lowbnd = c(limA(param[2]), -1),
- param.upbnd = c(1, 1), message = "asymmetric copula family with cubic and quadratic sections")
+ param.upbnd = c(1, 1), fullname = "asymmetric copula family with cubic and quadratic sections")
return(val)
}
Modified: pkg/R/cqsCopula.R
===================================================================
--- pkg/R/cqsCopula.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/cqsCopula.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -28,9 +28,9 @@
cqsCopula <-
function (param)
{
- val <- new("cqsCopula", dimension = 2, parameters = param,
+ val <- new("cqsCopula", dimension = as.integer(2), parameters = param,
param.names = c("a", "b"), param.lowbnd = c(limA(param[2]),-1),
- param.upbnd = c(1, 1), message = "copula family with cubic quadratic sections")
+ param.upbnd = c(1, 1), fullname = "copula family with cubic quadratic sections")
val
}
Modified: pkg/R/spatialPreparation.R
===================================================================
--- pkg/R/spatialPreparation.R 2012-06-29 07:48:08 UTC (rev 60)
+++ pkg/R/spatialPreparation.R 2012-09-11 08:40:17 UTC (rev 61)
@@ -1,6 +1,6 @@
#################################################################################
##
-## R package spcopula by Benedikt Gräler Copyright (C) 2011
+## R package spcopula by Benedikt Graeler Copyright (C) 2011
##
## This file is part of the R package spcopula.
##
More information about the spcopula-commits
mailing list