Merge branch 'release-0.2.9'

MatthewHeun · Nov 6, 2018 · 62f1064 · 62f1064
2 parents 0affd00 + 697e014
commit 62f1064
Show file tree

Hide file tree

Showing 29 changed files with 1,169 additions and 546 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -2,3 +2,4 @@
 ^_pkgdown\.yml$
 ^.*\.Rproj$
 ^\.Rproj\.user$
+^README\.Rmd$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: matsindf
 Type: Package
 Title: Work with matrices in data frames
-Version: 0.2.8
-Date: 2018-11-01
+Version: 0.2.9
+Date: 2018-11-06
 Authors@R: c(person("Matthew", "Heun", role = c("aut", "cre"),
                      comment = c(ORCID = "0000-0002-7438-214X"),
                      email = "[email protected]"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,51 +1,54 @@
-# News for `matsindf`
+# matsindf 0.2.9 (2018-11-06)
 
+* Extended the `matsindf_apply` primer to include sections on using `matsindf_apply` with a data frame and programming.
 
-## matsindf 0.2.8 (2018-11-01)
+
+# matsindf 0.2.8 (2018-11-01)
 
 * Added new vignette to documentation website, 
   which required moving from .Rnw to .Rmd file.
 
 
-## matsindf 0.2.7 (2018-10-30)
+# matsindf 0.2.7 (2018-10-30)
 
 * Added documentation website.
 
 
-## matsindf 0.2.6 (2018-07-03)
+# matsindf 0.2.6 (2018-07-03)
 
 * New function `index_column` that ratios both numbers and matrices relative to an initial time.
 * Many documentation improvements.
 
 
-## matsindf 0.2.5 (2018-05-23)
+# matsindf 0.2.5 (2018-05-23)
 
 * `expand_to_tidy` now accepts a named list of matrices as input.
 
 
-## matsindf 0.2.4 (2018-05-22)
+# matsindf 0.2.4 (2018-05-22)
 
 * `matsindf_apply` now obtains named arguments from `.DF` 
   when a name in `.DF` matches a name of an argument to `FUN`.
   This behavior is overridden by supplying a string argument in `...` 
   of `matsindf_apply`.
 
 
-## matsindf 0.2.3 (2018-05-22)
+# matsindf 0.2.3 (2018-05-22)
 
 * `matsindf_apply` now accepts a list as input when arguments are all strings.
 
 
-## matsindf 0.2.2 (2018-05-20)
+# matsindf 0.2.2 (2018-05-20)
 
 * New `matsindf_apply` function.
 * All functions now use `matsindf_apply`.
 
-## matsindf 0.2.1 (2018-02-23)
+
+# matsindf 0.2.1 (2018-02-23)
 
 * Now uses renamed `matsbyname` package.
 
 
-## matsindf 0.2 (2018-02-21)
+# matsindf 0.2 (2018-02-21)
 
 * Initial version.
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/matsindf.html b/docs/articles/matsindf.html
diff --git a/docs/articles/matsindf_apply_primer.html b/docs/articles/matsindf_apply_primer.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -1,4 +1,4 @@
-pandoc: 2.1.2
+pandoc: 1.19.2.1
 pkgdown: 1.1.0
 pkgdown_sha: ~
 articles:

diff --git a/docs/reference/UKEnergy2000.html b/docs/reference/UKEnergy2000.html
diff --git a/docs/reference/add_UKEnergy2000_matnames.html b/docs/reference/add_UKEnergy2000_matnames.html
diff --git a/docs/reference/add_UKEnergy2000_row_col_meta.html b/docs/reference/add_UKEnergy2000_row_col_meta.html
diff --git a/docs/reference/collapse_to_matrices.html b/docs/reference/collapse_to_matrices.html
diff --git a/docs/reference/expand_to_tidy.html b/docs/reference/expand_to_tidy.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/index_column.html b/docs/reference/index_column.html
diff --git a/docs/reference/mat_to_rowcolval.html b/docs/reference/mat_to_rowcolval.html
diff --git a/docs/reference/matsindf_apply.html b/docs/reference/matsindf_apply.html
diff --git a/docs/reference/matsindf_apply_types.html b/docs/reference/matsindf_apply_types.html
diff --git a/docs/reference/rowcolval_to_mat.html b/docs/reference/rowcolval_to_mat.html
diff --git a/docs/reference/verify_cols_missing.html b/docs/reference/verify_cols_missing.html
diff --git a/tests/testthat/test_expand.R b/tests/testthat/test_expand.R
@@ -30,9 +30,9 @@ test_that("expand_to_tidy works as expected", {
                      vals    = c(   11  ,  12,    13 ,   14 ,   15 ,   16 ,   17 ,   49 ,   50 ,   51 ,   52,   0.2, 0.3)
   ) %>% group_by(Country, Year, matrix)
   mats <- collapse_to_matrices(tidy, matnames = "matrix", rownames = "row", colnames = "col",
-                                 rowtypes = "rowtype", coltypes = "coltype",
+                               rowtypes = "rowtype", coltypes = "coltype",
                                matvals = "vals") %>%
-    ungroup
+    ungroup()
   # For the first tests, do not drop 0 values.
   A <- expand_to_tidy(mats, matnames = "matrix", matvals = "vals",
                       rownames = "rows", colnames = "cols",

diff --git a/vignettes/.gitignore b/vignettes/.gitignore