Skip to content

Commit 2b312f9

Browse files
committed
fix .cdl & .all error;fix lme4 note
1 parent da0ac5b commit 2b312f9

File tree

5 files changed

+40
-19
lines changed

5 files changed

+40
-19
lines changed

DESCRIPTION

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: domir
22
Title: Tools to Support Relative Importance Analysis
3-
Version: 1.1.0
4-
Date: 2023-9-2
3+
Version: 1.1.1
4+
Date: 2023-10-1
55
Authors@R:
66
person(given = "Joseph",
77
family = "Luchman",
@@ -25,6 +25,7 @@ Suggests:
2525
Formula,
2626
ggplot2,
2727
knitr,
28+
lme4,
2829
parameters,
2930
performance,
3031
pscl,

NEWS.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1+
# domir 1.1.1
2+
3+
## bug fixes
4+
5+
- `domir()` produced error when `.cdl = FALSE` was combined with `.all`
6+
- *lme4* added to suggested list due to reference in documentation and CRAN warning
7+
18
# domir 1.1.0
29

310
## visible
11+
412
- `formula_list` method implemented
513
- merger of planned `list` and `Formula::Formula` methods
614
- `fmllst2Fml` can be used to translate `formula_list`s to `Formula::Formula`s
@@ -123,11 +131,7 @@
123131

124132
## bug fixes
125133

126-
<<<<<<< HEAD
127-
- `Ensemble_Coordinator` that submitted factor #'s instead of text in R versions \< 4
128-
=======
129134
- `Ensemble_Coordinator` that submitted factor numbers instead of text in R versions \< 4.0
130-
>>>>>>> 1.0
131135

132136
# domir 0.0.0
133137

R/dominance_internals.r

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,11 @@ dominance_scalar <-
231231
# if there is an '.adj' and/or '.all' model, adjust models with 1 name
232232
# for that value; other models adjust automatically given increment
233233
if (result_adjustment > 0)
234-
uniq_cmb_count <-
234+
value_vector <-
235235
replace(
236-
uniq_cmb_count,
237-
uniq_cmb_count - result_adjustment,
238-
combo_count_by_subset == 1
236+
value_vector,
237+
combo_count_by_subset == 1,
238+
value_vector[combo_count_by_subset == 1] - result_adjustment
239239
)
240240
# generates number of 'unique' combinations the focal name has at
241241
# specific number of value generating names not considering self; note

cran-comments.md

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
## Minor version update: 1.1.0
1+
## Patch version update: 1.1.1
22

3-
This minor update has added a new S3 method the the primary `domir()` function
4-
that parses a list of formulas by RHS~LHS name pairs. This update has also
5-
begun an extensive code linting process to improve its readability and
6-
complexity.
3+
This patch update fixed a bug in the computation of a returned matrix when an
4+
infrequently used optional argument is non-`NULL` and added the *lme4* package
5+
to this package's list of suggested packages given its reference in
6+
documentation and a warning from CRAN checks.
7+
8+
## CRAN check results
9+
10+
Check: Rd cross-references
11+
Result: NOTE
12+
Undeclared package ‘lme4’ in Rd xrefs
13+
Flavor: r-devel-linux-x86_64-fedora-clang
14+
15+
Comment: `lme4`has been added to this package's list of suggested packages.
716

817
## Test environments
918

@@ -29,9 +38,8 @@ Comment: DOI: 10.1002/asmb.446 links reliably to Lipovetsky's and Conklin's 2001
2938
Windows Server 2022, R-devel, 64 bit: 3 NOTES
3039

3140
* checking HTML version of manual ... NOTE
32-
Skipping checking math rendering: package 'V8' unavailable
3341

34-
Comment: Assume the note stems from a temporary issue with package `{V8}` on the RHub platform and is not reproducible in many other platforms.
42+
Comment: Previously, this issue arose with the package `{V8}` on the RHub platform and was not reproducible on the win-builder, macOS-builder, or my local checks.
3543

3644
* checking for non-standard things in the check directory ... NOTE
3745
Found the following files/directories:
@@ -51,7 +59,15 @@ Fedora Linux, R-devel, clang, gfortran and Ubuntu Linux 20.04.1 LTS, R-release,
5159
Skipping checking HTML validation: no command 'tidy' found
5260
Skipping checking math rendering: package 'V8' unavailable
5361

54-
Comment: Assume the note stems from an issue with package `{V8}` and `{broom}` on the RHub platform and is not reproducible in many other platforms.
62+
Comment: This is a similar issue to Rhub's Windows check in that the `{V8}` package seems unavailable and is throwing a NOTE. Again, not an issue that occured with win-builder, macOS-builder, or my local checks.
63+
64+
Ubuntu Linux 20.04.1 LTS, R-release, GCC (rhub): 1 NOTE
65+
66+
* checking HTML version of manual ... NOTE
67+
Skipping checking HTML validation: no command 'tidy' found
68+
Skipping checking math rendering: package 'V8' unavailable
69+
70+
Comment: Consistent with the Fedora-based check, the Ubuntu check is throwing a NOTE given the `{V8}` package is seems unavailable. Again, not an issue that occured with win-builder, macOS-builder, or my local checks.
5571

5672
## Downstream dependencies
5773

man/domir.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)