Update version for cran check

nlsy-links · Sep 19, 2024 · ff1c3e9 · ff1c3e9
1 parent d395ea7
commit ff1c3e9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: NlsyLinks
 Type: Package
 Title: Utilities and Kinship Information for Research with the NLSY
-Version: 2.2.1
+Version: 2.2.2
 Authors@R: c(
     person("William Howard", "Beasley", role = c("aut"), email = "[email protected]", comment = c(ORCID = "0000-0002-5613-5006")), 
     person("Joseph Lee", "Rodgers", role = "ctb", comment = c(ORCID = "0000-0002-8615-6713")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+Version 2.2.2 (2024-09-19)
+------------------------------------------------------------------------------
+Updates:
+* refreshing tests to meet new CRAN guidelines
+
+
 Version 2.2.1 (2023-09-14)
 ------------------------------------------------------------------------------
 Updates:

diff --git a/R/ace-lavaan-group.R b/R/ace-lavaan-group.R
@@ -111,8 +111,8 @@ AceLavaanGroup <-
     c2 := c * c                           #Declare c^2 for easy point and variance estimation.
   ")
 
-    # If the A/C component's excluded: 
-    # (1) overwrite the code and (2) declare a2/c2, 
+    # If the A/C component's excluded:
+    # (1) overwrite the code and (2) declare a2/c2,
     # so the parameter value can be retrieved later without if statements.
     if (!estimateA) modelA <- "\n a2 := 0 \n"
     if (!estimateC) modelC <- "\n c2 := 0 \n"
@@ -150,7 +150,7 @@ AceLavaanGroup <-
     components <- base::as.numeric(base::cbind(a2, c2, e2)[1, ] / (a2 + c2 + e2)) # The 'as.numeric' gets rid of the vector labels.
     # Print the unity-SCALED ace components.
     if (printOutput) base::print(components)
-        caseCount <- base::nrow(dsClean)
+    caseCount <- base::nrow(dsClean)
     details <- base::list(lavaan = fit)
     # print(paste("R Levels excluded:",  stringr::str_c(rLevelsToExclude, collapse=", "), "; R Levels retained:", rString)) #Print the dropped & retained groups.
     ace <- NlsyLinks::CreateAceEstimate(

diff --git a/R/create-pair-links-double-entered.R b/R/create-pair-links-double-entered.R
@@ -88,7 +88,9 @@ CreatePairLinksDoubleEntered <- function(
     linksNames = c("ExtendedID", "R", "RelationshipPath"), validateOutcomeDataset = TRUE,
     subject1Qualifier = "_S1", subject2Qualifier = "_S2") {
   ValidatePairLinks(linksPairDataset)
-  if (validateOutcomeDataset) ValidateOutcomeDataset(dsOutcome = outcomeDataset, outcomeNames = outcomeNames)
+  if (validateOutcomeDataset) {
+    ValidateOutcomeDataset(dsOutcome = outcomeDataset, outcomeNames = outcomeNames)
+  }
 
   dsLinksLeftHand <- base::subset(linksPairDataset, select = c("SubjectTag_S1", "SubjectTag_S2", linksNames)) #' Lefthand' is my slang for Subjec1Tag is less than the SubjectTag_S2
   dsLinksRightHand <- base::subset(linksPairDataset, select = c("SubjectTag_S1", "SubjectTag_S2", linksNames))