From b41d1c99a2bfe918bfa2e82c38373915071cc6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Pelletier?= Date: Sun, 23 Feb 2014 21:51:20 -0500 Subject: [PATCH] Correction des erreurs de R CMD check --- .Rbuildignore | 6 ++++++ .project | 1 - R/M.gauss.R | 4 ++-- R/V.gauss.R | 16 ++++++++-------- R/b.Crowder.Mod.R | 2 +- R/b.Crowder.R | 2 +- R/eqn.gauss.R | 4 ++-- man/a.Crowder.Mod.Rd | 22 ---------------------- man/b.Crowder.Mod.Rd | 31 +++++++++++++++++++++++++++++++ 9 files changed, 51 insertions(+), 37 deletions(-) create mode 100644 .Rbuildignore create mode 100644 man/b.Crowder.Mod.Rd diff --git a/.Rbuildignore b/.Rbuildignore new file mode 100644 index 0000000..04a8cf7 --- /dev/null +++ b/.Rbuildignore @@ -0,0 +1,6 @@ +^.*\.Rproj$ +^\.Rproj\.user$ +.gitignore +.project +.git +.settings diff --git a/.project b/.project index 98c9ace..195c150 100644 --- a/.project +++ b/.project @@ -14,6 +14,5 @@ de.walware.statet.base.StatetNature de.walware.statet.r.RNature - de.walware.statet.r.RPkgNature diff --git a/R/M.gauss.R b/R/M.gauss.R index fb82ab0..b80289e 100644 --- a/R/M.gauss.R +++ b/R/M.gauss.R @@ -17,6 +17,6 @@ #' @author Francois Pelletier M.gauss <- function(param,Y,meanf,variancef,dmean,dsd) { - -(a.gauss(param,variancef,dmean,dsd) %o% dmean(param) + - 2*sqrt(variancef(param)) * b.gauss(param,variancef,dmean,dsd) %*% t(dsd(param))) + -(a.gauss(param,variancef,dmean) %o% dmean(param) + + 2*sqrt(variancef(param)) * b.gauss(param,variancef,dsd) %*% t(dsd(param))) } \ No newline at end of file diff --git a/R/V.gauss.R b/R/V.gauss.R index 3abe89f..9a96309 100644 --- a/R/V.gauss.R +++ b/R/V.gauss.R @@ -20,14 +20,14 @@ #' @author Francois Pelletier V.gauss <- function(param,Y,meanf,variancef,skewnessf,kurtosisf,dmean,dsd) { - (variancef(param)*(a.gauss(param,variancef,dmean,dsd) %o% - a.gauss(param,variancef,dmean,dsd) + + (variancef(param)*(a.gauss(param,variancef,dmean) %o% + a.gauss(param,variancef,dmean) + sqrt(variancef(param)) * skewnessf(param) * - (a.gauss(param,variancef,dmean,dsd) %o% - b.gauss(param,variancef,dmean,dsd) + - b.gauss(param,variancef,dmean,dsd) %o% - a.gauss(param,variancef,dmean,dsd)) + + (a.gauss(param,variancef,dmean) %o% + b.gauss(param,variancef,dsd) + + b.gauss(param,variancef,dsd) %o% + a.gauss(param,variancef,dmean)) + variancef(param)*(kurtosis(param)+2) * - b.gauss(param,variancef,dmean,dsd) %*% - t(b.gauss(param,variancef,dmean,dsd)))) + b.gauss(param,variancef,dsd) %*% + t(b.gauss(param,variancef,dsd)))) } diff --git a/R/b.Crowder.Mod.R b/R/b.Crowder.Mod.R index e92c735..e9c7a55 100644 --- a/R/b.Crowder.Mod.R +++ b/R/b.Crowder.Mod.R @@ -15,7 +15,7 @@ #' @return First weighting vector #' #' @author Francois Pelletier -a.Crowder.Mod <- function(param,Y,variancef,dmean,dsd) +b.Crowder.Mod <- function(param,Y,variancef,dmean,dsd) { (moments::skewness(Y)*dmean(param)-2*dsd(param)) / (variancef(param)^(3/2)*gammaf.Crowder.Mod(Y)) diff --git a/R/b.Crowder.R b/R/b.Crowder.R index 0d3ea21..38921d3 100644 --- a/R/b.Crowder.R +++ b/R/b.Crowder.R @@ -20,5 +20,5 @@ b.Crowder <- function(param,variancef,skewnessf,kurtosisf,dmean,dsd) { (skewnessf(param)*dmean(param)- 2*dsd(param))/ - (variancef(param)^(3/2)*gamma.Crowder(param,skewnessf,kurtosisf)) + (variancef(param)^(3/2)*gammaf.Crowder(param,skewnessf,kurtosisf)) } \ No newline at end of file diff --git a/R/eqn.gauss.R b/R/eqn.gauss.R index 7fca039..fd4a29b 100644 --- a/R/eqn.gauss.R +++ b/R/eqn.gauss.R @@ -18,6 +18,6 @@ #' @author Francois Pelletier eqn.gauss <- function(param,Y,meanf,variancef,dmean,dsd) { - a.gauss(param,variancef,dmean,dsd) * sum(Y-meanf(param)) + - b.gauss(param,variancef,dmean,dsd) * sum((Y-meanf(param))^2-variancef(param)) + a.gauss(param,variancef,dmean) * sum(Y-meanf(param)) + + b.gauss(param,variancef,dsd) * sum((Y-meanf(param))^2-variancef(param)) } diff --git a/man/a.Crowder.Mod.Rd b/man/a.Crowder.Mod.Rd index c194011..7474fa4 100644 --- a/man/a.Crowder.Mod.Rd +++ b/man/a.Crowder.Mod.Rd @@ -2,8 +2,6 @@ \alias{a.Crowder.Mod} \title{First weighting vector of the modified quadratic estimating equation (Crowder)} \usage{ -a.Crowder.Mod(param, Y, variancef, dmean, dsd) - a.Crowder.Mod(param, Y, variancef, dmean, dsd) } \arguments{ @@ -19,35 +17,15 @@ a.Crowder.Mod(param, Y, variancef, dmean, dsd) \item{dsd}{Derivative in respect to the parameter vector of the standard deviation function of the distribution} - - \item{param}{Vector of parameters of the distribution - function} - - \item{Y}{Individual data sample} - - \item{variancef}{Variance function of the distribution} - - \item{dmean}{Derivative in respect to the parameter - vector of the mean function of the distribution} - - \item{dsd}{Derivative in respect to the parameter vector - of the standard deviation function of the distribution} } \value{ -First weighting vector - First weighting vector } \description{ First weighting vector of the modified quadratic estimating equation (Crowder) - -Second weighting vector of the modified quadratic -estimating equation (Crowder) } \author{ -Francois Pelletier - Francois Pelletier } diff --git a/man/b.Crowder.Mod.Rd b/man/b.Crowder.Mod.Rd new file mode 100644 index 0000000..d2626fd --- /dev/null +++ b/man/b.Crowder.Mod.Rd @@ -0,0 +1,31 @@ +\name{b.Crowder.Mod} +\alias{b.Crowder.Mod} +\title{Second weighting vector of the modified quadratic estimating equation (Crowder)} +\usage{ +b.Crowder.Mod(param, Y, variancef, dmean, dsd) +} +\arguments{ + \item{param}{Vector of parameters of the distribution + function} + + \item{Y}{Individual data sample} + + \item{variancef}{Variance function of the distribution} + + \item{dmean}{Derivative in respect to the parameter + vector of the mean function of the distribution} + + \item{dsd}{Derivative in respect to the parameter vector + of the standard deviation function of the distribution} +} +\value{ +First weighting vector +} +\description{ +Second weighting vector of the modified quadratic +estimating equation (Crowder) +} +\author{ +Francois Pelletier +} +