diff --git a/CRAN-RELEASE b/CRAN-RELEASE deleted file mode 100644 index bf87bb43..00000000 --- a/CRAN-RELEASE +++ /dev/null @@ -1,2 +0,0 @@ -This package was submitted to CRAN on 2021-05-28. -Once it is accepted, delete this file and tag the release (commit d3b82c99). diff --git a/NEWS.md b/NEWS.md index b605d85a..20054167 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,11 +1,16 @@ -## dev umx 4.8.0 +## dev umx 4.9.0 +* NEW: + +# Releases +## umx 4.8.0 +* June 2021 R 4.1.0 (2021-06-01) * NEW: `umxPlot` now detects and plots Pearson-Aitken selection paths (solid red headless). -* NEW: `umxPlotFun` plot functions, e.g "sin(x)", "cos(x)" without hassles. +* NEW: `umxPlotFun` plot functions without hassles. e.g `umxPlotFun("sin(x)")` * NEW: `umxModelNames` to get model and submodel names from a model. * NEW: `libs` as a short cut for `multiple library()` calls * e.g. `libs("x", "y", c("a", "b"))` * NEW: `fin_valuation` uses revenue, margin, expenses and PE to compute a market cap. - * IMPROVED: `fin_interest` shorter parameter name `dinflate` and other improvements. +* IMPROVED: `fin_interest` shorter parameter name `dinflate` and other improvements. * IMPROVED: `umxACEv` Tables now include markdown-compatible table captions. * IMPROVED: `umxAPA` reports R^2 for `lm` (in addition to beta & CI[] for each parameter) * IMPROVED: `umxSummary` sorts RAM parameters by type (factor loading etc.) and can filter means and residuals for ease of use. @@ -14,31 +19,30 @@ * IMPROVED: `umxCompare` Maintain compatibility with new OpenMx changes to `mxCompare` (esp. for WLS). * IMPROVED: `umx_read_lower` accept names for lower diag. * IMPROVED: `umxCP` `correlatedACE` leaves the covariances fixed@0. -* IMPROVED: `umxAPA` pretty printing. * IMPROVED: `umxACE` added `A_std` closes #151 +* IMPROVED: `umxAPA` pretty printing. * IMPROVED: `umxPlotFun` check for character input. * NEW: `xmu_summary_RAM_group_parameters` sort and filter RAM model parameters for ease of understanding. * MINOR: `umxFactor` now used in all examples involving factor making. -# Releases ## umx 4.3.0 * January 2021 R 4.0.3 (2020-10-10) * NEW `plot` can output to pdf, png, svg! -* NEW `umx_set_plot_format` can choose between pdf, png, svg plot output (in addition to DiagrammeR and graphviz) +* NEW `umx_set_plot_format` adds pdf, png, svg plot output (in addition to DiagrammeR and graphviz) +* NEW: `umx_lower.tri` helper to get lower.tri values in 1 call +* NEW: `umx_set_plot_use_hrbrthemes` control +* NEW: `plot.percent` plot support for percent change questions * IMPROVED: `umxSummary` now reports algebra values when present in RAM models closes #70 * IMPROVED: `umxSummary` tables have pandoc captions (see #145) * IMPROVED: `umxCompare` table output and plain-English summary printing (cat) * IMPROVED: `umxCP` practical workflows for correlated ACE -* NEW: `umx_lower.tri` helper to get lower.tri values in 1 call -* HELP: `umxCP` Document that correlatedA works on a, c and e, allowing factors built by these matrices to correlate. +* IMPROVED: `fin_compound_interest` now outputs a table of annual returns +* IMPROVED: `umxAPA` uses cat to improve usability of summary data +* HELP: `umxCP` Document that correlatedA works on a, c and e, allowing factors to correlate. * BETA: `umxGxEbiv` lboundACE @ 0 by default * FIXED: `umxSimplex` example * FIXED: `umxGxEbiv` fix nonfunctional lboundACE and lboundM (thanks @mcneale) -* FIXED: `umxGxEbiv` selVars order was imposed on expectation dimnames but didn't match the cov matrix due to bespoke nature of expCov algebras... -* IMPROVED: `fin_compound_interest` now outputs a table of annual returns -* IMPROVED: `umxAPA` uses cat to improve usability of summary data -* NEW: `umx_set_plot_use_hrbrthemes` control -* NEW: `plot.percent` plot support for percent change questions +* FIXED: `umxGxEbiv` selVars order was imposed on expectation dimnames but didn't match the cov matrix due to bespoke nature of `expCov` algebras... ## umx 4.2.5 * December 2020 R 4.0.3 (2020-10-10) diff --git a/R/build_run_modify.R b/R/build_run_modify.R index e3d54fcd..b961effd 100644 --- a/R/build_run_modify.R +++ b/R/build_run_modify.R @@ -22,6 +22,9 @@ # ![](example-plot.jpg "Example Plot Title") = Image in man/figures +# cran_prep <- check_for_cran("~/bin/umx/", show_status=FALSE) +# cran_prep$cran_summary() + # Makevars for clang # mate ~/.R/Makevars # https://gist.github.com/tbates/9cec0a93e04c06c41b550454eaa892a3 @@ -4014,8 +4017,7 @@ umxFixAll <- function(model, name = "_fixed", run = FALSE, verbose= FALSE){ #' #' # Example of a warning to not omit the variable names #' # tmp = umxThresholdMatrix(x) -#' # Polite message: For coding safety, when calling umxThresholdMatrix, set fullVarNames to the list of FULL names of all -#' # the variables in the model (AND you MUST include sep if this is a twin model!!) +#' # Polite message: For coding safety, when calling umxThresholdMatrix, set fullVarNames... #' #' # One ordered factor with 5-levels #' x = cut(rnorm(100), breaks = c(-Inf,.2,.5, .7, Inf)); levels(x) = 1:5 @@ -4089,7 +4091,8 @@ umxFixAll <- function(model, name = "_fixed", run = FALSE, verbose= FALSE){ #' # = Example with method = allFree = #' # ================================= #' -#' tmp = umxThresholdMatrix(twinData, fullVarNames = tvars(selDVs, sep= ""), sep = "", method = "allFree") +#' tmp = umxThresholdMatrix(twinData, fullVarNames = tvars(selDVs, sep= ""), sep = "", +#' method = "allFree") #' all(tmp[[2]]$free) #' umxThresholdMatrix <- function(df, fullVarNames = NULL, sep = NULL, method = c("Mehta", "allFree"), threshMatName = "threshMat", l_u_bound = c(NA, NA), droplevels = FALSE, verbose = FALSE, selDVs= "deprecated"){ diff --git a/R/xmu.R b/R/xmu.R index cfb6e49e..047d3ff7 100644 --- a/R/xmu.R +++ b/R/xmu.R @@ -1808,20 +1808,20 @@ xmu_summary_RAM_group_parameters <- function(model, paramTable, means= FALSE, r if(from == to){ paramTable[i, "type"] = "Factor Variances" }else{ - paramTable[i, "type"] = "Factor Covariances" + paramTable[i, "type"] = "Factor Covs" } }else{ - paramTable[i, "type"] = "Latent-Manifest Covariances" + paramTable[i, "type"] = "Latent-Manifest Covs" } } else { # from %in% manifests if(to %in% manifests){ if(from == to){ paramTable[i, "type"] = "Residuals" }else{ - paramTable[i, "type"] = "Manifest Covariances" + paramTable[i, "type"] = "Manifest Covs" } }else{ - paramTable[i, "type"] = "Latent-Manifest Covariances" + paramTable[i, "type"] = "Latent-Manifest Covs" } } } else if(location$matrix == "A"){ diff --git a/man/umxThresholdMatrix.Rd b/man/umxThresholdMatrix.Rd index 8a13a10c..82a0c371 100644 --- a/man/umxThresholdMatrix.Rd +++ b/man/umxThresholdMatrix.Rd @@ -96,8 +96,7 @@ tmp[[3]]$formula # Example of a warning to not omit the variable names # tmp = umxThresholdMatrix(x) -# Polite message: For coding safety, when calling umxThresholdMatrix, set fullVarNames to the list of FULL names of all -# the variables in the model (AND you MUST include sep if this is a twin model!!) +# Polite message: For coding safety, when calling umxThresholdMatrix, set fullVarNames... # One ordered factor with 5-levels x = cut(rnorm(100), breaks = c(-Inf,.2,.5, .7, Inf)); levels(x) = 1:5 @@ -170,7 +169,8 @@ tmp[[3]]$formula # = Example with method = allFree = # ================================= -tmp = umxThresholdMatrix(twinData, fullVarNames = tvars(selDVs, sep= ""), sep = "", method = "allFree") +tmp = umxThresholdMatrix(twinData, fullVarNames = tvars(selDVs, sep= ""), sep = "", + method = "allFree") all(tmp[[2]]$free) }