Comparing changes
Open a pull request
… with originals after this commit
linux --> debian
--> put in rudis before_install section
order matter?
back to original
- +14 −0 .Rbuildignore
- +10 −0 .gitignore
- +32 −0 .travis.yml
- +16 −9 DESCRIPTION
- +43 −13 NAMESPACE
- +1,935 −0 NEWS.md
- +252 −251 R/coxre.r
- +327 −326 R/ehr.r
- +166 −166 R/intensity.r
- +784 −783 R/kalsurv.r
- +478 −472 R/km.r
- +183 −180 R/pbirth.r
- +733 −732 R/survkit.r
- +10 −0 README.md
- +59 −0 cran-comments.md
- +50 −43 man/autointensity.Rd
- +37 −31 man/bp.Rd
- +74 −66 man/coxre.Rd
- +35 −30 man/cprocess.Rd
- +110 −100 man/ehr.Rd
- +77 −77 man/event.Rd
- +40 −0 man/hboxcox.Rd
- +33 −0 man/hburr.Rd
- +31 −30 man/hcauchy.Rd
- +30 −29 man/hexp.Rd
- +32 −31 man/hgamma.Rd
- +43 −0 man/hgextval.Rd
- +44 −0 man/hggamma.Rd
- +41 −0 man/hglogis.Rd
- +44 −0 man/hgweibull.Rd
- +35 −0 man/hhjorth.Rd
- +35 −0 man/hinvgauss.Rd
- +34 −0 man/hlaplace.Rd
- +31 −30 man/hlnorm.Rd
- +29 −28 man/hlogis.Rd
- +31 −30 man/hnorm.Rd
- +36 −0 man/hpareto.Rd
- +50 −0 man/hskewlaplace.Rd
- +32 −31 man/hstudent.Rd
- +31 −30 man/hweibull.Rd
- +35 −30 man/ident.Rd
- +222 −206 man/kalsurv.Rd
- +60 −50 man/km.Rd
- +52 −43 man/pbirth.Rd
- +42 −35 man/plot.intensity.Rd
- +33 −28 man/pp.Rd
- +144 −136 man/survkit.Rd
- +37 −32 man/tccov.Rd
- +30 −26 man/tpast.Rd
- +34 −30 man/ttime.Rd
- +36 −31 man/tvcov.Rd
- +0 −11 src/Makefile
- +394 −394 src/ksurvb.c
- +221 −221 src/ksurvg.c
- +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 | |||
| @@ -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) | |||