Skip to content

Commit

Permalink
Update emails + URLs & remove emails from Rd files
Browse files Browse the repository at this point in the history
  • Loading branch information
graemeleehickey committed Jan 9, 2021
1 parent 4131778 commit 72e31b7
Show file tree
Hide file tree
Showing 48 changed files with 69 additions and 65 deletions.
Binary file removed .DS_Store
Binary file not shown.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: joineR
Type: Package
Title: Joint Modelling of Repeated Measurements and Time-to-Event Data
Version: 1.2.5
Version: 1.2.6
Authors@R: c(
person("Pete", "Philipson", email = "[email protected]",
role = c("aut", "cre"),
Expand All @@ -20,7 +20,7 @@ Authors@R: c(
comment = c(ORCID = "0000-0003-3886-6208")),
person("Robin", "Henderson", email = "[email protected]",
role = "aut"),
person("Graeme L.", "Hickey", email = "[email protected]",
person("Graeme L.", "Hickey", email = "[email protected]",
role = "aut",
comment = c(ORCID = "0000-0002-4989-0054")),
person("Maria", "Sudell", email = "[email protected]",
Expand Down Expand Up @@ -62,4 +62,4 @@ Suggests:
testthat,
covr
VignetteBuilder: knitr
#RoxygenNote: 7.0.2
RoxygenNote: 7.1.1
2 changes: 1 addition & 1 deletion R/UniqueVariables.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#' original data frame has survival data, this can also be used to extract the
#' survival information from the original data set.
#'
#' @author Ines Sousa (\email{isousa@@uminho.pt})
#' @author Ines Sousa
#' @keywords data manip
#'
#' @return A data frame with patient identification and covariates selected.
Expand Down
1 change: 0 additions & 1 deletion R/heart.valve.R
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
#' @keywords datasets
#' @seealso \code{\link{mental}}, \code{\link{liver}}, \code{\link{epileptic}},
#' \code{\link{aids}}.
#' @source Mr Eric Lim (\url{https://www.drericlim.com})
#' @docType data
#' @references
#'
Expand Down
2 changes: 1 addition & 1 deletion R/joint.R
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
#' default, as this has been adequate for many datasets. However, for certain
#' datasets and models, this might be too small.
#'
#' @author Pete Philipson (\email{pete.philipson@@northumbria.ac.uk})
#' @author Pete Philipson
#' @keywords models survival
#' @seealso \code{\link[nlme]{lme}}, \code{\link[survival]{coxph}},
#' \code{\link{jointdata}}, \code{\link{jointplot}}.
Expand Down
2 changes: 1 addition & 1 deletion R/joint.object.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#' class \code{joint} and representing a fitted joint model for longitudinal
#' and time-to-event (or competing risks) data.
#'
#' @author Graeme L. Hickey (\email{graeme.hickey@@liverpool.ac.uk})
#' @author Graeme L. Hickey
#' @keywords survival
#' @seealso \code{\link{joint}}.
#' @return A list with the following components. \describe{
Expand Down
4 changes: 1 addition & 3 deletions R/jointSE.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
#' samples are needed for estimating a standard error. The number of bootstrap
#' samples needed for accurate confidence intervals can be as large as 1000.
#'
#' @author Ruwanthi Kolamunnage-Dona
#' (\email{ruwanthi.kolamunnage-dona@@liverpool.ac.uk}) and Pete Philipson
#' (\email{pete.philipson@@northumbria.ac.uk})
#' @author Ruwanthi Kolamunnage-Dona and Pete Philipson
#' @keywords models survival htest
#' @seealso \code{\link[nlme]{lme}}, \code{\link[survival]{coxph}},
#' \code{\link{joint}}, \code{\link{jointdata}}.
Expand Down
2 changes: 1 addition & 1 deletion R/jointdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#' input, for the baseline (non-time dependent) covariates. The subject
#' identification and time measurement column names are necessary.
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @keywords survival data list
#'
#' @return A list of length six. The first element is the vector of subjects
Expand Down
2 changes: 1 addition & 1 deletion R/jointplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#' @note If more than one cause of failure is present (i.e. competing risks
#' data), then all failures are pooled together into a single failure type.
#'
#' @author Pete Philipson (\email{pete.philipson@@northumbria.ac.uk})
#' @author Pete Philipson
#' @keywords dplot
#' @seealso \code{\link[lattice]{xyplot}}, \code{\link{joint}},
#' \code{\link{jointdata}}.
Expand Down
2 changes: 1 addition & 1 deletion R/lines.jointdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#'
#' @inheritParams plot.jointdata
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @keywords aplot
#' @seealso Other functions are useful to be used with this such as
#' \code{\link{plot}} and \code{\link{points}}.
Expand Down
2 changes: 1 addition & 1 deletion R/plot.jointdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#' \code{\link[graphics]{par}} for details.
#' @param ... other graphical arguments; see \code{\link[graphics]{plot}}.
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @keywords dplot
#' @seealso \code{\link[graphics]{lines}} and \code{\link[graphics]{points}}.
#'
Expand Down
2 changes: 1 addition & 1 deletion R/plot.vargm.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#' @param points logical value if the points \eqn{v_ijk} should be plotted.
#' @param ... other graphical options as in \code{\link[graphics]{par}}.
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @keywords dplot
#'
#' @return A graphical device with the plot of empirical variogram.
Expand Down
2 changes: 1 addition & 1 deletion R/points.jointdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#'
#' @inheritParams plot.jointdata
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @keywords aplot
#'
#' @return A graphical device with a plot for longitudinal data. Other functions
Expand Down
2 changes: 1 addition & 1 deletion R/sample.jointdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#' @param replace should sampling be with replacement? Default is \code{replace
#' = TRUE}.
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @seealso \code{\link{sample}}, \code{\link{jointdata}},
#' \code{\link{UniqueVariables}}.
#' @keywords data
Expand Down
2 changes: 1 addition & 1 deletion R/simjoint.R
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
#'
#' }
#'
#' @author Pete Philipson (\email{[email protected]})
#' @author Pete Philipson
#' @keywords datagen survival
#'
#' @references
Expand Down
2 changes: 1 addition & 1 deletion R/subset.jointdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#' subset. This must be a unique vector of patient identifiers.
#' @param ... further arguments to be passed to or from other methods.
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @keywords data
#'
#' @return An object of class \code{jointdata}, with data only on a subset of
Expand Down
2 changes: 1 addition & 1 deletion R/summary.joint.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#' standard deviations? Defaults to \code{variance = TRUE}.
#' @param ... further arguments for the summary.
#'
#' @author Pete Philipson (\email{pete.philipson@@northmbria.ac.uk})
#' @author Pete Philipson
#' @keywords methods
#'
#' @return An object inheriting from class \code{summary.joint} with all
Expand Down
2 changes: 1 addition & 1 deletion R/summary.jointdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#'
#' @inheritParams summary.joint
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @seealso \code{\link{jointdata}}, \code{\link{UniqueVariables}}.
#' @keywords methods
#'
Expand Down
2 changes: 1 addition & 1 deletion R/summarybal.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#' \code{na.rm = FALSE}.
#' @param ... further arguments for the summary.
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @seealso \code{\link{to.balanced}}.
#' @keywords methods
#'
Expand Down
2 changes: 1 addition & 1 deletion R/to.balanced.R
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#' covariates, and/or other subject level data, as for example, survival data.
#' Default does not include \code{other.col}.
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @seealso \code{\link{to.unbalanced}}.
#' @keywords data manip
#'
Expand Down
2 changes: 1 addition & 1 deletion R/to.unbalanced.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#' observed. This is the study design time points in a balanced data set.
#' @inheritParams to.balanced
#'
#' @author Ines Sousa (\email{isousa@@uminho.pt})
#' @author Ines Sousa
#' @seealso \code{\link{to.balanced}}.
#' @keywords data manip
#'
Expand Down
2 changes: 1 addition & 1 deletion R/variogram.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#' @note There is a function \code{\link{plot.vargm}} which should be used to
#' plot the empirical variogram.
#'
#' @author Ines Sousa (\email{isousa@@math.uminho.pt})
#' @author Ines Sousa
#' @keywords smooth models
#'
#' @return An object of class \code{vargm} and \code{list} with two elements.
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ knitr::opts_chunk$set(
[![Travis-CI Build Status](https://travis-ci.org/graemeleehickey/joineR.svg?branch=master)](https://travis-ci.org/graemeleehickey/joineR)
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/graemeleehickey/joineR?branch=master&svg=true)](https://ci.appveyor.com/project/graemeleehickey/joineR)
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/joineR)](https://CRAN.R-project.org/package=joineR)
[![](http:https://cranlogs.r-pkg.org/badges/joineR)](https://CRAN.R-project.org/package=joineR)
[![](https:https://cranlogs.r-pkg.org/badges/joineR)](https://CRAN.R-project.org/package=joineR)
[![](https://cranlogs.r-pkg.org/badges/grand-total/joineR)](https://CRAN.R-project.org/package=joineR)
[![codecov](https://codecov.io/gh/graemeleehickey/joineR/branch/master/graph/badge.svg)](https://codecov.io/gh/graemeleehickey/joineR)
[![Research software impact](https://depsy.org/api/package/cran/joineR/badge.svg)](https://depsy.org/package/r/joineR)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Status](https://travis-ci.org/graemeleehickey/joineR.svg?branch=master)](https:/
[![AppVeyor Build
Status](https://ci.appveyor.com/api/projects/status/github/graemeleehickey/joineR?branch=master&svg=true)](https://ci.appveyor.com/project/graemeleehickey/joineR)
[![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/joineR)](https://CRAN.R-project.org/package=joineR)
[![](http:https://cranlogs.r-pkg.org/badges/joineR)](https://CRAN.R-project.org/package=joineR)
[![](https:https://cranlogs.r-pkg.org/badges/joineR)](https://CRAN.R-project.org/package=joineR)
[![](https://cranlogs.r-pkg.org/badges/grand-total/joineR)](https://CRAN.R-project.org/package=joineR)
[![codecov](https://codecov.io/gh/graemeleehickey/joineR/branch/master/graph/badge.svg)](https://codecov.io/gh/graemeleehickey/joineR)
[![Research software
Expand All @@ -25,14 +25,14 @@ outcome is a Cox proportional hazards model with log-Gaussian frailty
(Cox, 1972). Stochastic dependence is captured by allowing the Gaussian
random effects of the linear model to be correlated with the frailty
term of the Cox proportional hazards model. The methodology used to fit
the model is described in Henderson et al. (2002) and Wulfsohn and
the model is described in Henderson et al. (2002) and Wulfsohn and
Tsiatis (1997).

The `joineR` package also allows competing risks data to be jointly
modelled through a cause-specific hazards model. The importance of
accounting for competing risks is detailed in Williamson et al.
(2007a,b). The methodology used to fit this model is described in
Williamson et al. (2008).
accounting for competing risks is detailed in Williamson et
al. (2007a,b). The methodology used to fit this model is described in
Williamson et al. (2008).

# Example

Expand Down
2 changes: 1 addition & 1 deletion man/UniqueVariables.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/aids.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/epileptic.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions man/heart.valve.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/joint.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/joint.object.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions man/jointSE.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/jointdata.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/jointplot.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/lines.jointdata.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/liver.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 72e31b7

Please sign in to comment.