Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: swihart/event
Choose a Base Repository
Nothing to show
base: jim-lindsey-homepage-version-1.0
head repository: swihart/event
Choose a Head Repository
Nothing to show
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Nov 30, 2016
Commits on Dec 01, 2016
linux --> debian
 --> put in rudis before_install section
order matter?
back to original
Commits on Dec 02, 2016
Showing with 14,088 additions and 11,432 deletions.
  1. +14 −0 .Rbuildignore
  2. +10 −0 .gitignore
  3. +32 −0 .travis.yml
  4. +16 −9 DESCRIPTION
  5. +43 −13 NAMESPACE
  6. +1,935 −0 NEWS.md
  7. +252 −251 R/coxre.r
  8. +327 −326 R/ehr.r
  9. +166 −166 R/intensity.r
  10. +784 −783 R/kalsurv.r
  11. +478 −472 R/km.r
  12. +183 −180 R/pbirth.r
  13. +733 −732 R/survkit.r
  14. +10 −0 README.md
  15. +59 −0 cran-comments.md
  16. +50 −43 man/autointensity.Rd
  17. +37 −31 man/bp.Rd
  18. +74 −66 man/coxre.Rd
  19. +35 −30 man/cprocess.Rd
  20. +110 −100 man/ehr.Rd
  21. +77 −77 man/event.Rd
  22. +40 −0 man/hboxcox.Rd
  23. +33 −0 man/hburr.Rd
  24. +31 −30 man/hcauchy.Rd
  25. +30 −29 man/hexp.Rd
  26. +32 −31 man/hgamma.Rd
  27. +43 −0 man/hgextval.Rd
  28. +44 −0 man/hggamma.Rd
  29. +41 −0 man/hglogis.Rd
  30. +44 −0 man/hgweibull.Rd
  31. +35 −0 man/hhjorth.Rd
  32. +35 −0 man/hinvgauss.Rd
  33. +34 −0 man/hlaplace.Rd
  34. +31 −30 man/hlnorm.Rd
  35. +29 −28 man/hlogis.Rd
  36. +31 −30 man/hnorm.Rd
  37. +36 −0 man/hpareto.Rd
  38. +50 −0 man/hskewlaplace.Rd
  39. +32 −31 man/hstudent.Rd
  40. +31 −30 man/hweibull.Rd
  41. +35 −30 man/ident.Rd
  42. +222 −206 man/kalsurv.Rd
  43. +60 −50 man/km.Rd
  44. +52 −43 man/pbirth.Rd
  45. +42 −35 man/plot.intensity.Rd
  46. +33 −28 man/pp.Rd
  47. +144 −136 man/survkit.Rd
  48. +37 −32 man/tccov.Rd
  49. +30 −26 man/tpast.Rd
  50. +34 −30 man/ttime.Rd
  51. +36 −31 man/tvcov.Rd
  52. +0 −11 src/Makefile
  53. +394 −394 src/ksurvb.c
  54. +221 −221 src/ksurvg.c
  55. +6,641 −6,641 src/survkit.f
@@ -0,0 +1,14 @@
^.*\.Rproj$
^\.Rproj\.user$
^README\.Rmd$
^README\.HTML$
^README-.*\.png$
^README_.*\.png$
QEE2.out
^\.travis\.yml$
cran-comments.md
changes.txt
\.fsrc$
^.*\.o$
\.so$
\.dll$
@@ -0,0 +1,10 @@
.Rproj.user
.Rhistory
.RData
.Ruserdata
src/*.o
src/*.so
src/*.dll
event.Rproj
README.Rmd
README_files/*
@@ -0,0 +1,32 @@
# Sample .travis.yml for R projects

language: r
warnings_are_errors: true
sudo: required


matrix:
include:
- os: linux
compiler: gcc
r: release
r_check_args: --as-cran --use-valgrind
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
packages:
- valgrind
- ['g++-6']
env:
- COMPILER=g++-6
- CC=gcc=6
- CXX=g++-6

env:
global:
- CRAN: http://cran.rstudio.com

notifications:
email:
on_success: change
on_failure: change
25 DESCRIPTION 100755 → 100644
@@ -1,9 +1,16 @@
Package: event Package: event
Version: 1.0 Version: 1.1.0
Title: Event History Procedures and Models Title: Event History Procedures and Models
Author: Jim Lindsey <jlindsey@gen.unimaas.nl> Authors@R: c(
Maintainer: Jim Lindsey <jlindsey@gen.unimaas.nl> person("Bruce", "Swihart", email="bruce.swihart@gmail.com", role=c("cre", "aut")),
Depends: R (>= 1.4), rmutil person("Jim" , "Lindsey", email="jlindsey@gen.unimaas.nl", role="aut", comment="Jim created this package, Bruce is maintaining the CRAN version"))
Description: Functions for setting up and analyzing event history data. Depends:
License: GPL version 2 or later R (>= 1.4),
URL: popgen.unimaas.nl/~jlindsey/rcode.html rmutil
Description: Functions for setting up and analyzing event history data.
License: GPL-2
URL: http://www.commanster.eu/rcode.html
BugReports: https:/github.com/swihart/event/issues
Encoding: UTF-8
LazyData: true
LazyLoad: true
@@ -1,13 +1,43 @@
useDynLib("event") useDynLib("event")


import(rmutil) import(rmutil)


export(autointensity, export(autointensity,
coxre,print.llrf, coxre,print.llrf,
cprocess, cprocess,
ehr,pp,ident,tpast,ttime,bp,tccov,tvcov,vdm,deviance.intensity,print.intensity, ehr,pp,ident,tpast,ttime,bp,tccov,tvcov,vdm,deviance.intensity,print.intensity,
hboxcox,hburr,hcauchy,hexp,hgextval,hgamma,hggamma,hhjorth,hinvgauss,hlaplace,hlnorm,hlogis,hglogis,hnorm,hpareto,hstudent,hweibull,hgweibull,hskewlaplace, hboxcox,hburr,hcauchy,hexp,hgextval,hgamma,hggamma,hhjorth,hinvgauss,hlaplace,hlnorm,hlogis,hglogis,hnorm,hpareto,hstudent,hweibull,hgweibull,hskewlaplace,
kalsurv,deviance.kalsurv,fitted.kalsurv,residuals.kalsurv,print.kalsurv, kalsurv,deviance.kalsurv,fitted.kalsurv,residuals.kalsurv,print.kalsurv,
km,print.km,plot.km,plot.surv,plot.intensity,plot.intensity.default,plot.intensity.km,plot.dist,plot.dist.km, km,print.km,plot.km,plot.surv,plot.intensity,plot.intensity.default,plot.intensity.km,plot.dist,plot.dist.km,
pbirth,deviance.pbirth,print.pbirth, pbirth,deviance.pbirth,print.pbirth,
survkit,residuals.survivalkit,print.survivalkit,baseline,baseline.survivalkit,survival,survival.survivalkit) survkit,residuals.survivalkit,print.survivalkit,baseline,baseline.survivalkit,survival,survival.survivalkit)

importFrom("grDevices", "gray")
importFrom("graphics", "hist", "lines", "par", "plot", "text")
importFrom("stats", "dcauchy", "dgamma", "dlnorm", "dlogis", "dnorm",
"glm", "model.frame", "na.fail", "nlm", "pbeta", "pcauchy",
"pgamma", "plnorm", "plogis", "pnorm", "poisson",
"pweibull", "qnorm", "terms")


S3method( baseline, survivalkit )
S3method( deviance, intensity )
S3method( deviance, kalsurv)
S3method( deviance, pbirth )
S3method( fitted, kalsurv )
S3method( plot, dist )
S3method( plot, dist.km)
S3method( plot, intensity)
S3method( plot, intensity.default )
S3method( plot, intensity.km )
S3method( plot, km )
S3method( plot, surv)
S3method( print, intensity)
S3method( print, kalsurv )
S3method( print, km )
S3method( print, llrf)
S3method( print, pbirth)
S3method( print, survivalkit)
S3method( residuals, kalsurv )
S3method( residuals, survivalkit )
S3method( survival, survivalkit)

No commit comments for this range

You can’t perform that action at this time.