diff --git a/cran-comments.md b/cran-comments.md index ee8b54b..91b8132 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Test environments * Local R installation: R 4.1.1 -* Ubuntu 20.04 (on GitHub Actions): R devel, release, oldrel +* Ubuntu (on GitHub Actions): R devel, release, oldrel * Windows (on GitHub Actions and win-builder): R devel, release, oldrel * MacOS (on GitHub Actions): R release diff --git a/revdep/README.md b/revdep/README.md index 4e59143..460532f 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -10,7 +10,7 @@ |collate |fr_FR.UTF-8 | |ctype |fr_FR.UTF-8 | |tz |Europe/Paris | -|date |2021-09-13 | +|date |2021-09-18 | # Dependencies diff --git a/vignettes/uml-1.png b/vignettes/uml-1.png index 3216dd1..5740aac 100644 Binary files a/vignettes/uml-1.png and b/vignettes/uml-1.png differ diff --git a/vignettes/uml.R b/vignettes/uml.R index e15ed39..17b5b75 100644 --- a/vignettes/uml.R +++ b/vignettes/uml.R @@ -5,12 +5,12 @@ nomnoml::nomnoml(" [arkhe| [base::matrix|| - replace_NA(); - replace_Inf(); - replace_zero(); remove_NA(); + replace_NA(); remove_Inf(); + replace_Inf(); remove_zero(); + replace_zero(); remove_empty() ] @@ -18,8 +18,9 @@ nomnoml::nomnoml(" +samples: character; +groups: character; +totals: numeric; - +date_from: integer; - +date_to: integer| + +dates: integer; + +tpq: integer; + +taq: integer| get_samples(); set_samples(); has_groups(); @@ -27,8 +28,16 @@ nomnoml::nomnoml(" set_groups(); get_totals(); set_totals(); + has_dates(); get_dates(); set_dates(); + has_terminus(); + get_terminus(); + set_terminus(); + get_tpq(); + set_tpq(); + get_taq(); + set_taq(); as_long(); as_features() ]