Skip to content

Commit

Permalink
Merge pull request #73 from Gengrui-Zhang/devel
Browse files Browse the repository at this point in the history
0.0.3
  • Loading branch information
marklhc authored Dec 3, 2023
2 parents 9550a77 + 66312d6 commit 622d6e7
Show file tree
Hide file tree
Showing 43 changed files with 3,610 additions and 550 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
^docs$
^pkgdown$
^\.github$
^\.vscode$
1 change: 1 addition & 0 deletions .gitignore
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.vscode
.Rproj.user
.Rhistory
.Rdata
Expand Down
14 changes: 11 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: R2spa
Title: An R package for two-stage path analysis (2S-PA) to adjust for measurement errors
Version: 0.0.2
Version: 0.0.3
Authors@R:
c(
person(given = "Mark Hok Chio",
Expand Down Expand Up @@ -36,12 +36,20 @@ Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
Imports:
lavaan,
MASS
MASS,
OpenMx
Suggests:
boot,
DiagrammeR,
knitr,
magrittr,
Matrix,
mirt,
numDeriv,
rmarkdown,
testthat (>= 3.0.0)
psych,
testthat (>= 3.0.0),
umx
VignetteBuilder: knitr
Config/testthat/edition: 3
URL: https://gengrui-zhang.github.io/R2spa/
14 changes: 14 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
# Generated by roxygen2: do not edit by hand

export(block_diag)
export(compute_fscore)
export(get_fs)
export(get_fs_lavaan)
export(grandStandardizedSolution)
export(grand_standardized_solution)
export(tspa)
export(tspa_mx_model)
export(tspa_plot)
export(vcov_corrected)
importFrom(OpenMx,mxAlgebraFromString)
importFrom(OpenMx,mxData)
importFrom(OpenMx,mxExpectationNormal)
importFrom(OpenMx,mxFitFunctionML)
importFrom(OpenMx,mxMatrix)
importFrom(OpenMx,mxModel)
importFrom(grDevices,devAskNewPage)
importFrom(lavaan,cfa)
importFrom(lavaan,coef)
importFrom(lavaan,lavInspect)
importFrom(lavaan,lavTech)
importFrom(lavaan,lav_func_jacobian_complex)
Expand Down
32 changes: 32 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
# R2spa 0.0.3

- Add function `tspa_plot()` for bivariate and residual plots (#23)

- `get_fs()` gains argument `corrected_fsT` for computing corrected error estimates (#50)

- New function `vcov_corrected()` for computing corrected SEs (#39)

- New function `get_fs_lavaan()` for computing factor scores and relevant matrices directly from a `lavaan` output (#61)

- Initial support for 2S-PA with *OpenMx* with `tspa_mx()`

- Update naming of relevant matrices when computing factor scores:
* `fsT`: error covariance of factor scores
* `fsL`: loading matrix of factor scores
* `fsb`: intercepts of factor scores
* `scoring_matrix`: weights for computing factor scores from items

- New vignettes for:
* Corrected error variance of factor scores (#50)
* Corrected standard errors incorporating uncertainty in measurement parameters of factor scores (#39)
* Using 2S-PA with EFA scores
* Using 2S-PA with OpenMx and definition variables (PR #57)
* Latent interaction with categorical indicators (#27)
* Growth modeling

- Better error messages for `tspa()` (#53)

- Support mean structure and growth model (#36, #19)

- Clean up code with `lintr` (#33)

# R2spa 0.0.2

- Use `pkgdown` to create website, with GitHub action (#22)
Expand Down
Loading

0 comments on commit 622d6e7

Please sign in to comment.