Merge branch 'release-0.2.11'

MatthewHeun · Nov 13, 2018 · be008c2 · be008c2
2 parents c836370 + e768504
commit be008c2
Show file tree

Hide file tree

Showing 24 changed files with 102 additions and 24 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: matsindf
 Type: Package
 Title: Work with matrices in data frames
-Version: 0.2.10
-Date: 2018-11-08
+Version: 0.2.11
+Date: 2018-11-13
 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,3 +1,8 @@
+# matsindf 0.2.11 (2018-11-13)
+
+* Now creating README.md from README.Rmd for `pkgdown` documentation.
+
+
 # matsindf 0.2.10 (2018-11-08)
 
 * Breaking change: Default values of `rowtypes` and `coltypes` arguments to 

diff --git a/README.Rmd b/README.Rmd
@@ -3,6 +3,12 @@ output: github_document
 bibliography: vignettes/References.bib
 ---
 
+<!-- *********** -->
+<!-- Note: README.md is generated from README.Rmd.   -->
+<!-- Be sure to edit README.Rmd and generate the README.md file by Cmd/Ctl-shift-K -->
+<!-- *********** -->
+
+
 <!-- Add this later, after I have connected matsindf to matsbyname. -->
 <!-- [![Travis-CI Build Status](https://travis-ci.org/MatthewHeun/matsindf.svg?branch=master)](https://travis-ci.org/MatthewHeun/matsindf) -->
 

diff --git a/README.md b/README.md
@@ -0,0 +1,54 @@
+
+<!-- *********** -->
+
+<!-- Note: README.md is generated from README.Rmd.   -->
+
+<!-- Be sure to edit README.Rmd and generate the README.md file by Cmd/Ctl-shift-K -->
+
+<!-- *********** -->
+
+<!-- Add this later, after I have connected matsindf to matsbyname. -->
+
+<!-- [![Travis-CI Build Status](https://travis-ci.org/MatthewHeun/matsindf.svg?branch=master)](https://travis-ci.org/MatthewHeun/matsindf) -->
+
+# matsindf
+
+The `R` package `matsindf` provides ways to interact with matrices in
+data frames.
+
+## Installation
+
+You can install `matsindf` from github with:
+
+``` r
+# install devtools if not already installed
+# install.packages("devtools")
+devtools::install_github("MatthewHeun/matsindf")
+# To build vignettes locally, use
+devtools::install_github("MatthewHeun/matsindf", build_vignettes = TRUE)
+```
+
+## History
+
+The functions in this package were used in the paper [Heun et al.
+(2018)](https://doi.org/10.1016/j.apenergy.2018.05.109).
+
+## More Information
+
+Find more information, including vignettes and function documentation at
+<https://MatthewHeun.github.io/matsindf/>.
+
+## References
+
+<div id="refs" class="references">
+
+<div id="ref-Heun:2018">
+
+Heun, Matthew Kuperus, Anne Owen, and Paul E. Brockway. 2018. “A
+Physical Supply-Use Table Framework for Energy Analysis on the Energy
+Conversion Chain.” *Applied Energy* 226 (September):1134–62.
+<https://doi.org/10.1016/j.apenergy.2018.05.109>.
+
+</div>
+
+</div>
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.0.6
+pandoc: 2.1.2
 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