Skip to content

Commit 239b708

Browse files
committed
avoid explicit magrittr import
1 parent e37d870 commit 239b708

6 files changed

Lines changed: 4 additions & 11 deletions

File tree

docker/depends/pecan_package_dependencies.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180
"magrittr","*","base/db","Imports",FALSE
181181
"magrittr","*","base/utils","Imports",FALSE
182182
"magrittr","*","models/ed","Imports",FALSE
183-
"magrittr","*","modules/assim.sequential","Imports",FALSE
184183
"magrittr","*","modules/benchmark","Imports",FALSE
185184
"magrittr","*","modules/data.land","Imports",FALSE
186185
"magrittr","*","modules/data.remote","Imports",FALSE

modules/assim.sequential/DESCRIPTION

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Imports:
1919
future,
2020
ggplot2,
2121
lubridate (>= 1.6.0),
22-
magrittr,
2322
Matrix,
2423
ncdf4,
2524
nimble,

modules/assim.sequential/NAMESPACE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,4 @@ import(nimble)
7171
importFrom(dplyr,"%>%")
7272
importFrom(foreach,"%dopar%")
7373
importFrom(lubridate,"%m+%")
74-
importFrom(magrittr,"%>%")
7574
importFrom(rlang,.data)

modules/assim.sequential/R/Helper.functions.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#' @return A list the same dimension as X, with each column of each dataframe
88
#' modified by replacing outlier points with the column median
99
#' @export
10-
#' @importFrom magrittr %>%
10+
#' @importFrom dplyr %>%
1111
#'
1212
outlier.detector.boxplot<-function(X) {
1313
X <- X %>%
@@ -86,7 +86,7 @@ SDA_control <-
8686
#' @description This function uses a set of scaling factors defined in the pecan XML to scale a given matrix
8787
#' @return rescaled Matrix
8888
#' @export
89-
#' @importFrom magrittr %>%
89+
#' @importFrom dplyr %>%
9090
rescaling_stateVars <- function(settings, X, multiply=TRUE) {
9191

9292
FUN <- ifelse(multiply, .Primitive('*'), .Primitive('/'))

modules/assim.sequential/R/Prep_OBS_SDA.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#'
88
#' @return mean and covariance of observations
99
#'
10-
#' @importFrom magrittr %>%
10+
#' @importFrom dplyr %>%
1111
#' @export
1212
#'
1313
Prep_OBS_SDA <- function(settings, out_dir, AGB_dir, Search_Window=30){

modules/assim.sequential/tests/Rcheck_reference.log

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
* this is package ‘PEcAnAssimSequential’ version ‘1.7.2’
99
* package encoding: UTF-8
1010
* checking package namespace information ... OK
11-
* checking package dependencies ... NOTE
12-
Imports includes 21 non-default packages.
13-
Importing from so many packages makes the package vulnerable to any of
14-
them becoming unavailable. Move as many as possible to Suggests and
15-
use conditionally.
11+
* checking package dependencies ... OK
1612
* checking if this is a source package ... OK
1713
* checking if there is a namespace ... OK
1814
* checking for executable files ... OK

0 commit comments

Comments
 (0)