Skip to content

Commit

Permalink
version 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mlcollyer authored and cran-robot committed Feb 7, 2024
1 parent 56d0373 commit 733d2ec
Show file tree
Hide file tree
Showing 57 changed files with 2,592 additions and 1,359 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
@@ -1,7 +1,7 @@
Package: RRPP
Title: Linear Model Evaluation with Randomized Residuals in a
Permutation Procedure
Version: 1.4.0
Version: 2.0.0
Authors@R: c(
person("Michael", "Collyer", , "mlcollyer@gmail.com", c("aut", "cre"),
comment = c(ORCID = "0000-0003-0238-2201")),
Expand All @@ -21,15 +21,15 @@ License: GPL (>= 3)
URL: https://github.com/mlcollyer/RRPP
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Imports: parallel, ape, ggplot2, Matrix
Suggests: knitr, rmarkdown, testthat (>= 3.0.0), dplyr, tibble
Suggests: knitr, rmarkdown, testthat (>= 3.2.0), dplyr, tibble
VignetteBuilder: knitr
NeedsCompilation: no
Packaged: 2023-08-15 18:27:10 UTC; m.collyer
Packaged: 2024-02-06 13:54:34 UTC; m.collyer
Author: Michael Collyer [aut, cre] (<https://orcid.org/0000-0003-0238-2201>),
Dean Adams [aut] (<https://orcid.org/0000-0001-9172-7894>)
Maintainer: Michael Collyer <mlcollyer@gmail.com>
Repository: CRAN
Date/Publication: 2023-08-15 19:00:02 UTC
Date/Publication: 2024-02-06 14:30:03 UTC
Config/testthat/edition: 3
96 changes: 56 additions & 40 deletions MD5
@@ -1,89 +1,102 @@
372f7693360866a8dad933c4a8f4d951 *DESCRIPTION
e5377dca3d772d371310d259f3feb0d9 *NAMESPACE
f883fa1b57fdfd0644dd558144851c88 *NEWS.md
20b4b57d3f2ed1cb7a35717308a40906 *R/RRPP.support.code.r
185e6f36fd76a56d750660cb68fa6cd6 *R/RRPP.utils.r
cd0d0f843e72a2ac7d03870698814118 *DESCRIPTION
a2021ac25065d13e5522ee33d98f3f64 *NAMESPACE
bab326f0f3d5fbc5ee2b70890fd1714b *NEWS.md
6b98781ccf0892dd070f3d3116ccdaef *R/ICCstats.r
df6cc46bc7fae1a55b713f3d5065b35a *R/RRPP-package.R
aade36286239cbd38483a7b2887b0e7d *R/RRPP.support.code.r
76b963a3a38ca87bdfa42d0fe9dbe9dc *R/RRPP.utils.r
a1f4f4ad1e9e4bbd4095e7103feece87 *R/add.tree.r
98f40648cb24f25ab45f7b27d36e6d80 *R/anova.lm.rrpp.r
7f1b8da2b9ac8a5153adfb962e04af57 *R/coef.lm.rrpp.r
df081fb62f7538c3ced74ef4f5ce1dc5 *R/convert2ggplot.r
fadbeaac15ff4eda109f584d9525209b *R/anova.measurement.error.r
122ea79fb5896a379051395628402455 *R/base_lm.rrpp.r
30687777804d74764b944f6ceffbfd95 *R/coef.lm.rrpp.r
41fbdb0c2313bbfc284427be4e21c915 *R/convert2ggplot.r
48035d2216df49a6bdbcba7960714751 *R/deprecated.defunct.R
17650c72406414283cc806c56db93a29 *R/interSubVar.r
2eadfffaebc929805b9c1a8344c1818f *R/lm.rrpp.r
8148bcd7dc0a60a328732cbe6d00fd8e *R/lm.rrpp.ws.r
32db611afc18bc0cf02c79a97f76108e *R/interSubVar.r
a091d4d9ee8749ad0cdc201bc797099d *R/lm.rrpp.r
586c6aa7bf0bf897a46f6a39e2169fdc *R/lm.rrpp.ws.r
72fa4b797683791d4a8b2713c7106897 *R/logLik.lm.rrpp.r
11e059c8656b9d08df3506113278674b *R/looCV.r
e81d8e0c3467cd0b1e9b4266abc32844 *R/manova.update.r
3db9f76fef0d000aa9e134e01abbfc76 *R/measurement.error.r
685dbd31c1ca6c0a4705d8ffdc82601a *R/lr_test.R
c43272a4b64eea4ed1c517bdeb6eacfd *R/manova.update.r
8108080dc8c84f23e0d94de16ff8f0e1 *R/measurement.error.r
a93d1585c9a0c39055acdd143e794c3b *R/model.comparison.r
bd8d283272914e133d13e79312ff2065 *R/ordinate.r
5c9356263e457c0a5e0dea5082af9b09 *R/pairwise.r
441ea9f5b893e97bf03ca59304582d38 *R/ordinate.r
7cfaa40e1b38d0d6e2e588d8ce50d95a *R/pairwise.r
fdbaae68a6b892be2c38f0e1cff3769c *R/predict.lm.rrpp.r
b53b46f8f101da913f49472e1a42c291 *R/prep.lda.r
d244a7773f594992958a7be276d98544 *R/reveal.model.designs.r
7fc1122d5968187416b478180200ac70 *R/scaleCov.r
70cfb5fc752315e5da28b00ae9ec6143 *R/shared.support.code.r
a137878d1c69d1852636ee86405d704c *R/trajectory.analysis.r
f5d0d85ef43f0f4105d69fb43e1fe238 *R/shared.support.code.r
f545528e9442dee4bc480f47378bae94 *R/trajectory.analysis.r
e51cd504651b739a78b01db7d8c790e0 *README.md
814eedd0cfe222743936bf164a129686 *build/vignette.rds
84a92281c9fd13124e5e0d738cb6559a *build/vignette.rds
cc73a1467ca5f48d52a03686d50ca8d7 *data/PlethMorph.rda
4b4ee52bfcac42caf2b6b3c506af6db0 *data/Pupfish.rda
b7ceda4ee18eb3d0d3f966360dc02936 *data/PupfishHeads.rda
bebc8b3e8572570ca05203d8d9093285 *data/fishy.rda
0033a37910a893b33a05c44e405022e0 *data/motionpaths.rda
bd05b8fcebd10535e87a44fa7a4bb0e9 *inst/CITATION
9bbcf14fb19d324d1f89e30f39a3e42c *inst/doc/ANOVA.vs.MANOVA.R
0635eca5f6d8a463b61c35f9596ee0f7 *inst/doc/ANOVA.vs.MANOVA.Rmd
acf20a2f65d5e5023990689943c45754 *inst/doc/ANOVA.vs.MANOVA.html
e3b986ffba3393a1a1d768d219e6faff *inst/doc/Using.RRPP.R
0dec5cfa888bce418c412136317b58ab *inst/doc/ANOVA.vs.MANOVA.html
f28cfd8c6e138846c96d3526b53f177f *inst/doc/Using.RRPP.R
7ecbf1880a3df2a70e696e9e36d0a447 *inst/doc/Using.RRPP.Rmd
470ed550953ea049b52cc90d7a9cd85b *inst/doc/Using.RRPP.html
9a3f260b0f8372a83b28357fa1b98b2f *inst/doc/Using.RRPP.html
b1dbd8c164859bb9e117d1a5f3c643cc *man/ICCstats.Rd
be7cd478ec8f194ca3bfb4ea80dc9aa4 *man/PlethMorph.Rd
8dc1d16560450c0cfd709bed8c735f0d *man/Pupfish.Rd
d764e38c7e273adb4a6a884f2a8d6f1d *man/PupfishHeads.Rd
4078bc28bcea6b6e10b02ea10700afe6 *man/RRPP-package.Rd
2fc2ecd72fef7d84d10eb631ec40902d *man/RRPP-package.Rd
900a0d327b1a7ce565521a2fe92bbf78 *man/add.trajectories.Rd
16069c5b9771b2daa94872dbc5f20b74 *man/add.tree.Rd
78396282d43399ec6e9c78890c0f89e4 *man/anova.lm.rrpp.Rd
a4d2ac3df7e741723c8e71d7468cd205 *man/anova.measurement.error.Rd
eee872a66eb743a1df7e8551bc54ce73 *man/classify.Rd
969243a0a9e512eb12d2355f219c29ab *man/coef.lm.rrpp.Rd
bc5a7bf4623c09147b94399a6df758f1 *man/convert2ggplot.Rd
331148e043e0fb079ebc35a09aaf7963 *man/coef.lm.rrpp.Rd
edb5026ac1e731f7aa9c3cad4a8bdd6a *man/convert2ggplot.Rd
deb20fcd8f3f46106885ba90fd5eaa8f *man/effect.size.Rd
0561712843e52a531123acd006d408a2 *man/fishy.Rd
a33c46d63afb68d7f7f8707f06e36ed1 *man/fitted.lm.rrpp.Rd
b95e20b5ff5d305dc293892c8a4b0fca *man/focusMEonSubjects.Rd
72d643efc38a8cffd733f058d447031a *man/getANOVAStats.Rd
0eced9aeadd92bb77be3562f873dd26c *man/getANOVAStats.Rd
d28f1c70c8ca9d75c9e67f1cfd555d88 *man/getModelCov.Rd
4be6344afaae7955e5a34cadeb231587 *man/getModels.Rd
88c7bb0028505b5cfb7bd7f3491cd14c *man/getPermInfo.Rd
371494229bd51915aefd3831fdad2d34 *man/getResCov.Rd
7e263c27f5e3b274572a9a9962ded87e *man/getResCov.Rd
5fa1cb32075adf22ffdc34740171e2c4 *man/getTerms.Rd
2811cac68d4f495d73d37feef0b58304 *man/interSubVar.Rd
7d5a4f13991d8c3769d6b152aa0cbbec *man/lm.rrpp.Rd
36e0702d31b6b3e0be51ddc9da19793d *man/lm.rrpp.ws.Rd
d6ddec777fca3bb4f087a347e629f513 *man/interSubVar.Rd
aff748bce4adca8b307d8cf38d046d05 *man/lm.rrpp.Rd
814eeb9383e622fae5a8b00477dfee33 *man/lm.rrpp.ws.Rd
19a39a42115e81d1d1d7e5acb17a1a03 *man/logLik.lm.rrpp.Rd
9e1881d4b99173ac1661e741caf4c295 *man/looCV.Rd
620d62785d8cbfd9f4b444024abe6b43 *man/manova.update.Rd
1a64990d1af4e8cbe8ece74ce42d7e23 *man/measurement.error.Rd
af82b850a553db8eaab3a0951b854d2b *man/lr_test.Rd
ac41f844d49f9a57835e1db148646c4c *man/manova.update.Rd
f914f555f78bcdc548eced8c5148ee0a *man/measurement.error.Rd
01d84c69b3cb0e9f2f33ea527fc44f61 *man/model.comparison.Rd
05471ca269ac60530b233dce90a0f3f5 *man/model.frame.lm.rrpp.Rd
7e9ba29071c4cee40bdeb5bc861ffe51 *man/model.matrix.lm.rrpp.Rd
0e726f552fbf03e943ad5cebcc3fc09d *man/motionpaths.Rd
2d4e482f72e3883ab05852e215e58acd *man/na.omit.rrpp.data.frame.Rd
3d3bbec30c1aec40d6ee0a7be8febdb5 *man/ordinate.Rd
cff2f0f14aff61f5e3237532f54b8b55 *man/pairwise.Rd
3d3a4e164776e50581b77b44e94593d3 *man/ordinate.Rd
f249c380f75d6a35777484704124088d *man/pairwise.Rd
cbb0d2f1418836cfcecfced099801257 *man/plot.interSubVar.Rd
44a2f69384927bdd65e6c52c51502f6d *man/plot.lm.rrpp.Rd
1502c94b178c6349d037188149aa1c8a *man/plot.lm.rrpp.Rd
33c3529beda41e33f92cb446d4567764 *man/plot.looCV.Rd
59d090624ee285470baff6476c8df62e *man/plot.measurement.error.Rd
f8ce4b58b48b33ae16ba5f0986d12781 *man/plot.model.comparison.Rd
07b85c07d339d5d0af32216ae315ef34 *man/plot.ordinate.Rd
f7b9852412ce4e90209c5ec1ec02ce35 *man/plot.predict.lm.rrpp.Rd
b7f1c20df380d21ecdf03ab27dddc9e3 *man/plot.trajectory.analysis.Rd
c16aca0ebb2c3596f890c4d77cd39400 *man/plot.predict.lm.rrpp.Rd
56013c2c951e774a5e07133f645a49e2 *man/plot.trajectory.analysis.Rd
b4fe07260befe0f1b01a557cbbd3dd9e *man/predict.lm.rrpp.Rd
6f4b53f12982cc54f3058d989e3893d9 *man/prep.lda.Rd
f6f7682b9ccee0365c560b67e2d92b3f *man/print.ICCstats.Rd
b1b2bc86ef6ed57ab44badf084182779 *man/print.anova.lm.rrpp.Rd
1354129612f4c784fabcfb8a081e11d5 *man/print.coef.lm.rrpp.Rd
3aff928928deb0f0d62d68d0f262a44b *man/print.lm.rrpp.Rd
78865c8e99ad5252121285c557a3949c *man/print.looCV.Rd
cffabf885b11d7769b7850cf906c57b5 *man/print.measurement.error.Rd
8c1c4b5449f66a42afde037b52d17fd7 *man/print.lr_test.Rd
a0d901a02d198b4ec9cdf6a347d16b98 *man/print.measurement.error.Rd
63fe7c719bd8f43d7700eb630d08c01b *man/print.model.comparison.Rd
44daf8758d830b2ea00445b05e42ab00 *man/print.ordinate.Rd
0e7d801ef41e4b8d359ce692294fd418 *man/print.pairwise.Rd
Expand All @@ -94,25 +107,28 @@ dee2473a6f8021b7f361ddffbb69eed6 *man/print.summary.lm.rrpp.Rd
9ae760a71c70574a33826296fe5f95fb *man/print.summary.pairwise.Rd
5583b0d0f9a275bdbf2a4deceff93a0b *man/print.summary.trajectory.analysis.Rd
a2c3a95f8bb4ccaea49707237ed41bee *man/print.trajectory.analysis.Rd
f1d2b1710a92ae4fe0e74570d9d667ea *man/pval.Rd
e2f4d3ded41cac1f1baf52d5709ac5fc *man/residuals.lm.rrpp.Rd
f6985949fae79d175333feb4a95b4396 *man/reveal.model.designs.Rd
42c50fd8280f6167e1e1440b92e0bee4 *man/rrpp.data.frame.Rd
cc19b01056e4bdac93afe5f24695394a *man/rrpp.data.frame.Rd
51cdf38a81a6e087d43a5910f3dcbb20 *man/scaleCov.Rd
2a9793a1b15fd189dc880d390f493065 *man/summary.ICCstats.Rd
3feb50b2cd634fb9812fba13a02ff65d *man/summary.anova.lm.rrpp.Rd
ad97e4ce6e14cb92ac228d0f798d7717 *man/summary.coef.lm.rrpp.Rd
beb55085de49d23665272a0db65d1dff *man/summary.lm.rrpp.Rd
766ef7d064cbed03e6a495f29244c1c8 *man/summary.looCV.Rd
4707169f240852f468e998ef29a542b3 *man/summary.lr_test.Rd
c565a8b321acff1d48bb61fe0aa82bbf *man/summary.manova.lm.rrpp.Rd
4553c0f7d6af3be80c325fd379db5957 *man/summary.measurement.error.Rd
8071df084e856baaea970cadde3d9b0c *man/summary.model.comparison.Rd
02292ef7e504acfa0052c2231ba12305 *man/summary.ordinate.Rd
a0a57603123abb27c8221c40fd52235d *man/summary.pairwise.Rd
115cb1fd1eeed273b3b5e82732372a5d *man/summary.pairwise.Rd
73f2a913f66ac6af76747a7cd93c9070 *man/summary.predict.lm.rrpp.Rd
a81cec6977939fad86be89ba357b4b99 *man/summary.trajectory.analysis.Rd
63a84cde4ccd20f033b499e87bc6ee71 *man/terms.lm.rrpp.Rd
e2f11f0585d5822886ccd3c86d1c21e4 *man/trajectory.analysis.Rd
1e7b2fe61069820fc4f3f04034db7936 *man/trajectory.analysis.Rd
e52a8af2dc8b337878160602b227ab75 *man/vec.cor.matrix.Rd
d631691a132b8995618e408c3c67a193 *tests/testthat.R
7afa9f64f831ffb4fd681eab67e14e81 *tests/testthat/test-RRPP.R
c99589eeb1879a23893e15e7abc5f054 *tests/testthat/test-RRPP.R
0635eca5f6d8a463b61c35f9596ee0f7 *vignettes/ANOVA.vs.MANOVA.Rmd
7ecbf1880a3df2a70e696e9e36d0a447 *vignettes/Using.RRPP.Rmd
10 changes: 10 additions & 0 deletions NAMESPACE
@@ -1,5 +1,6 @@
# Generated by roxygen2: do not edit by hand
S3method(anova,lm.rrpp)
S3method(anova,measurement.error)
S3method(coef,lm.rrpp)
S3method(fitted,lm.rrpp)
S3method(logLik,lm.rrpp)
Expand All @@ -15,10 +16,12 @@ S3method(plot,ordinate)
S3method(plot,predict.lm.rrpp)
S3method(plot,trajectory.analysis)
S3method(predict,lm.rrpp)
S3method(print,ICCstats)
S3method(print,anova.lm.rrpp)
S3method(print,coef.lm.rrpp)
S3method(print,lm.rrpp)
S3method(print,looCV)
S3method(print,lr_test)
S3method(print,measurement.error)
S3method(print,model.comparison)
S3method(print,ordinate)
Expand All @@ -31,10 +34,12 @@ S3method(print,summary.pairwise)
S3method(print,summary.trajectory.analysis)
S3method(print,trajectory.analysis)
S3method(residuals,lm.rrpp)
S3method(summary,ICCstats)
S3method(summary,anova.lm.rrpp)
S3method(summary,coef.lm.rrpp)
S3method(summary,lm.rrpp)
S3method(summary,looCV)
S3method(summary,lr_test)
S3method(summary,manova.lm.rrpp)
S3method(summary,measurement.error)
S3method(summary,model.comparison)
Expand All @@ -43,11 +48,14 @@ S3method(summary,pairwise)
S3method(summary,predict.lm.rrpp)
S3method(summary,trajectory.analysis)
S3method(terms,lm.rrpp)
export(ICCstats)
export(add.trajectories)
export(add.tree)
export(anova.lm.rrpp)
export(anova.measurement.error)
export(classify)
export(convert2ggplot)
export(effect.size)
export(focusMEonSubjects)
export(getANOVAStats)
export(getModelCov)
Expand All @@ -59,6 +67,7 @@ export(interSubVar)
export(lm.rrpp)
export(lm.rrpp.ws)
export(looCV)
export(lr_test)
export(manova.update)
export(measurement.error)
export(model.comparison)
Expand All @@ -76,6 +85,7 @@ export(print.summary.lm.rrpp)
export(print.summary.pairwise)
export(print.summary.trajectory.analysis)
export(print.trajectory.analysis)
export(pval)
export(reveal.model.designs)
export(rrpp.data.frame)
export(scaleCov)
Expand Down
10 changes: 7 additions & 3 deletions NEWS.md
@@ -1,21 +1,25 @@
# CHANGES IN RRPP 1.4.0
# CHANGES IN RRPP 2.0.0

### NEW FEATURES
* Added arguments for restricted resampling to `lm.rrpp` and `predict.lm.rrpp`, and permutation of full model residuals (with restrictions) to lm.rrpp
* Added arguments for restricted resampling to `lm.rrpp` and `predict.lm.rrpp`, and permutation of full model residuals (with restrictions) to `lm.rrpp`.
* Added new function, `measurement.error`.
* Added new function, `lm.rrpp.ws`.
* Added `verbose` arguments to most analytical functions to reduce dense results.
* Added utility functions (`getANOVAStats`, `getPermInfo`, `getTerms`, and `getModels`) to accommodate `verbose` function choices, plus allow users to easily extract objects as output.
* Added new function, `ICCstats`, for calculating ICC statistics for `lm.rrpp` fits.
* Added S3 generic functions for `measurement.error`, but also added a plot utility function, `focusMEonSubjects`, which builds off of `plot.measurement.error`, to focus attention on specific plot details.
* Added function, `interSubVar`, a utility function to use along with `measurement.error`,
to visualize how variation between replicate measures, within subjects, can affect inter-subject variation.

### BUG FIXES
* Fixed SSCP issue in `summary.lm.rrpp` that produces matrices of 0s. The issue was inherent to `lm.rrpp`, from erroneous assignment of models, only for output (not for mechanics).
* Attempted fix of `predict.lm.rrpp` for QR-truncated design matrices.
* Attempted fix of `predict.lm.rrpp` for QR-truncated design matrices.
* Fixed illogical `print.progess` conditions in `pairwise`.
* Fixed potential problem with reliance on `Matrix::qrQ`, using rather, `Matrix::qr.Q`.
* Fixed GLS estimation issue with `pairwise`.

### OTHER CHANGES
* argument `SE` added to `coef.lm.rrpp` for calculating bootstrap standard error.

# CHANGES IN RRPP 1.3.1

Expand Down

0 comments on commit 733d2ec

Please sign in to comment.