From 53ecf2bf5d5f17440d0f048da14241f37d8fd084 Mon Sep 17 00:00:00 2001 From: Hongyuan Jia Date: Sat, 19 Dec 2020 22:18:16 +0800 Subject: [PATCH] v0.14.0 RC Increment version number [CRAN] Check revdep [CRAN] Update CRAN comments [docs] Fix typos --- DESCRIPTION | 2 +- NEWS.md | 16 ++++----- R/geom.R | 2 +- R/idd.R | 2 +- R/idf.R | 8 ++--- R/idfobj.R | 10 +++--- R/impl-idf.R | 2 +- R/param.R | 2 +- R/run.R | 2 +- R/viewer.R | 2 +- README.Rmd | 2 +- README.md | 2 +- cran-comments.md | 9 +++-- man/Idd.Rd | 2 +- man/Idf.Rd | 8 ++--- man/IdfGeometry.Rd | 2 +- man/IdfObject.Rd | 10 +++--- man/IdfViewer.Rd | 2 +- man/ParametricJob.Rd | 2 +- man/expand_idf_dots_object.Rd | 2 +- man/run_model.Rd | 2 +- revdep/README.md | 55 ++++++++++++---------------- revdep/cran.md | 7 ++++ tic.R | 67 ----------------------------------- vignettes/param.Rmd | 2 +- 25 files changed, 75 insertions(+), 147 deletions(-) create mode 100644 revdep/cran.md delete mode 100644 tic.R diff --git a/DESCRIPTION b/DESCRIPTION index 3a3d9a626..a8fe03dfb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: eplusr Title: A Toolkit for Using Whole Building Simulation Program 'EnergyPlus' -Version: 0.13.0.9000 +Version: 0.14.0 Authors@R: person(given = "Hongyuan", family = "Jia", diff --git a/NEWS.md b/NEWS.md index 0e2dd1b66..c9e5e77b3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# eplusr (development version) +# eplusr 0.14.0 ## New features @@ -28,7 +28,7 @@ ## Minor changes -* Now rgl and decido package has beem moved from *Imports* to *Suggests*, since +* Now rgl and decido package has been moved from *Imports* to *Suggests*, since they are only used in the `IdfViewer` class for 3D visualization which is not the main focus of this package (368). * `run_multi()` now gets a new argument `expand_obj` to control whether @@ -64,7 +64,7 @@ * Fix the error in `EplusJob$report_data()` when multiple reporting frequencies exist in the CSV output (#340). * Fix simulation error when FMU files are given in relative paths (#344). Now - all objects that reference to external files can be correctly copied iinto + all objects that reference to external files can be correctly copied into output directory when `copy_external` is set to `TRUE`. * Fix the error when using an `Idf` as input in `Idf$insert()` (#348). * Sub-hourly EPW files are supported (#351). @@ -170,9 +170,9 @@ rgl package in a similar way as OpenStudio SketchUp Plugin. `Idf$geometry()` and `Idf$view()` methods are added to directly create an `IdfGeometry` and `IdfViewer` object based on current `Idf` object, respectively (#296). -* A `plot.Idf` method is added which is basically a wrappper of `Idf$view()` +* A `plot.Idf` method is added which is basically a wrapper of `Idf$view()` (#296). -* Now eplusr can utilize the CSV output for report data extraction. Benifiting +* Now eplusr can utilize the CSV output for report data extraction. Benefiting from the fantastic `data.table::fread`, this approach can be as 3~10X faster compared to the SQLite approach. eplusr will still use the SQLite if the CSV output is not available. @@ -209,7 +209,7 @@ value-relation extraction. It can be used to specify how to handle class-name-references. Class name references refer to references in like field `Component 1 Object Type` in `Branch` objects. Their value refers to - other many class names of objects, instaed of refering to specific field + other many class names of objects, instaed of referring to specific field values. There are 3 options in total, i.e. `"none"`, `"both"` and `"all"`, with `"both"` being the default. @@ -254,7 +254,7 @@ ## Bug fixes -* Fix the bug caused by `ExpandObjects` exectuable that causes `run_idf` fails +* Fix the bug caused by `ExpandObjects` executable that causes `run_idf` fails when running in parallel (#130) * `Idf$insert()` now will remove all duplicated objects in input (#219). * Fix the bug in `install_eplus()` on Windows (#230) @@ -405,7 +405,7 @@ install_eplus(8.8, local = TRUE, dir = "~/MyPrograms") ``` Please see `?install_eplus` for details. -* All documentation in R6 classes have been update thanks to roxyten2 R6 support (#156). +* All documentation in R6 classes have been update thanks to roxygen2 R6 support (#156). * Deprecated methods in each class have all been remove (#156). * New parameter `case` has been added in `EplusSql$tabular_data()`. Similar like `case` parameter in diff --git a/R/geom.R b/R/geom.R index ab818bba2..d64ba40a8 100644 --- a/R/geom.R +++ b/R/geom.R @@ -334,7 +334,7 @@ IdfGeometry <- R6Class("IdfGeometry", cloneable = FALSE, #' #' * `"surface_type"`: Default. Render the model by surface type model. #' Walls, roofs, windows, doors, floors, and shading surfaces will - #' have unqiue colors. + #' have unique colors. #' * `"boundary"`: Render the model by outside boundary condition. Only #' surfaces that have boundary conditions will be rendered with a #' color. All other surfaces will be white. diff --git a/R/idd.R b/R/idd.R index 132847224..5117b230e 100644 --- a/R/idd.R +++ b/R/idd.R @@ -305,7 +305,7 @@ Idd <- R6::R6Class(classname = "Idd", cloneable = FALSE, lock_objects = FALSE, #' Get the indices of specified classes #' #' @details - #' `$class_index()` returns the indices of specifed classes in + #' `$class_index()` returns the indices of specified classes in #' current `Idd`. A class index is just an integer indicating its #' appearance order in the `Idd`. #' diff --git a/R/idf.R b/R/idf.R index 7979c63ad..602b1a0f6 100644 --- a/R/idf.R +++ b/R/idf.R @@ -785,7 +785,7 @@ Idf <- R6::R6Class(classname = "Idf", lock_objects = FALSE, #' @param class_ref Specify how to handle class-name-references. Class #' name references refer to references in like field `Component 1 #' Object Type` in `Branch` objects. Their value refers to other - #' many class names of objects, instaed of refering to specific + #' many class names of objects, instaed of referring to specific #' field values. There are 3 options in total, i.e. `"none"`, #' `"both"` and `"all"`, with `"both"` being the default. #' * `"none"`: just ignore class-name-references. It is a reasonable @@ -1108,7 +1108,7 @@ Idf <- R6::R6Class(classname = "Idf", lock_objects = FALSE, #' `=`. The main difference is that, unlike `=`, the left hand side of #' `:=` should be a valid class name in current `Idf` object. It will #' set the field of all objects in specified class to specified value. - #' * `.(object, object) := list(field = value)`: Simimar like above, but + #' * `.(object, object) := list(field = value)`: Similar like above, but #' note the use of `.()` in the left hand side. You can put multiple #' object ID or names in `.()`. It will set the field of all specified #' objects to specified value. @@ -2517,7 +2517,7 @@ Idf <- R6::R6Class(classname = "Idf", lock_objects = FALSE, #' #' * `"surface_type"`: Default. Render the model by surface type #' model. Walls, roofs, windows, doors, floors, and shading - #' surfaces will have unqiue colors. + #' surfaces will have unique colors. #' * `"boundary"`: Render the model by outside boundary condition. #' Only surfaces that have boundary conditions will be rendered #' with a color. All other surfaces will be white. @@ -2533,7 +2533,7 @@ Idf <- R6::R6Class(classname = "Idf", lock_objects = FALSE, #' @param wireframe If `TRUE`, the wireframe of each surface will be #' shown. Default: `TRUE`. #' - #' @param x_ray If `TRUE`, all surfaces wll be rendered translucently. + #' @param x_ray If `TRUE`, all surfaces will be rendered translucently. #' Default: `FALSE`. #' #' @return An [IdfViewer] object diff --git a/R/idfobj.R b/R/idfobj.R index 132224525..665933dca 100644 --- a/R/idfobj.R +++ b/R/idfobj.R @@ -778,7 +778,7 @@ IdfObject <- R6::R6Class(classname = "IdfObject", lock_objects = FALSE, #' @param class_ref Specify how to handle class-name-references. Class #' name references refer to references in like field `Component 1 #' Object Type` in `Branch` objects. Their value refers to other - #' many class names of objects, instaed of refering to specific + #' many class names of objects, instaed of referring to specific #' field values. There are 3 options in total, i.e. `"none"`, #' `"both"` and `"all"`, with `"both"` being the default. #' * `"none"`: just ignore class-name-references. It is a reasonable @@ -852,7 +852,7 @@ IdfObject <- R6::R6Class(classname = "IdfObject", lock_objects = FALSE, #' @param class_ref Specify how to handle class-name-references. Class #' name references refer to references in like field `Component 1 #' Object Type` in `Branch` objects. Their value refers to other - #' many class names of objects, instaed of refering to specific + #' many class names of objects, instaed of referring to specific #' field values. There are 3 options in total, i.e. `"none"`, #' `"both"` and `"all"`, with `"both"` being the default. #' * `"none"`: just ignore class-name-references. It is a reasonable @@ -917,7 +917,7 @@ IdfObject <- R6::R6Class(classname = "IdfObject", lock_objects = FALSE, #' @param class_ref Specify how to handle class-name-references. Class #' name references refer to references in like field `Component 1 #' Object Type` in `Branch` objects. Their value refers to other - #' many class names of objects, instaed of refering to specific + #' many class names of objects, instaed of referring to specific #' field values. There are 3 options in total, i.e. `"none"`, #' `"both"` and `"all"`, with `"both"` being the default. #' * `"none"`: just ignore class-name-references. It is a reasonable @@ -1026,7 +1026,7 @@ IdfObject <- R6::R6Class(classname = "IdfObject", lock_objects = FALSE, #' @param class_ref Specify how to handle class-name-references. Class #' name references refer to references in like field `Component 1 #' Object Type` in `Branch` objects. Their value refers to other - #' many class names of objects, instaed of refering to specific + #' many class names of objects, instaed of referring to specific #' field values. There are 3 options in total, i.e. `"none"`, #' `"both"` and `"all"`, with `"both"` being the default. #' * `"none"`: just ignore class-name-references. It is a reasonable @@ -1089,7 +1089,7 @@ IdfObject <- R6::R6Class(classname = "IdfObject", lock_objects = FALSE, #' @param class_ref Specify how to handle class-name-references. Class #' name references refer to references in like field `Component 1 #' Object Type` in `Branch` objects. Their value refers to other - #' many class names of objects, instaed of refering to specific + #' many class names of objects, instaed of referring to specific #' field values. There are 3 options in total, i.e. `"none"`, #' `"both"` and `"all"`, with `"both"` being the default. #' * `"none"`: just ignore class-name-references. It is a reasonable diff --git a/R/impl-idf.R b/R/impl-idf.R index 71d599d54..4195ca246 100644 --- a/R/impl-idf.R +++ b/R/impl-idf.R @@ -1970,7 +1970,7 @@ match_idd_field <- function (idd_env, dt_field) { #' Default: `FALSE`. #' #' @param .strict If `TRUE`, make sure all input objects come from the same -#' verion as that from `idf_env`. Default: `TRUE`. +#' version as that from `idf_env`. Default: `TRUE`. #' #' @return A named list of 3 [data.table::data.table()]: `meta`, `object` and #' `value`. diff --git a/R/param.R b/R/param.R index f6f19edae..0d9b29fb3 100644 --- a/R/param.R +++ b/R/param.R @@ -161,7 +161,7 @@ ParametricJob <- R6::R6Class(classname = "ParametricJob", cloneable = FALSE, #' @details #' `$apply_measure()` allows to apply a measure to an [Idf] and creates #' parametric models for analysis. Basically, a measure is just a - #' function that takes an [Idf] object and other arguments as input, and + #' function that takes an [Idf] object and other arguements as input, and #' returns a modified [Idf] object as output. Use `...` to supply #' different arguments, **except for the first `Idf` argument**, to that #' measure. Under the hook, [base::mapply()] is used to create multiple diff --git a/R/run.R b/R/run.R index f39d42b7e..95984748b 100644 --- a/R/run.R +++ b/R/run.R @@ -164,7 +164,7 @@ clean_wd <- function (path) { #' #' | No. | Column | Type | Description | #' | ---: | ----- | ----- | ----- | -#' | 1 | `index` | `integer` | Index of simuation | +#' | 1 | `index` | `integer` | Index of simulation | #' | 2 | `status` | `character` | Simulation status | #' | 3 | `idf` | `character` | Full path of input IDF file | #' | 4 | `epw` | `character` | Full path of input EPW file. `NA` for design-day-only simulation | diff --git a/R/viewer.R b/R/viewer.R index db26cc9e4..4453ca3a1 100644 --- a/R/viewer.R +++ b/R/viewer.R @@ -362,7 +362,7 @@ IdfViewer <- R6Class("IdfViewer", cloneable = FALSE, #' #' * `"surface_type"`: Default. Render the model by surface type #' model. Walls, roofs, windows, doors, floors, and shading - #' surfaces will have unqiue colors. + #' surfaces will have unique colors. #' * `"boundary"`: Render the model by outside boundary condition. #' Only surfaces that have boundary conditions will be rendered #' with a color. All other surfaces will be white. diff --git a/README.Rmd b/README.Rmd index c570b6ecb..de4b51d6f 100644 --- a/README.Rmd +++ b/README.Rmd @@ -163,7 +163,7 @@ Please see these vignettes and articles about {eplusr} * [Introduction to eplusr](https://hongyuanjia.github.io/eplusr/articles/eplusr.html) * [Run simulation and data exploration](https://hongyuanjia.github.io/eplusr/articles/job.html) -* [Rarametric simulations](https://hongyuanjia.github.io/eplusr/articles/param.html) +* [Parametric simulations](https://hongyuanjia.github.io/eplusr/articles/param.html) * [Update IDF version](https://hongyuanjia.github.io/eplusr/articles/transition.html) * [Work with weather files](https://hongyuanjia.github.io/eplusr/articles/epw.html) * [Work with `Schedule:Compact` objects](https://hongyuanjia.github.io/eplusr/articles/schedule.html) diff --git a/README.md b/README.md index edb60505d..4dd515bbe 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ Please see these vignettes and articles about {eplusr} eplusr](https://hongyuanjia.github.io/eplusr/articles/eplusr.html) - [Run simulation and data exploration](https://hongyuanjia.github.io/eplusr/articles/job.html) - - [Rarametric + - [Parametric simulations](https://hongyuanjia.github.io/eplusr/articles/param.html) - [Update IDF version](https://hongyuanjia.github.io/eplusr/articles/transition.html) diff --git a/cran-comments.md b/cran-comments.md index a7abb3b83..25240b856 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,13 +1,12 @@ -# Version 0.13.0 +# Version 0.14.0 ## Resubmission ### Test environments -* local Manjaro Linux 18.0.4 install, R 3.6.1 -* Windows (on appveyor-ci), R release -* Ubuntu 14.04 (on travis-ci), R release and devel -* OS X (on travis-ci), R release +* Windows (on local and GitHub Actions), R release +* Ubuntu 20.04 (on GitHub Actions), R release +* macOS (on GitHub Actions), R release ### R CMD check results diff --git a/man/Idd.Rd b/man/Idd.Rd index 6c2219e5f..7bf40edc7 100644 --- a/man/Idd.Rd +++ b/man/Idd.Rd @@ -680,7 +680,7 @@ names by the group they belong to. Default: \code{FALSE}.} \if{html}{\out{}} } \subsection{Details}{ -\verb{$class_index()} returns the indices of specifed classes in +\verb{$class_index()} returns the indices of specified classes in current \code{Idd}. A class index is just an integer indicating its appearance order in the \code{Idd}. } diff --git a/man/Idf.Rd b/man/Idf.Rd index 72f7438c9..15aab8cbf 100644 --- a/man/Idf.Rd +++ b/man/Idf.Rd @@ -1869,7 +1869,7 @@ relations with other objects are returned. Default: \code{FALSE}.} \item{\code{class_ref}}{Specify how to handle class-name-references. Class name references refer to references in like field \verb{Component 1 Object Type} in \code{Branch} objects. Their value refers to other -many class names of objects, instaed of refering to specific +many class names of objects, instaed of referring to specific field values. There are 3 options in total, i.e. \code{"none"}, \code{"both"} and \code{"all"}, with \code{"both"} being the default. * \code{"none"}: just ignore class-name-references. It is a reasonable @@ -2323,7 +2323,7 @@ There is two special syntax in \verb{$set()}, which is inspired by the \code{=}. The main difference is that, unlike \code{=}, the left hand side of \verb{:=} should be a valid class name in current \code{Idf} object. It will set the field of all objects in specified class to specified value. -\item \code{.(object, object) := list(field = value)}: Simimar like above, but +\item \code{.(object, object) := list(field = value)}: Similar like above, but note the use of \code{.()} in the left hand side. You can put multiple object ID or names in \code{.()}. It will set the field of all specified objects to specified value. @@ -4090,7 +4090,7 @@ geometry. Possible values are: \itemize{ \item \code{"surface_type"}: Default. Render the model by surface type model. Walls, roofs, windows, doors, floors, and shading -surfaces will have unqiue colors. +surfaces will have unique colors. \item \code{"boundary"}: Render the model by outside boundary condition. Only surfaces that have boundary conditions will be rendered with a color. All other surfaces will be white. @@ -4104,7 +4104,7 @@ inside face will be rendered as red. \item{\code{wireframe}}{If \code{TRUE}, the wireframe of each surface will be shown. Default: \code{TRUE}.} -\item{\code{x_ray}}{If \code{TRUE}, all surfaces wll be rendered translucently. +\item{\code{x_ray}}{If \code{TRUE}, all surfaces will be rendered translucently. Default: \code{FALSE}.} \item{\code{axis}}{If \code{TRUE}, the X, Y and Z axes will be drawn at the diff --git a/man/IdfGeometry.Rd b/man/IdfGeometry.Rd index ad76e2e6a..92de4fff8 100644 --- a/man/IdfGeometry.Rd +++ b/man/IdfGeometry.Rd @@ -547,7 +547,7 @@ geometry. Possible values are: \itemize{ \item \code{"surface_type"}: Default. Render the model by surface type model. Walls, roofs, windows, doors, floors, and shading surfaces will -have unqiue colors. +have unique colors. \item \code{"boundary"}: Render the model by outside boundary condition. Only surfaces that have boundary conditions will be rendered with a color. All other surfaces will be white. diff --git a/man/IdfObject.Rd b/man/IdfObject.Rd index 6cb077636..8147da013 100644 --- a/man/IdfObject.Rd +++ b/man/IdfObject.Rd @@ -1308,7 +1308,7 @@ returned. Default: \code{FALSE}.} \item{\code{class_ref}}{Specify how to handle class-name-references. Class name references refer to references in like field \verb{Component 1 Object Type} in \code{Branch} objects. Their value refers to other -many class names of objects, instaed of refering to specific +many class names of objects, instaed of referring to specific field values. There are 3 options in total, i.e. \code{"none"}, \code{"both"} and \code{"all"}, with \code{"both"} being the default. * \code{"none"}: just ignore class-name-references. It is a reasonable @@ -1423,7 +1423,7 @@ all possible recursive relations are returned. Default: \code{0}.} \item{\code{class_ref}}{Specify how to handle class-name-references. Class name references refer to references in like field \verb{Component 1 Object Type} in \code{Branch} objects. Their value refers to other -many class names of objects, instaed of refering to specific +many class names of objects, instaed of referring to specific field values. There are 3 options in total, i.e. \code{"none"}, \code{"both"} and \code{"all"}, with \code{"both"} being the default. * \code{"none"}: just ignore class-name-references. It is a reasonable @@ -1509,7 +1509,7 @@ all possible recursive relations are returned. Default: \code{0}.} \item{\code{class_ref}}{Specify how to handle class-name-references. Class name references refer to references in like field \verb{Component 1 Object Type} in \code{Branch} objects. Their value refers to other -many class names of objects, instaed of refering to specific +many class names of objects, instaed of referring to specific field values. There are 3 options in total, i.e. \code{"none"}, \code{"both"} and \code{"all"}, with \code{"both"} being the default. * \code{"none"}: just ignore class-name-references. It is a reasonable @@ -1660,7 +1660,7 @@ is also referred by a surface named \code{surf}. Default: \code{FALSE}.} \item{\code{class_ref}}{Specify how to handle class-name-references. Class name references refer to references in like field \verb{Component 1 Object Type} in \code{Branch} objects. Their value refers to other -many class names of objects, instaed of refering to specific +many class names of objects, instaed of referring to specific field values. There are 3 options in total, i.e. \code{"none"}, \code{"both"} and \code{"all"}, with \code{"both"} being the default. * \code{"none"}: just ignore class-name-references. It is a reasonable @@ -1744,7 +1744,7 @@ is also referred by a surface named \code{surf}. Default: \code{FALSE}.} \item{\code{class_ref}}{Specify how to handle class-name-references. Class name references refer to references in like field \verb{Component 1 Object Type} in \code{Branch} objects. Their value refers to other -many class names of objects, instaed of refering to specific +many class names of objects, instaed of referring to specific field values. There are 3 options in total, i.e. \code{"none"}, \code{"both"} and \code{"all"}, with \code{"both"} being the default. * \code{"none"}: just ignore class-name-references. It is a reasonable diff --git a/man/IdfViewer.Rd b/man/IdfViewer.Rd index 331410e7c..d62a76dd1 100644 --- a/man/IdfViewer.Rd +++ b/man/IdfViewer.Rd @@ -684,7 +684,7 @@ of: \itemize{ \item \code{"surface_type"}: Default. Render the model by surface type model. Walls, roofs, windows, doors, floors, and shading -surfaces will have unqiue colors. +surfaces will have unique colors. \item \code{"boundary"}: Render the model by outside boundary condition. Only surfaces that have boundary conditions will be rendered with a color. All other surfaces will be white. diff --git a/man/ParametricJob.Rd b/man/ParametricJob.Rd index 20b4e4171..d44768448 100644 --- a/man/ParametricJob.Rd +++ b/man/ParametricJob.Rd @@ -413,7 +413,7 @@ If \code{NULL}, the new \code{Idf}s will be named in format \subsection{Details}{ \verb{$apply_measure()} allows to apply a measure to an \link{Idf} and creates parametric models for analysis. Basically, a measure is just a -function that takes an \link{Idf} object and other arguments as input, and +function that takes an \link{Idf} object and other arguements as input, and returns a modified \link{Idf} object as output. Use \code{...} to supply different arguments, \strong{except for the first \code{Idf} argument}, to that measure. Under the hook, \code{\link[base:mapply]{base::mapply()}} is used to create multiple diff --git a/man/expand_idf_dots_object.Rd b/man/expand_idf_dots_object.Rd index 491c628d7..fa13fcfb2 100644 --- a/man/expand_idf_dots_object.Rd +++ b/man/expand_idf_dots_object.Rd @@ -28,7 +28,7 @@ input. If \code{FALSE}, duplicates are kept. If \code{NULL}, duplicates are removed. Default: \code{TRUE}.} \item{.strict}{If \code{TRUE}, make sure all input objects come from the same -verion as that from \code{idf_env}. Default: \code{TRUE}.} +version as that from \code{idf_env}. Default: \code{TRUE}.} \item{.complete}{If \code{TRUE}, make sure the returned field number meets the \verb{\\min-fields} requirement. Default: \code{TRUE}} diff --git a/man/run_model.Rd b/man/run_model.Rd index 4d4702062..9b3223b12 100644 --- a/man/run_model.Rd +++ b/man/run_model.Rd @@ -91,7 +91,7 @@ should have the same length as \code{model}.} \item For \code{rum_multi()}, if \code{wait} is TRUE, a \link[data.table:data.table]{data.table} of 12 columns:\tabular{rlll}{ No. \tab Column \tab Type \tab Description \cr - 1 \tab \code{index} \tab \code{integer} \tab Index of simuation \cr + 1 \tab \code{index} \tab \code{integer} \tab Index of simulation \cr 2 \tab \code{status} \tab \code{character} \tab Simulation status \cr 3 \tab \code{idf} \tab \code{character} \tab Full path of input IDF file \cr 4 \tab \code{epw} \tab \code{character} \tab Full path of input EPW file. \code{NA} for design-day-only simulation \cr diff --git a/revdep/README.md b/revdep/README.md index 7601fc76e..bcf3dcb81 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -2,47 +2,36 @@ |field |value | |:--------|:------------------------------| -|version |R version 3.6.2 (2019-12-12) | +|version |R version 4.0.2 (2020-06-22) | |os |Windows 10 x64 | |system |x86_64, mingw32 | -|ui |RStudio | -|language |(EN) | +|ui |Rgui | +|language |en | |collate |English_United States.1252 | |ctype |Chinese (Simplified)_China.936 | |tz |Asia/Kuala_Lumpur | -|date |2020-08-27 | +|date |2020-12-19 | # Dependencies -|package |old |new |Δ | -|:----------------|:------|:-----------|:--| -|eplusr |0.12.0 |0.12.0.9000 |* | -|backports |NA |1.1.7 |* | -|bit |NA |4.0.4 |* | -|bit64 |NA |4.0.2 |* | -|crosstalk |NA |1.1.0.1 |* | -|data.table |NA |1.13.0 |* | -|decido |NA |0.3.0 |* | -|digest |NA |0.6.25 |* | -|ellipsis |NA |0.3.1 |* | -|htmltools |NA |0.5.0 |* | -|httpuv |NA |1.5.4 |* | -|jsonlite |NA |1.7.0 |* | -|knitr |NA |1.29 |* | -|later |NA |1.1.0.1 |* | -|manipulateWidget |NA |0.10.1 |* | -|mime |NA |0.9 |* | -|processx |NA |3.4.3 |* | -|promises |NA |1.1.1 |* | -|ps |NA |1.3.4 |* | -|Rcpp |NA |1.0.5 |* | -|rgl |NA |0.100.54 |* | -|shiny |NA |1.5.0 |* | -|stringi |NA |1.4.6 |* | -|units |NA |0.6-7 |* | -|withr |NA |2.2.0 |* | -|xfun |NA |0.16 |* | -|yaml |NA |2.2.1 |* | +|package |old |new |Δ | +|:----------|:------|:-----------|:--| +|eplusr |0.13.0 |0.13.0.9000 |* | +|backports |NA |1.2.1 |* | +|bit64 |NA |4.0.5 |* | +|callr |NA |3.5.1 |* | +|cli |NA |2.2.0 |* | +|data.table |NA |1.13.4 |* | +|digest |NA |0.6.27 |* | +|generics |NA |0.1.0 |* | +|lubridate |NA |1.7.9.2 |* | +|processx |NA |3.4.5 |* | +|ps |NA |1.5.0 |* | +|R6 |NA |2.5.0 |* | +|rlang |NA |0.4.9 |* | +|RSQLite |NA |2.2.1 |* | +|stringi |NA |1.5.3 |* | +|vctrs |NA |0.3.6 |* | # Revdeps diff --git a/revdep/cran.md b/revdep/cran.md new file mode 100644 index 000000000..782ef684c --- /dev/null +++ b/revdep/cran.md @@ -0,0 +1,7 @@ +## revdepcheck results + +We checked 1 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. + + * We saw 0 new problems + * We failed to check 0 packages + diff --git a/tic.R b/tic.R deleted file mode 100644 index 71b24919b..000000000 --- a/tic.R +++ /dev/null @@ -1,67 +0,0 @@ -# RGL -get_stage("before_install") %>% - add_code_step(options(rgl.useNULL = TRUE)) %>% - add_code_step(system("/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x24")) - -get_stage("before_script") %>% - add_code_step(system("export DISPLAY=:99.0")) %>% - add_code_step(system("sh -e /etc/init.d/xvfb start")) %>% - add_code_step(system("sleep 3")) - -# R CMD Check -## OS specific build and check arguments -## get as cran from environment -args <- if (Sys.getenv("NOT_CRAN", FALSE)) c("--as-cran") else c() -build_args <- c("--force") - -# do not build manual for appveyor -# also fix LaTeX Error: File `inconsolata.sty' not found on osx -# https://github.com/travis-ci/travis-ci/issues/7875 -if (.Platform$OS.type == "windows" || Sys.getenv("TRAVIS_OS_NAME") == "osx") args <- c("--no-manual", args) - -do_package_checks(args = args, build_args = build_args, codecov = FALSE) - -# remove check directory -get_stage("before_deploy") %>% - add_code_step(unlink("check", TRUE, TRUE)) - -# pkgdown -# make sure to clean site to rebuild everything -if (ci_get_branch() == "master" && Sys.getenv("TRAVIS_OS_NAME") == "linux" && Sys.getenv("TRAVIS_R_VERSION_STRING") == "release") { - get_stage("before_deploy") %>% - add_step(step_setup_ssh()) - - get_stage("deploy") %>% - # a hack before https://github.com/r-lib/pkgdown/issues/1173 is fixed - add_code_step({ - f <- list.files("man", "^[A-Z].*\\.Rd", full.names = TRUE) - update_ref <- function (Rd) { - if (!length(Rd)) return(NULL) - l <- data.table::fread(Rd, sep = NULL, header = FALSE, col.names = "string") - ln <- l[stringi::stri_detect_fixed(string, '\\item \\out{% - add_code_step(Sys.setenv("R_REMOTES_UPGRADE" = "never")) %>% - add_step(step_build_pkgdown(document = FALSE, run_dont_run = TRUE)) - - get_stage("deploy") %>% - add_step(step_push_deploy(path = "docs", branch = "gh-pages")) -} - -# codecov -if (Sys.getenv("TRAVIS_OS_NAME") == "linux" && Sys.getenv("TRAVIS_R_VERSION_STRING") == "devel") { - # Ref: https://github.com/HenrikBengtsson/doFuture/issues/18 - get_stage("after_success") %>% add_code_step(covr::codecov(quiet = FALSE)) -} - diff --git a/vignettes/param.Rmd b/vignettes/param.Rmd index acb8dea0a..de29ebc38 100644 --- a/vignettes/param.Rmd +++ b/vignettes/param.Rmd @@ -99,7 +99,7 @@ making it possible to leverage other modules in the framework and apply statistical methods and libraries existing in R to generate design options. `set_lpd()` blow is a simple measure that modifies the LPD (Lighting Power -Densitiy), and `set_nightplug()` is a measure that modifies the off-work +Density), and `set_nightplug()` is a measure that modifies the off-work schedule values of plug loads by multiplying a specified reduction faction value.