From dbf5d270ac7e2beb64f03b8d181690aa633a9901 Mon Sep 17 00:00:00 2001 From: AzuleneG Date: Wed, 18 Sep 2024 16:43:34 +0800 Subject: [PATCH] 0.3.5 --- .Rbuildignore | 3 +++ CRAN-SUBMISSION | 3 +++ DESCRIPTION | 7 +++--- NEWS.md | 8 +++++-- R/DirectingOptiRounds.R | 2 +- R/FormOptiSCFConvergenceRoundTibble.R | 2 +- R/MultipleRoundOptiSCFIntegratedMonitor.R | 1 + R/MultipleRoundOptiSCFplotting.R | 1 + R/OptiConvergenceMonitor.R | 1 + R/OptiSCFConvergenceRoundMonitor.R | 1 + R/OptiSCFMonitorAsList.R | 2 +- R/OptiSCFMonitorAsWholeTibble.R | 2 +- R/SCFMonitorExample.R | 2 +- R/SingleRoundOptiSCFIntegratedMonitor.R | 1 + R/SingleSCFplotting.R | 1 + README.Rmd | 4 ++-- README.md | 4 ++-- cran-comments.md | 5 ++++ man/DirectingOptiRounds.Rd | 4 ++-- man/MultipleRoundOptiSCFIntegratedMonitor.Rd | 7 ++++-- man/MultipleRoundOptiSCFplotting.Rd | 13 ++++++---- man/OptiConvergenceMonitor.Rd | 3 +++ man/OptiSCFConvergenceRoundMonitor.Rd | 3 +++ man/SingleRoundOptiSCFIntegratedMonitor.Rd | 5 +++- man/SingleSCFplotting.Rd | 5 +++- revdep/.gitignore | 7 ++++++ revdep/README.md | 25 ++++++++++++++++++++ revdep/cran.md | 7 ++++++ revdep/failures.md | 1 + revdep/problems.md | 1 + 30 files changed, 107 insertions(+), 24 deletions(-) create mode 100644 CRAN-SUBMISSION create mode 100644 cran-comments.md create mode 100644 revdep/.gitignore create mode 100644 revdep/README.md create mode 100644 revdep/cran.md create mode 100644 revdep/failures.md create mode 100644 revdep/problems.md diff --git a/.Rbuildignore b/.Rbuildignore index 9274347..bfbdd42 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -4,3 +4,6 @@ ^README\.Rmd$ ^\.github$ ^codecov\.yml$ +^cran-comments\.md$ +^revdep$ +^CRAN-SUBMISSION$ diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION new file mode 100644 index 0000000..8fba7ce --- /dev/null +++ b/CRAN-SUBMISSION @@ -0,0 +1,3 @@ +Version: 0.3.4 +Date: 2024-07-28 00:17:35 UTC +SHA: fe7b689d67185647ced81f0ffe43174c58b9867f diff --git a/DESCRIPTION b/DESCRIPTION index 2145756..7df22ae 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,10 +1,11 @@ Package: SCFMonitor -Title: Clear monitor and graphing software processing Gaussian .log file -Version: 0.3.3.1000 +Title: Clear Monitor and Graphing Software Processing Gaussian .log File +Version: 0.3.5 Authors@R: person("Pengjun", "Guo", , "pengjun.guo@outlook.com", role = c("aut", "cre"), comment = c(ORCID = "0009-0007-2717-0519")) -Description: SCFMonitor enables Gaussian the quantum chemistry calculation software users to easily read the Gaussian .log files and monitor the SCF convergence and geometry optimization process with little effort and clear, beautiful and clean outputs. It can generate graphs using tidyverse to let users check SCF convergence and geometry optimization process real time. The software supports processing .log files remotely using with rbase::url(). This software is a suitcase for saving time and energy for the researchers, supporting multiple versions of Gaussian. +Description: Self-Consistent Field(SCF) calculation method is one of the most important steps in the calculation methods of quantum chemistry. Ehrenreich, H., & Cohen, M. H. (1959). However, the most prevailing software in this area, 'Gaussian''s SCF convergence process is hard to monitor, especially while the job is still running, causing researchers difficulty in knowing whether the oscillation has started or not, wasting time and energy on useless configurations or abandoning the jobs that can actually work. M.J. Frisch, G.W. Trucks, H.B. Schlegel et al. (2016). 'SCFMonitor' enables 'Gaussian' quantum chemistry calculation software users to easily read the 'Gaussian' .log files and monitor the SCF convergence and geometry optimization process with little effort and clear, beautiful, and clean outputs. It can generate graphs using 'tidyverse' to let users check SCF convergence and geometry optimization processes in real-time. The software supports processing .log files remotely using with rbase::url(). This software is a suitcase for saving time and energy for the researchers, supporting multiple versions of 'Gaussian'. +Maintainer: Pengjun Guo License: MIT + file LICENSE Encoding: UTF-8 Roxygen: list(markdown = TRUE) diff --git a/NEWS.md b/NEWS.md index a8e1da7..d82a23f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ -# SCFMonitor (development version) +# SCFMonitor 0.3.5 -* Initial CRAN submission. +This is a resubmission. In this version I have: + +* Changed the documentation of the functions in which return value is not in presence. + +* Add citation in the DESCRIPTION. \ No newline at end of file diff --git a/R/DirectingOptiRounds.R b/R/DirectingOptiRounds.R index c7f33c5..df04f16 100644 --- a/R/DirectingOptiRounds.R +++ b/R/DirectingOptiRounds.R @@ -3,7 +3,7 @@ #' This function is a internal function that directs the optimization round of a SCF convergence round. This helps SCFMonitor devide the SCF rounds to different sections that each refers to an optimization cycle. #' @param Pending A integer refering to the row of the directed SCF convergence cycle is in. #' @param index A tibble including all the row number -#' @return A integer directing the Optimization round of that SCF convergence round is in. +#' @returns A integer directing the Optimization round of that SCF convergence round is in. #' @export #' @examples #' library(tibble) diff --git a/R/FormOptiSCFConvergenceRoundTibble.R b/R/FormOptiSCFConvergenceRoundTibble.R index 5269b81..a097163 100644 --- a/R/FormOptiSCFConvergenceRoundTibble.R +++ b/R/FormOptiSCFConvergenceRoundTibble.R @@ -2,7 +2,7 @@ #' #' This function outputs a tibble showing each the number of SCF rounds applied in each optimization cycle and outputs it as a tibble. #' @param directory A string vector describing the directory of the Gaussian log file. -#' @return A tibble countain two columns, describing each optimization rounds and the number of SCF rounds it undergoes until convergence. +#' @returns A tibble countain two columns, describing each optimization rounds and the number of SCF rounds it undergoes until convergence. #' @importFrom readr read_file #' @importFrom stringr str_split str_detect str_trim #' @importFrom tidyselect starts_with diff --git a/R/MultipleRoundOptiSCFIntegratedMonitor.R b/R/MultipleRoundOptiSCFIntegratedMonitor.R index c78cde1..30b52d3 100644 --- a/R/MultipleRoundOptiSCFIntegratedMonitor.R +++ b/R/MultipleRoundOptiSCFIntegratedMonitor.R @@ -3,6 +3,7 @@ #' This function reads a log file automatically and shows the SCF convergence process of it by generating line plots #' @param directory A string vector describing the directory of the Gaussian log file. #' @param top_rounds A numeric vector deciding which SCF convergence process will be shown in the diagram. etc. input 5 for the newest 5 rounds of optimization. Enter -1 for showing all the processes. +#' @returns No return value, called for side effects #' @export #' @examples #' diff --git a/R/MultipleRoundOptiSCFplotting.R b/R/MultipleRoundOptiSCFplotting.R index 3c9a508..0ab559b 100644 --- a/R/MultipleRoundOptiSCFplotting.R +++ b/R/MultipleRoundOptiSCFplotting.R @@ -5,6 +5,7 @@ #' @param SCFconver A numeric vector showing the SCF convergence requirement read from the gaussian .log file. #' @param BOT A numeric vector describing the starting optimization round for plotting #' @param TOP A numeric vector describing the ending optimization round for plotting +#' @returns No return value, called for side effects #' @importFrom tidyr pivot_longer #' @importFrom dplyr mutate filter #' @importFrom stringr str_replace diff --git a/R/OptiConvergenceMonitor.R b/R/OptiConvergenceMonitor.R index a67dc6d..e09b416 100644 --- a/R/OptiConvergenceMonitor.R +++ b/R/OptiConvergenceMonitor.R @@ -2,6 +2,7 @@ #' #' This function reads a log file automatically and shows the optimization convergence process of it by generating line plots #' @param directory A string vector describing the directory of the Gaussian log file. +#' @returns No return value, called for side effects #' @importFrom readr read_file #' @importFrom stringr str_split str_detect str_trim str_replace str_sub #' @importFrom tidyselect starts_with diff --git a/R/OptiSCFConvergenceRoundMonitor.R b/R/OptiSCFConvergenceRoundMonitor.R index 8c8557e..83f13f1 100644 --- a/R/OptiSCFConvergenceRoundMonitor.R +++ b/R/OptiSCFConvergenceRoundMonitor.R @@ -2,6 +2,7 @@ #' #' This function reads a log file automatically and generate a plot showing the steps it takes to reach SCF convergence for each optimization process. #' @param directory A string vector describing the directory of the Gaussian log file. +#' @returns No return value, called for side effects #' @importFrom ggplot2 ggplot aes geom_line geom_smooth theme_minimal #' @export #' @examples diff --git a/R/OptiSCFMonitorAsList.R b/R/OptiSCFMonitorAsList.R index 6cf747e..5451fde 100644 --- a/R/OptiSCFMonitorAsList.R +++ b/R/OptiSCFMonitorAsList.R @@ -2,7 +2,7 @@ #' #' This function reads a Gaussian .log file and outputs a list of tibbles, each of which is the SCF Data of a optimization step. #' @param directory A string vector describing the directory of the Gaussian log file. -#' @return A list of lists. First lists is a list of tibble, each element in the list refers to a tibble recording the SCF Data of a optimization step. The second list only have one element that is a numeric vector refering to the SCF convergence requirement read from log file. +#' @returns A list of lists. First lists is a list of tibble, each element in the list refers to a tibble recording the SCF Data of a optimization step. The second list only have one element that is a numeric vector refering to the SCF convergence requirement read from log file. #' @importFrom readr read_file #' @importFrom stringr str_split str_detect str_trim str_replace str_extract #' @importFrom tidyselect starts_with diff --git a/R/OptiSCFMonitorAsWholeTibble.R b/R/OptiSCFMonitorAsWholeTibble.R index 225b746..bcff445 100644 --- a/R/OptiSCFMonitorAsWholeTibble.R +++ b/R/OptiSCFMonitorAsWholeTibble.R @@ -2,7 +2,7 @@ #' #' This function outputs a tibble containing the data of each rounds of SCF calculation labeled with the optimization round it's in (if it's a optimization job, otherwise it will be only 1) #' @param directory A string vector describing the directory of the Gaussian log file. -#' @return A list containing two elements. The first one is a tibble containing the SCF data of every rounds labeled with the optimization steps they are in. The second element is a numeric vector that refers to the SCF convergence standard. +#' @returns A list containing two elements. The first one is a tibble containing the SCF data of every rounds labeled with the optimization steps they are in. The second element is a numeric vector that refers to the SCF convergence standard. #' @importFrom readr read_file #' @importFrom stringr str_split str_detect str_extract str_replace str_trim #' @importFrom utils head diff --git a/R/SCFMonitorExample.R b/R/SCFMonitorExample.R index 4b11b7f..cac0b52 100644 --- a/R/SCFMonitorExample.R +++ b/R/SCFMonitorExample.R @@ -1,7 +1,7 @@ #' Acquire Path to SCFMonitor Example data #' #' Makes the TestData.log, a log file generated by Gaussian 16 for testing the package, easy to access. -#' @return A string vector showing the path to +#' @returns A string vector showing the path to #' @export #' @examples #' FormOptiSCFConvergenceRoundTibble(SCFMonitorExample()) diff --git a/R/SingleRoundOptiSCFIntegratedMonitor.R b/R/SingleRoundOptiSCFIntegratedMonitor.R index baceffd..9504d6d 100644 --- a/R/SingleRoundOptiSCFIntegratedMonitor.R +++ b/R/SingleRoundOptiSCFIntegratedMonitor.R @@ -3,6 +3,7 @@ #' This function reads a log file automatically and shows the SCF convergence process of a single round of optimization by generating line plots #' @param directory A string vector describing the directory of the Gaussian log file. #' @param optiround A numeric vector deciding which SCF convergence process will be shown in the diagram. etc. input 5 for the 5th round of optimization. If it's not an optimization job than enter 1 for acquiring the only one. +#' @returns No return value, called for side effects #' @export #' @examples #' diff --git a/R/SingleSCFplotting.R b/R/SingleSCFplotting.R index a1a69a9..5f4e8fa 100644 --- a/R/SingleSCFplotting.R +++ b/R/SingleSCFplotting.R @@ -3,6 +3,7 @@ #' An internal function plots the generated single-round SCF convergence tibble #' @param SCFData The tibble generated by SingleRoundOptiSCFIntegratedMonitor() describing the SCF convergence process for single round of optimization(or other Gaussian job types). #' @param SCFconver A numeric vector showing the SCF convergence requirement read from the gaussian .log file. +#' @returns No return value, called for side effects #' @importFrom tidyr pivot_longer #' @importFrom dplyr mutate #' @importFrom stringr str_replace diff --git a/README.Rmd b/README.Rmd index 2635195..3d631d3 100644 --- a/README.Rmd +++ b/README.Rmd @@ -30,8 +30,8 @@ SCF monitor works for the `.log` files of the jobs that is still under calculati You can install the development version of SCFMonitor from [GitHub](https://github.com/) with: ``` r -# install.packages("devtools") -devtools::install_github("AzuleneG/SCFMonitor") +install.packages("SCFMonitor") +library(SCFMonitor) ``` ## Function and Example diff --git a/README.md b/README.md index c238f24..f8aa293 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ You can install the development version of SCFMonitor from [GitHub](https://github.com/) with: ``` r -# install.packages("devtools") -devtools::install_github("AzuleneG/SCFMonitor") +install.packages("SCFMonitor") +library(SCFMonitor) ``` ## Function and Example diff --git a/cran-comments.md b/cran-comments.md new file mode 100644 index 0000000..62c010f --- /dev/null +++ b/cran-comments.md @@ -0,0 +1,5 @@ +## R CMD check results + +0 errors | 0 warnings | 0 note + +* This is a new release. diff --git a/man/DirectingOptiRounds.Rd b/man/DirectingOptiRounds.Rd index 4c4959b..bdbde0f 100644 --- a/man/DirectingOptiRounds.Rd +++ b/man/DirectingOptiRounds.Rd @@ -20,7 +20,7 @@ This function is a internal function that directs the optimization round of a SC \examples{ library(tibble) -example_index<-tibble(rowid=c(1,30,130)) -DirectingOptiRounds(33,example_index) +example_index <- tibble(rowid = c(1, 30, 130)) +DirectingOptiRounds(33, example_index) } diff --git a/man/MultipleRoundOptiSCFIntegratedMonitor.Rd b/man/MultipleRoundOptiSCFIntegratedMonitor.Rd index b6e6ff1..8560a3b 100644 --- a/man/MultipleRoundOptiSCFIntegratedMonitor.Rd +++ b/man/MultipleRoundOptiSCFIntegratedMonitor.Rd @@ -8,12 +8,15 @@ \item{top_rounds}{A numeric vector deciding which SCF convergence process will be shown in the diagram. etc. input 5 for the newest 5 rounds of optimization. Enter -1 for showing all the processes.} } +\value{ +No return value, called for side effects +} \description{ This function reads a log file automatically and shows the SCF convergence process of it by generating line plots } \examples{ -MultipleRoundOptiSCFIntegratedMonitor(SCFMonitorExample(),-1) -MultipleRoundOptiSCFIntegratedMonitor(SCFMonitorExample(),5) +MultipleRoundOptiSCFIntegratedMonitor(SCFMonitorExample(), -1) +MultipleRoundOptiSCFIntegratedMonitor(SCFMonitorExample(), 5) } diff --git a/man/MultipleRoundOptiSCFplotting.Rd b/man/MultipleRoundOptiSCFplotting.Rd index 3d17f08..8bc70bd 100644 --- a/man/MultipleRoundOptiSCFplotting.Rd +++ b/man/MultipleRoundOptiSCFplotting.Rd @@ -12,6 +12,9 @@ \item{TOP}{A numeric vector describing the ending optimization round for plotting} } +\value{ +No return value, called for side effects +} \description{ An internal function plots the generated SCF convergence tibble } @@ -21,9 +24,11 @@ library(stringr) library(ggplot2) library(tidyr) -temp_dat = OptiSCFMonitorAsWholeTibble(SCFMonitorExample()) -MultipleRoundOptiSCFplotting(temp_dat[[1]], SCFconver = -log10(temp_dat[[2]]), -BOT = 10, -TOP = 15 ) +temp_dat <- OptiSCFMonitorAsWholeTibble(SCFMonitorExample()) +MultipleRoundOptiSCFplotting(temp_dat[[1]], + SCFconver = -log10(temp_dat[[2]]), + BOT = 10, + TOP = 15 +) } diff --git a/man/OptiConvergenceMonitor.Rd b/man/OptiConvergenceMonitor.Rd index a66c7bb..d686dbb 100644 --- a/man/OptiConvergenceMonitor.Rd +++ b/man/OptiConvergenceMonitor.Rd @@ -6,6 +6,9 @@ \arguments{ \item{directory}{A string vector describing the directory of the Gaussian log file.} } +\value{ +No return value, called for side effects +} \description{ This function reads a log file automatically and shows the optimization convergence process of it by generating line plots } diff --git a/man/OptiSCFConvergenceRoundMonitor.Rd b/man/OptiSCFConvergenceRoundMonitor.Rd index 81cb1ca..ab0065b 100644 --- a/man/OptiSCFConvergenceRoundMonitor.Rd +++ b/man/OptiSCFConvergenceRoundMonitor.Rd @@ -6,6 +6,9 @@ \arguments{ \item{directory}{A string vector describing the directory of the Gaussian log file.} } +\value{ +No return value, called for side effects +} \description{ This function reads a log file automatically and generate a plot showing the steps it takes to reach SCF convergence for each optimization process. } diff --git a/man/SingleRoundOptiSCFIntegratedMonitor.Rd b/man/SingleRoundOptiSCFIntegratedMonitor.Rd index e8aea32..897e5ba 100644 --- a/man/SingleRoundOptiSCFIntegratedMonitor.Rd +++ b/man/SingleRoundOptiSCFIntegratedMonitor.Rd @@ -11,11 +11,14 @@ SingleRoundOptiSCFIntegratedMonitor(directory, optiround) \item{optiround}{A numeric vector deciding which SCF convergence process will be shown in the diagram. etc. input 5 for the 5th round of optimization. If it's not an optimization job than enter 1 for acquiring the only one.} } +\value{ +No return value, called for side effects +} \description{ This function reads a log file automatically and shows the SCF convergence process of a single round of optimization by generating line plots } \examples{ -SingleRoundOptiSCFIntegratedMonitor(SCFMonitorExample(),5) +SingleRoundOptiSCFIntegratedMonitor(SCFMonitorExample(), 5) } diff --git a/man/SingleSCFplotting.Rd b/man/SingleSCFplotting.Rd index 029acf6..5a17fec 100644 --- a/man/SingleSCFplotting.Rd +++ b/man/SingleSCFplotting.Rd @@ -8,6 +8,9 @@ \item{SCFconver}{A numeric vector showing the SCF convergence requirement read from the gaussian .log file.} } +\value{ +No return value, called for side effects +} \description{ An internal function plots the generated single-round SCF convergence tibble } @@ -17,7 +20,7 @@ library(stringr) library(ggplot2) library(tidyr) -temp_dat = OptiSCFMonitorAsList(SCFMonitorExample()) +temp_dat <- OptiSCFMonitorAsList(SCFMonitorExample()) SingleSCFplotting(temp_dat[[1]][[5]], SCFconver = -log10(temp_dat[[2]])) } diff --git a/revdep/.gitignore b/revdep/.gitignore new file mode 100644 index 0000000..111ab32 --- /dev/null +++ b/revdep/.gitignore @@ -0,0 +1,7 @@ +checks +library +checks.noindex +library.noindex +cloud.noindex +data.sqlite +*.html diff --git a/revdep/README.md b/revdep/README.md new file mode 100644 index 0000000..b32a66c --- /dev/null +++ b/revdep/README.md @@ -0,0 +1,25 @@ +# Platform + +|field |value | +|:--------|:----------------------------------------| +|version |R version 4.4.1 (2024-06-14) | +|os |macOS Sonoma 14.2.1 | +|system |aarch64, darwin20 | +|ui |RStudio | +|language |(EN) | +|collate |en_US.UTF-8 | +|ctype |en_US.UTF-8 | +|tz |America/Los_Angeles | +|date |2024-07-27 | +|rstudio |2024.04.2+764 Chocolate Cosmos (desktop) | +|pandoc |NA | + +# Dependencies + +|package |old |new |Δ | +|:----------|:---|:----------|:--| +|SCFMonitor |NA |0.3.3.1000 |* | +|colorspace |NA |2.1-1 |* | + +# Revdeps + diff --git a/revdep/cran.md b/revdep/cran.md new file mode 100644 index 0000000..33114b6 --- /dev/null +++ b/revdep/cran.md @@ -0,0 +1,7 @@ +## revdepcheck results + +We checked 0 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/revdep/failures.md b/revdep/failures.md new file mode 100644 index 0000000..9a20736 --- /dev/null +++ b/revdep/failures.md @@ -0,0 +1 @@ +*Wow, no problems at all. :)* \ No newline at end of file diff --git a/revdep/problems.md b/revdep/problems.md new file mode 100644 index 0000000..9a20736 --- /dev/null +++ b/revdep/problems.md @@ -0,0 +1 @@ +*Wow, no problems at all. :)* \ No newline at end of file