diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/r-mixedpower-r2power.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
| download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/r-mixedpower-r2power.patch')
| -rw-r--r-- | gnu/packages/patches/r-mixedpower-r2power.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/r-mixedpower-r2power.patch b/gnu/packages/patches/r-mixedpower-r2power.patch new file mode 100644 index 0000000000..a3307ca7b5 --- /dev/null +++ b/gnu/packages/patches/r-mixedpower-r2power.patch @@ -0,0 +1,26 @@ +From e882fda905150649aa887c72731144330ca297b5 Mon Sep 17 00:00:00 2001 +From: Lars-Dominik Braun <lars@6xq.net> +Date: Fri, 28 Oct 2022 09:18:11 +0200 +Subject: [PATCH] Fix R2power with R>=4.2 + +The previous commit missed this if statement. +--- + R/meta_functions.R | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/R/meta_functions.R b/R/meta_functions.R +index a65f0c1..fb3feba 100644 +--- a/R/meta_functions.R ++++ b/R/meta_functions.R +@@ -172,7 +172,7 @@ R2power <- function(model, data, fixed_effects, simvar, + } # end if databased + + # 2. SESOI +- suppressWarnings(if (SESOI != F){ # supress warning generated by if statement if SESOI =! F ++ suppressWarnings(if (!is.logical(SESOI)){ + + # change beta coeficients to SESOI values + model@beta <- SESOI +-- +2.37.4 + |