From 2bd0cfecc3b98055e8d0965d13fc6c99f0730bce Mon Sep 17 00:00:00 2001 From: Jan Dietrich Date: Thu, 29 Jun 2023 10:05:19 +0200 Subject: [PATCH] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pascal Führlich <82826417+pfuehrlich-pik@users.noreply.github.com> --- R/magpie-class.R | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/R/magpie-class.R b/R/magpie-class.R index 62d6876e..97b495e7 100644 --- a/R/magpie-class.R +++ b/R/magpie-class.R @@ -369,11 +369,10 @@ setMethod("[<-", # nolint if (missing(j)) jj <- seq_len(dim(x)[2]) else jj <- j if (missing(k)) kk <- seq_len(dim(x)[3]) else kk <- k value <- magpie_expand(value, x[ii, jj, kk]) - } else if (length(value) != length(x@.Data[i, j, k]) & length(value) != 1) { + } else if (length(value) != length(x@.Data[i, j, k]) && length(value) != 1) { # dangerous writing of value as order might be wrong! stop("Replacement does not work! Different replacement length!") - } else if (length(value) != 1 && !is.null(getOption("magclass.verbosity")) && - getOption("magclass.verbosity") > 1) { + } else if (length(value) != 1 && getOption("magclass.verbosity", default = 0) > 1) { message("NOTE ([<-): Dangerous replacement! As replacement value is not", " an MAgPIE object name checking is deactivated!\n") }