[r-cran-geepack] 07/17: Imported Upstream version 1.2-1.gz

Andreas Tille tille at debian.org
Fri Dec 16 15:39:23 UTC 2016


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-geepack.

commit 3e85bdedf102b87c7791a63065a81114c45a01fe
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 16 15:44:39 2016 +0100

    Imported Upstream version 1.2-1.gz
---
 ChangeLog          | 441 +++++++++++++++++++++++++++--------------------------
 DESCRIPTION        |   8 +-
 MD5                |  12 +-
 R/geeglm-anova.R   |  19 ++-
 R/geeglm.R         |   2 +-
 build/vignette.rds | Bin 264 -> 265 bytes
 inst/CITATION      |  88 +++++------
 7 files changed, 291 insertions(+), 279 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e7da90..e22b128 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,217 +1,224 @@
-2014-09-13  Søren Højsgaard <sorenh at math.aau.dk>
-
-	* Maintainer of geepack is now Søren Højsgaard
-
-	* Location of vignette fixed
-
-	* Version 1.2-0 uploaded
-
-2012-01-27  Jun Yan  <jun.yan at uconn.edu>
-
-	* Commented out #undef NDEBUG in geesubs.cc.
-	* Added a VecPrint function in utils.cc to print DVector;
-	this replaces usage of cerr.
-
-2012-01-09  Jun Yan  <jun.yan at uconn.edu>
-
-	* Thank Jeffrey Horner <jeffrey.horner at vanderbilt.edu>
-	and Cole Beck <cole.beck at vanderbilt.edu> for fixing the
-	undefined symbol error (see 2011-11-14 entry:
-	_Z5ValidIiEN3TNT6VectorIT_EERS3_RNS1_IiEE).
-	The template function "Valid" (in original geesubs.cc)
-	should actually be in the header file.
-	This may fix the compilation error on ubuntu 11.10 too.
-
-2011-11-21  Jun Yan  <jun.yan at uconn.edu>
-
-	* Added an example to function relRisk.
-
-2011-11-21  Jun Yan  <jun.yan at uconn.edu>
-
-	* Added an example to function compCoef.
-
-	* Changed the JSS paper year from 2005 to 2006 in CITATION.
-
-2011-11-16  Jun Yan  <jun.yan at uconn.edu>
-
-	* Added function relRisk for relative risk regression
-	--- regression for binary response with log link.
-
-	* Added function relRisk for relative risk regression
- 	--- regression for binary response with log link.
-
-	* Added function compCoef for comparing coefficients
-	of the same sets of covariates between nested models.
-	This implements the method of Yan, Aseltine, and Harel
-	(2011, JEBS); for independent data, the method reduces
-	to Allison (1995, American Journal of Sociology).
-
-	* Fixed a bug in c++ code in constructing the working
-	covariance structure using the regression model of scale.
-	Simulation tests show improved efficiency in mean parameter
-	estimation when scale regression is present.
-
-2011-11-15 Soren Hojsgaard  <sorenh at mail.dk>
-
-	* Dependence on the doBy package has been removed.
-
-2011-11-14  Jun Yan  <jun.yan at uconn.edu>
-
-        * Added NAMESPACE for to comply with the requirement of R-2.14.0.
-
-	* Removed the "assert" lines in utils.cc in order not to crash R,
-	which is quite rude practice. A "-DNDEBUG" has been added to the
-	cppflags in Makevars for a better solution. Due to many asserts
-	in tnt, we cannot get rid of the NOTE message completely:
-	Found ‘_ZSt4cerr’, possibly from ‘std::cerr’ (C++)
-	Found ‘__assert_fail’, possibly from ‘assert’ (C)
-
-	* Added quote in statements like
-	extract(m, "response") to get rid of NOTE:
-	geese: no visible binding for global variable ‘response’
-
-	* Added a line of
-	#undef NDEBUG
-	to the beginning of geesubs.cc; thank Brian Ripley for the NMU.
-	Still unclear why the error without this line:
-	undefined symbol: _Z5ValidIiEN3TNT6VectorIT_EERS3_RNS1_IiEE
-
-
-2011-02-23  Søren Højsgaard <sorenh at agrsci.dk>
-
-	* In geeglm is checked if the model matrix is rank deficient; if
-	so then geeglm exits. Thanks to Jason D Thorpe for pointing this out.
-
-	* Bug in anova fixed. Thanks to Stefan Boehringer for pointing
-	this out.
-
-	* Version 1.0-18 uploaded.
-
-
-2010-01-26  Søren Højsgaard <sorenh at agrsci.dk>
-
-	* fixed2Zcor function has been added. This function makes it
-	easier to work with a fixed correlation matrix (in particular when
-	cluster sizes are not equal).
-
-	* A vignette on models with unequal cluster size, fixed
-	correlation matrices etc. has been added.
-
-	* Version 1.0-17 uploaded
-
-2008-12-08  Søren Højsgaard <sorenh at agrsci.dk>
-
-	* Bugfix in 1.0.15 caused problem in binomial case using
-	cbind(pos,neg). Thanks to Tobias Verbeke. Fixed now.
-
-	* Bugfix in 1.0.15 caused problem when using variables derived
-	from gam package call to geeglm. Thanks to Eric Rexstad. Fixed now.
-
-	* Using scale.fix argument gave problem in geeglm. Thanks to
-	Tobias Verbeke. Fixed now.
-
-	* Fitting large data set with binomial model and 3 measurements
-	per unit using unstructured correlation crashes R. Thanks to
-	Tobias Verbeke. Problem has *NOT* been solved but a remark has
-	been added to doc file.
-
-	* Version 1.0-16 uploaded
-
-2008-12-01  Søren Højsgaard <sorenh at agrsci.dk>
-
-	* When a factor has unused levels, the underlying C code
-	fails. This is now catured in geeglm. Thanks to Janet Young
-
-	* tests directory added to package
-
-	* Version 1.0-15 uploaded
-
-2007-07-13  Søren Højsgaard <sorenh at agrsci.dk>
-
-	* Smaller 'standardization' changes implemented. Thanks to Achim
-
-	* Version 1.0-14 uploaded
-
-2007-03-21  Søren Højsgaard <sorenh at agrsci.dk>
-
-	* A remark on fixed correlation structures has been added to the
-	geeglm.Rd doc file.
-
-	* A Wishlist file has been added
-
-	* Version 1.0-13 uploaded
-
-2007-03-21  Søren Højsgaard <sorenh at agrsci.dk>
-
-	* Bug in geeglm fixed so that it now works with a fixed
-	correlation structure. Thanks to Ulrich Halekoh for the fix.
-
-
-2006-02-13  Jun Yan  <jyan at stat.uiowa.edu>
-
-	* Bug in genZcor and genZodds fixed. 
-	Thanks to Chongzhi Di <cdi at jhsph.edu>. 
-	Previously, the matrice generated by genZcor/genZodds are 
-	wrong when the number of unique waves is greater than or
-	equal to 10.
-
-2006-01-24 Søren Højsgaard <sorenh at agrsci.dk>
-
-	* Bug in anova.geeglm fixed (showed up when there was only one
-	term on the right hand side of ~). 
-
-	* geeglm only works on complete data. This has been pointed out in
-	the man pages. (At some point of time, a proper na.action should be
-	taken). 
-
-	* All datasets are saved as .txt files (previously some were saved
-	as .rda files but that caused problems in building the package on
-	windows xp).
-
-2005-08-13  Jun Yan  <jyan at stat.uiowa.edu>
-
-	* The working correlation structure can now be "fixed".
-
-
-2005-06-13 Søren Højsgaard <sorenh at agrsci.dk>
-
-	* Søren Højsgaard has modified the geeglm function so that it can
-	take the 'waves' argument which is used for explicitely specifying
-	the ordering of repeated measurements on the same unit. geeglm can
-	also take the 'zcor' argument for a user defined working
-	correlation structure. 
-
-	* A documentation file for the genZcor
-	function has been added. 
-
-	* All data sets provided are now saved as
-	text files.
-
-	* ordgee has been modified to check if the response variable is an
-	ordered factor.
-
-	* geeglm can now take the argument std.err which specifies the
-	type of variance estimate to be calculated.
-
-2005-05-11 Søren Højsgaard <sorenh at agrsci.dk>
-
-	* Søren Højsgaard has modified the anova function to make it
-	calculate the correct degrees of freedom.
-
-
-2005-04-11  Jun Yan  <jyan at stat.uiowa.edu>
-
-	* Søren Højsgaard made some minor changes to geeglm - 
-	basically, that geese.control did not work. Now it does.
-
-
-2005-02-09  Jun Yan  <jyan at stat.uiowa.edu>
-
-	* Søren Højsgaard joined the development with geeglm, which 
-	"works like" glm and returns an object which is similar to 
-	a glm object. Residuals and predicted values can be extracted
-	using the generic functions as with a glm object. 
-
-	* An important feature of geeglm, is that an anova method 
-	exists for these models.
-
+2014-09-13  Søren Højsgaard <sorenh at math.aau.dk>
+
+	* geeglm objects now inherits from lm also (to prevent warning
+	when calling predict). 
+
+	* Version 1.2-1 uploaded
+
+2014-09-13  Søren Højsgaard <sorenh at math.aau.dk>
+
+	* Maintainer of geepack is now Søren Højsgaard
+
+	* Location of vignette fixed
+
+	* Version 1.2-0 uploaded
+
+2012-01-27  Jun Yan  <jun.yan at uconn.edu>
+
+	* Commented out #undef NDEBUG in geesubs.cc.
+	* Added a VecPrint function in utils.cc to print DVector;
+	this replaces usage of cerr.
+
+2012-01-09  Jun Yan  <jun.yan at uconn.edu>
+
+	* Thank Jeffrey Horner <jeffrey.horner at vanderbilt.edu>
+	and Cole Beck <cole.beck at vanderbilt.edu> for fixing the
+	undefined symbol error (see 2011-11-14 entry:
+	_Z5ValidIiEN3TNT6VectorIT_EERS3_RNS1_IiEE).
+	The template function "Valid" (in original geesubs.cc)
+	should actually be in the header file.
+	This may fix the compilation error on ubuntu 11.10 too.
+
+2011-11-21  Jun Yan  <jun.yan at uconn.edu>
+
+	* Added an example to function relRisk.
+
+2011-11-21  Jun Yan  <jun.yan at uconn.edu>
+
+	* Added an example to function compCoef.
+
+	* Changed the JSS paper year from 2005 to 2006 in CITATION.
+
+2011-11-16  Jun Yan  <jun.yan at uconn.edu>
+
+	* Added function relRisk for relative risk regression
+	--- regression for binary response with log link.
+
+	* Added function relRisk for relative risk regression
+ 	--- regression for binary response with log link.
+
+	* Added function compCoef for comparing coefficients
+	of the same sets of covariates between nested models.
+	This implements the method of Yan, Aseltine, and Harel
+	(2011, JEBS); for independent data, the method reduces
+	to Allison (1995, American Journal of Sociology).
+
+	* Fixed a bug in c++ code in constructing the working
+	covariance structure using the regression model of scale.
+	Simulation tests show improved efficiency in mean parameter
+	estimation when scale regression is present.
+
+2011-11-15 Soren Hojsgaard  <sorenh at mail.dk>
+
+	* Dependence on the doBy package has been removed.
+
+2011-11-14  Jun Yan  <jun.yan at uconn.edu>
+
+        * Added NAMESPACE for to comply with the requirement of R-2.14.0.
+
+	* Removed the "assert" lines in utils.cc in order not to crash R,
+	which is quite rude practice. A "-DNDEBUG" has been added to the
+	cppflags in Makevars for a better solution. Due to many asserts
+	in tnt, we cannot get rid of the NOTE message completely:
+	Found ‘_ZSt4cerr’, possibly from ‘std::cerr’ (C++)
+	Found ‘__assert_fail’, possibly from ‘assert’ (C)
+
+	* Added quote in statements like
+	extract(m, "response") to get rid of NOTE:
+	geese: no visible binding for global variable ‘response’
+
+	* Added a line of
+	#undef NDEBUG
+	to the beginning of geesubs.cc; thank Brian Ripley for the NMU.
+	Still unclear why the error without this line:
+	undefined symbol: _Z5ValidIiEN3TNT6VectorIT_EERS3_RNS1_IiEE
+
+
+2011-02-23  Søren Højsgaard <sorenh at agrsci.dk>
+
+	* In geeglm is checked if the model matrix is rank deficient; if
+	so then geeglm exits. Thanks to Jason D Thorpe for pointing this out.
+
+	* Bug in anova fixed. Thanks to Stefan Boehringer for pointing
+	this out.
+
+	* Version 1.0-18 uploaded.
+
+
+2010-01-26  Søren Højsgaard <sorenh at agrsci.dk>
+
+	* fixed2Zcor function has been added. This function makes it
+	easier to work with a fixed correlation matrix (in particular when
+	cluster sizes are not equal).
+
+	* A vignette on models with unequal cluster size, fixed
+	correlation matrices etc. has been added.
+
+	* Version 1.0-17 uploaded
+
+2008-12-08  Søren Højsgaard <sorenh at agrsci.dk>
+
+	* Bugfix in 1.0.15 caused problem in binomial case using
+	cbind(pos,neg). Thanks to Tobias Verbeke. Fixed now.
+
+	* Bugfix in 1.0.15 caused problem when using variables derived
+	from gam package call to geeglm. Thanks to Eric Rexstad. Fixed now.
+
+	* Using scale.fix argument gave problem in geeglm. Thanks to
+	Tobias Verbeke. Fixed now.
+
+	* Fitting large data set with binomial model and 3 measurements
+	per unit using unstructured correlation crashes R. Thanks to
+	Tobias Verbeke. Problem has *NOT* been solved but a remark has
+	been added to doc file.
+
+	* Version 1.0-16 uploaded
+
+2008-12-01  Søren Højsgaard <sorenh at agrsci.dk>
+
+	* When a factor has unused levels, the underlying C code
+	fails. This is now catured in geeglm. Thanks to Janet Young
+
+	* tests directory added to package
+
+	* Version 1.0-15 uploaded
+
+2007-07-13  Søren Højsgaard <sorenh at agrsci.dk>
+
+	* Smaller 'standardization' changes implemented. Thanks to Achim
+
+	* Version 1.0-14 uploaded
+
+2007-03-21  Søren Højsgaard <sorenh at agrsci.dk>
+
+	* A remark on fixed correlation structures has been added to the
+	geeglm.Rd doc file.
+
+	* A Wishlist file has been added
+
+	* Version 1.0-13 uploaded
+
+2007-03-21  Søren Højsgaard <sorenh at agrsci.dk>
+
+	* Bug in geeglm fixed so that it now works with a fixed
+	correlation structure. Thanks to Ulrich Halekoh for the fix.
+
+
+2006-02-13  Jun Yan  <jyan at stat.uiowa.edu>
+
+	* Bug in genZcor and genZodds fixed. 
+	Thanks to Chongzhi Di <cdi at jhsph.edu>. 
+	Previously, the matrice generated by genZcor/genZodds are 
+	wrong when the number of unique waves is greater than or
+	equal to 10.
+
+2006-01-24 Søren Højsgaard <sorenh at agrsci.dk>
+
+	* Bug in anova.geeglm fixed (showed up when there was only one
+	term on the right hand side of ~). 
+
+	* geeglm only works on complete data. This has been pointed out in
+	the man pages. (At some point of time, a proper na.action should be
+	taken). 
+
+	* All datasets are saved as .txt files (previously some were saved
+	as .rda files but that caused problems in building the package on
+	windows xp).
+
+2005-08-13  Jun Yan  <jyan at stat.uiowa.edu>
+
+	* The working correlation structure can now be "fixed".
+
+
+2005-06-13 Søren Højsgaard <sorenh at agrsci.dk>
+
+	* Søren Højsgaard has modified the geeglm function so that it can
+	take the 'waves' argument which is used for explicitely specifying
+	the ordering of repeated measurements on the same unit. geeglm can
+	also take the 'zcor' argument for a user defined working
+	correlation structure. 
+
+	* A documentation file for the genZcor
+	function has been added. 
+
+	* All data sets provided are now saved as
+	text files.
+
+	* ordgee has been modified to check if the response variable is an
+	ordered factor.
+
+	* geeglm can now take the argument std.err which specifies the
+	type of variance estimate to be calculated.
+
+2005-05-11 Søren Højsgaard <sorenh at agrsci.dk>
+
+	* Søren Højsgaard has modified the anova function to make it
+	calculate the correct degrees of freedom.
+
+
+2005-04-11  Jun Yan  <jyan at stat.uiowa.edu>
+
+	* Søren Højsgaard made some minor changes to geeglm - 
+	basically, that geese.control did not work. Now it does.
+
+
+2005-02-09  Jun Yan  <jyan at stat.uiowa.edu>
+
+	* Søren Højsgaard joined the development with geeglm, which 
+	"works like" glm and returns an object which is similar to 
+	a glm object. Residuals and predicted values can be extracted
+	using the generic functions as with a glm object. 
+
+	* An important feature of geeglm, is that an anova method 
+	exists for these models.
+
diff --git a/DESCRIPTION b/DESCRIPTION
index 40aad1d..febe3e1 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: geepack
-Version: 1.2-0.2
+Version: 1.2-1
 Title: Generalized Estimating Equation Package
-Author: S�ren H�jsgaard, <sorenh at math.aau.dk>, Ulrich Halekoh <Ulrich.Halekoh at agrsci.dk>, Jun Yan <jun.yan at uconn.edu>, 
+Author: S�ren H�jsgaard <sorenh at math.aau.dk>, Ulrich Halekoh <uhalekoh at health.sdu.dk>, Jun Yan <jun.yan at uconn.edu>, 
 Maintainer: S�ren H�jsgaard <sorenh at math.aau.dk>
 Description: Generalized estimating equations solver for parameters in
         mean, scale, and correlation structures, through mean link,
@@ -9,7 +9,7 @@ Description: Generalized estimating equations solver for parameters in
         categorical responses.
 Encoding: latin1
 License: GPL (>= 3)
-Packaged: 2016-07-05 15:56:10 UTC; hornik
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2016-07-05 17:59:21
+Date/Publication: 2016-09-24 14:55:58
+Packaged: 2016-09-24 05:46:03 UTC; sorenh
diff --git a/MD5 b/MD5
index 2714efa..26f0402 100644
--- a/MD5
+++ b/MD5
@@ -1,16 +1,16 @@
-706152b8be6d8b2ca3a5ebdc9fcd8c1e *ChangeLog
-ec1c80280fc44e97494d187a174a30b9 *DESCRIPTION
+485717a6bcd79cfee5c8130b340b7107 *ChangeLog
+8158f7a25a1908fc5a7a1fa8e4f65279 *DESCRIPTION
 9b4a39760a174ec40ed5183e8fa9b61e *NAMESPACE
 96a6f5b5b46df0f9d3ac6bbc3327eada *R/fixed2Zcor.R
-59e982dac0a9e5004b8290399c2a5e6d *R/geeglm-anova.R
-e075605e7afd684200939ab63ae6be13 *R/geeglm.R
+2a5a192949fdf6c226c19a1335a93d7d *R/geeglm-anova.R
+ce8483fad59bb3a10903f4898a876a02 *R/geeglm.R
 b94677c4ba59797bb1c64a93764f6bb4 *R/geese.R
 a5e17a48d8e1196aa1967d5758168a0e *R/internal.R
 5d7cd7bfb2a2135f7364dda2382de8f1 *R/ordgee.R
 acf18753c22de2282b9a8357b7c06688 *R/rrr.R
 8abbb54ea36f442f6bd9e47e89f4818b *R/summary.R
 4b5e3c63a382021749596cb59f04c62d *R/zzz.R
-be0bab57cd047145f8af1e91a04c5d3f *build/vignette.rds
+1f50f1c5c3f2180afad0be4fa010dfc0 *build/vignette.rds
 8ef0a085392c2a6431f2f8713c60e5b5 *data/dietox.txt.gz
 249971f8780df82504f54fd2b7d62252 *data/koch.txt.gz
 c0e0807be2abed83152006db8dcbac5e *data/ohio.txt.gz
@@ -19,7 +19,7 @@ c0e0807be2abed83152006db8dcbac5e *data/ohio.txt.gz
 d1e03752404477a70ed20c18d257e2d8 *data/seizure.txt.gz
 9cb003db408b585e3cb11806f35919a7 *data/sitka89.txt.gz
 73402330ab3f5a9b06fdf6343631e87d *data/spruce.txt.gz
-22d3dc7ffaa61d9124aa62db9bfe582f *inst/CITATION
+35da58fa0c087431c54e28f4a5d27be0 *inst/CITATION
 c01cea3c88238c320844d0d7649fc72f *inst/doc/geepack-manual.R
 3be52b7e7574dc6e40ca55938a8b3069 *inst/doc/geepack-manual.Rnw
 3a0bccf41d745a5d12f34922d6a87379 *inst/doc/geepack-manual.pdf
diff --git a/R/geeglm-anova.R b/R/geeglm-anova.R
index b89ec9c..512d54b 100755
--- a/R/geeglm-anova.R
+++ b/R/geeglm-anova.R
@@ -10,7 +10,7 @@ anovageePrim2 <- function(m1, m2,...){
 
   m2inm1 <- all(apply(e2,2,var) < 1e-10)
   m1inm2 <- all(apply(e1,2,var) < 1e-10)
-  
+
   if (!any(c(m2inm1,m1inm2)))
     cat("Models not nested\n")
   else 
@@ -52,8 +52,10 @@ anovageePrim2 <- function(m1, m2,...){
       m1call$weights <- m1$weights
       m1call$formula <- formula1
       m1call$data <- nymm1
+
       m1ny <- eval(m1call)
 
+      
       ## Calculate wald statistic
       beta <- coef(m1ny)
       vbeta <- summary(m1ny)$cov.unscaled
@@ -88,7 +90,7 @@ anova.geeglmlist <-
     warning("Models with response ", deparse(responses[!sameresp]), 
             " removed because response differs from ", "model 1")
   }
-  
+
   ns <- sapply(object, function(x) length(x$residuals))
   if (any(ns != ns[1])) 
     stop("models were not all fitted to the same size of dataset")
@@ -99,7 +101,7 @@ anova.geeglmlist <-
     m2 <- objects[[1]][[2]]
   else 
     m2 <- NULL
-  
+
   value <- anovageePrim2(m1,m2)
   return(value)
 }
@@ -107,7 +109,8 @@ anova.geeglmlist <-
 
 anova.geeglm<-function (object, ..., dispersion = NULL, test = NULL) 
 {
-  dotargs <- list(...)
+
+    dotargs <- list(...)
   named <- if (is.null(names(dotargs))) 
     rep(FALSE, length(dotargs))
   else (names(dotargs) != "")
@@ -117,10 +120,11 @@ anova.geeglm<-function (object, ..., dispersion = NULL, test = NULL)
   dotargs <- dotargs[!named]
   is.glm <- unlist(lapply(dotargs, function(x) inherits(x, "glm")))
   dotargs <- dotargs[is.glm]
-  if (length(dotargs) > 0) 
+
+    if (length(dotargs) > 0) 
     return(anova.geeglmlist(c(list(object), dotargs), dispersion = dispersion, 
                             test = test))
-  
+
   varlist <- attr(object$terms, "variables")
   ##print(varlist)
   x <- if (n <- match("x", names(object), 0)) 
@@ -128,7 +132,8 @@ anova.geeglm<-function (object, ..., dispersion = NULL, test = NULL)
   else model.matrix(object)
   
   varseq <- attr(x, "assign")
-  
+
+
   nvars <- max(0, varseq)
   betaList <- vbetaList <- NULL
   
diff --git a/R/geeglm.R b/R/geeglm.R
index 8ea0838..6b5a237 100755
--- a/R/geeglm.R
+++ b/R/geeglm.R
@@ -175,7 +175,7 @@ geeglm<- function (formula, family = gaussian, data = parent.frame(),
   value$cor.link <- ans$model$cor.link
   value$control <- ans$control
   value$std.err <- std.err
-  class(value) <- c("geeglm", "gee", "glm")
+  class(value) <- c("geeglm", "gee", "glm", "lm")
   return(value)
 }
     
diff --git a/build/vignette.rds b/build/vignette.rds
index 1a8d1d3..d9169f0 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/inst/CITATION b/inst/CITATION
index 2d50b45..3bc2e52 100755
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -1,44 +1,44 @@
-citHeader("To cite geepack in publications use:")
- 
-citEntry(entry="Article",
-         title = "The R Package geepack for Generalized Estimating Equations",
-         author = personList(as.person("S�ren H�jsgaard"), 
-                             as.person("Ulrich Halekoh"),
-                             as.person("Jun Yan")),
-         year = 2006,
-         journal = "Journal of Statistical Software",
-         volume = "15/2",
-         pages = "1--11",
-         textVersion = 
-         paste("H�jsgaard, S., Halekoh, U. & Yan J. (2006)",
-               "The R Package geepack for Generalized Estimating Equations",
-               "Journal of Statistical Software, 15, 2, pp1--11")
-)
-
-
-citEntry(entry="Article",
-         title = "Estimating Equations for Association Structures",
-         author = personList(as.person("Jun Yan"), 
-                             as.person("Jason P. Fine")),
-         year         = "2004",
-         journal      = "Statistics in Medicine",
-         volume       = "23",
-         pages        = "859--880",
-         textVersion = 
-         paste("Yan, J. & Fine, J.P. (2004)", 
-               "Estimating Equations for Association Structures",
-               "Statistics in Medicine,  23, pp859--880.")
-)
-
-citEntry(entry="Article",
-         title = "geepack: Yet Another Package for Generalized Estimating Equations",
-         author = personList(as.person("Jun Yan")),
-         year         = "2002",
-         journal      = "R-News",
-         volume       = "2/3",
-         pages        = "12--14",
-         textVersion = 
-         paste("Yan, J (2002)", 
-               "geepack: Yet Another Package for Generalized Estimating Equations",
-               "R-News, 2/3, pp12-14.")
-)
+citHeader("To cite geepack in publications use:")
+ 
+citEntry(entry="Article",
+         title = "The R Package geepack for Generalized Estimating Equations",
+         author = personList(as.person("Søren Højsgaard"), 
+                             as.person("Ulrich Halekoh"),
+                             as.person("Jun Yan")),
+         year = 2006,
+         journal = "Journal of Statistical Software",
+         volume = "15/2",
+         pages = "1--11",
+         textVersion = 
+         paste("Højsgaard, S., Halekoh, U. & Yan J. (2006)",
+               "The R Package geepack for Generalized Estimating Equations",
+               "Journal of Statistical Software, 15, 2, pp1--11")
+)
+
+
+citEntry(entry="Article",
+         title = "Estimating Equations for Association Structures",
+         author = personList(as.person("Jun Yan"), 
+                             as.person("Jason P. Fine")),
+         year         = "2004",
+         journal      = "Statistics in Medicine",
+         volume       = "23",
+         pages        = "859--880",
+         textVersion = 
+         paste("Yan, J. & Fine, J.P. (2004)", 
+               "Estimating Equations for Association Structures",
+               "Statistics in Medicine,  23, pp859--880.")
+)
+
+citEntry(entry="Article",
+         title = "geepack: Yet Another Package for Generalized Estimating Equations",
+         author = personList(as.person("Jun Yan")),
+         year         = "2002",
+         journal      = "R-News",
+         volume       = "2/3",
+         pages        = "12--14",
+         textVersion = 
+         paste("Yan, J (2002)", 
+               "geepack: Yet Another Package for Generalized Estimating Equations",
+               "R-News, 2/3, pp12-14.")
+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-geepack.git



More information about the debian-science-commits mailing list