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

<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'>refs</a><a class='active' href='/guix/log/tests/keys/ed25519.pub'>log</a><a href='/guix/tree/tests/keys/ed25519.pub?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'>tree</a><a href='/guix/commit/tests/keys/ed25519.pub?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'>commit</a><a href='/guix/diff/tests/keys/ed25519.pub?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/keys/ed25519.pub'>
<input type='hidden' name='id' value='9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'>root</a>/<a href='/guix/log/tests?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'>tests</a>/<a href='/guix/log/tests/keys?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'>keys</a>/<a href='/guix/log/tests/keys/ed25519.pub?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc'>ed25519.pub</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/keys/ed25519.pub?id=9ccd4f8dd4c5ae2c079dbaa282da15e2f57714fc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-05-18 23:20:21 +0200'>2022-05-18</span></td><td><a href='/guix/commit/tests/keys/ed25519.pub?id=3ae7632ca0a1edca9d8c3c766efb0dcc8aa5da37'>tests: Ensure test OpenPGP keys never expire.</a><span class='msg-avail'>...<span class='msg-tooltip'>All these keys had expiration dates.  'tests/keys/ed25519.pub' expired
on 2022-04-24.

Fixes &lt;https://issues.guix.gnu.org/55506&gt;.

* tests/keys/ed25519.pub, tests/keys/ed25519-2.pub,
tests/keys/ed25519-3.pub: Remove expiration date.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-22 10:53:19 +0100'>2021-12-22</span></td><td><a href='/guix/commit/tests/keys/ed25519.pub?id=9ebc9ca070a21ba0aeb3f61202a8071bb250ccc8'>tests: Move keys into ./tests/keys/ and add a third ed25519 key.</a><span class='msg-avail'>...<span class='msg-tooltip'>The third key will be used in an upcoming commit.

Rename public keys to .pub.

* guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable.
(%ed25519-3-secret-key-file): New variable.
(%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file.
(%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file.
* tests/keys/ed25519-3.key: New file.
* tests/keys/ed25519-3.sec: New file.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Attila Lendvai</td></tr>