version 1.0.1

cran · Jan 8, 2020 · 61ba159 · 61ba159
1 parent 75481f0
commit 61ba159
Show file tree

Hide file tree

Showing 19 changed files with 421 additions and 386 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,18 +1,26 @@
 Package: diagonals
 Title: Block Diagonal Extraction or Replacement
-Version: 0.4.0
+Version: 1.0.1
 Authors@R: person("Bastiaan", "Quast", email = "bquast@gmail.com", role = c("aut", "cre"))
-Description: Several tools for handling block-matrix diagonals and similar constructs are implemented. Block-diagonal matrices can be extracted or removed using two small functions implemented here. In addition, non-square matrices are supported. Block diagonal matrices occur when two dimensions of a data set are combined along one edge of a matrix. For example, trade-flow data in the 'decompr' and 'gvc' packages have each country-industry combination occur along both edges of the matrix.
+Description: Several tools for handling block-matrix diagonals and similar
+    constructs are implemented. Block-diagonal matrices can be extracted or removed
+    using two small functions implemented here. In addition, non-square matrices
+    are supported. Block diagonal matrices occur when two dimensions of a data set
+    are combined along one edge of a matrix. For example, trade-flow data in the
+    'decompr' and 'gvc' packages have each country-industry combination occur along
+    both edges of the matrix.
 Depends: R (>= 2.10)
 License: GPL-3
 LazyData: true
-URL: http://qua.st/diagonals, https://github.com/bquast/diagonals
+URL: https://qua.st/diagonals, https://github.com/bquast/diagonals
 BugReports: https://github.com/bquast/diagonals/issues
 Suggests: testthat, knitr
 VignetteBuilder: knitr
+RoxygenNote: 7.0.2
+Encoding: UTF-8
 NeedsCompilation: no
-Packaged: 2015-10-05 09:48:02 UTC; quast
+Packaged: 2020-01-07 13:42:22 UTC; bquast
 Author: Bastiaan Quast [aut, cre]
 Maintainer: Bastiaan Quast <bquast@gmail.com>
 Repository: CRAN
-Date/Publication: 2015-10-05 12:58:14
+Date/Publication: 2020-01-08 23:01:42 UTC
diff --git a/MD5 b/MD5
@@ -1,20 +1,18 @@
-4f2e1bb438b4a47b611cba8b8c7fa6e2 *DESCRIPTION
-8978180e2735e69064cef803abafe717 *NAMESPACE
-2ed492dd4faec5c6788023dbb74a99fa *NEWS
-02cff18352477edf52936f5595e13a1c *R/diagonals.R
+71bfbf782fca6d1eb1986530a5f19cc7 *DESCRIPTION
+e12c49c471a5852114b53c9169f1f30a *NAMESPACE
+515ce1d07693431905c45d020eb22d48 *NEWS
+11eaf5932a87ffa9c9c49e8c73cdec7f *R/diagonals.R
 4377a30de60cad31bfb694ae662cec8f *R/fatdiag.R
-298c36468bfb2d9975a29144beef49a2 *R/matricise.R
 2691863cc52ccddc31bd1827f4d36316 *R/split_vector.R
-2e893a67e041f980be9686901d7705c2 *README.md
-de11144bf9e5ebbd75ece150afed8766 *build/vignette.rds
+4e99bddbbc63d85e65c0962fc8ec4340 *README.md
+655924b11f200da666bdeff003ad43e6 *build/vignette.rds
 33f6179f4338f18d0cf1e5835082901e *inst/CITATION
-45fdf83e44b249d29b6b7b9692f26615 *inst/doc/fatdiag.R
-e23972aca3ae53b88b14f101b238abf2 *inst/doc/fatdiag.Rmd
-8953ecbcc4cd5fb807db69b3b90aef0c *inst/doc/fatdiag.html
-63c593eac8c9f0d5894c21fa56350bdf *man/diagonals.Rd
-bd788ef8fb02ae4f78922fd926962b16 *man/fatdiag.Rd
-1d283b65348018be7e9a126d40783b95 *man/matricise.Rd
-eb40293ad564fe7a042c28c1f5b6a1f2 *man/split_vector.Rd
+236806de24350bcca2a94a3068fb0ce7 *inst/doc/fatdiag.R
+710a36187a4e814032e9d34b62a84057 *inst/doc/fatdiag.Rmd
+db3645f3cc4afd7af37d55f89a26a6d3 *inst/doc/fatdiag.html
+12781fa4558571c8ff18ed1e677f7be2 *man/diagonals.Rd
+5b352048fd7ac091d17fbc72c9f55a60 *man/fatdiag.Rd
+54c7d6835c11c30534f75fd7569cf69e *man/split_vector.Rd
 93a1e65fece34405d313bc933811acfa *tests/testthat.R
-9232d7b7bb1ed4bdf0cd3afc6e6d24d0 *tests/testthat/test_fatdiag.R
-e23972aca3ae53b88b14f101b238abf2 *vignettes/fatdiag.Rmd
+33e33c15533a2be2ec02b7b6b4781a1c *tests/testthat/test_fatdiag.R
+710a36187a4e814032e9d34b62a84057 *vignettes/fatdiag.Rmd
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export("fatdiag<-")
 export(fatdiag)

diff --git a/NEWS b/NEWS
@@ -1,3 +1,17 @@
+diagonals 1.0.1
+===================
+
+* remove matricise
+
+
+diagonals 1.0.0
+===================
+
+* stable release
+
+* updated documentation
+
+
 diagonals 0.4.0
 ===================
 

diff --git a/R/diag.R b/R/diag.R
diff --git a/R/diagonals.R b/R/diagonals.R
@@ -2,6 +2,13 @@
 #' @docType package
 #' @title diagonals
 #' @author Bastiaan Quast \email{bquast@@gmail.com}
+#' @description Several tools for handling block-matrix diagonals and similar
+#' constructs are implemented. Block-diagonal matrices can be extracted or removed
+#' using two small functions implemented here. In addition, non-square matrices
+#' are supported. Block diagonal matrices occur when two dimensions of a data set
+#' are combined along one edge of a matrix. For example, trade-flow data in the
+#' decompr' and 'gvc' packages have each country-industry combination occur along
+#' both edges of the matrix.
 #' @seealso http://qua.st/diagonals
 NULL
 .onAttach <- function(...) {

diff --git a/R/matricise.R b/R/matricise.R
diff --git a/README.md b/README.md
@@ -1,18 +1,19 @@
 diagonals
 -------------
-[![CRAN Version](http://www.r-pkg.org/badges/version/diagonals)](http://cran.r-project.org/package=diagonals)
-[![RStudio Cloud Downloads](http://cranlogs.r-pkg.org/badges/diagonals?color=brightgreen)](http://cran.rstudio.com/package=diagonals)
+[![License](https://img.shields.io/badge/license-GPLv3-brightgreen.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
+[![CRAN Version](https://www.r-pkg.org/badges/version/diagonals)](https://cran.r-project.org/package=diagonals)
+[![RStudio Cloud Downloads](https://cranlogs.r-pkg.org/badges/diagonals?color=brightgreen)](https://cran.r-project.org/package=diagonals)
 [![Travis-CI Build Status](https://travis-ci.org/bquast/diagonals.svg?branch=master)](https://travis-ci.org/bquast/diagonals) 
-[![Coverage Status](https://img.shields.io/coveralls/bquast/diagonals.svg)](https://coveralls.io/r/bquast/diagonals?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/bquast/diagonals/badge.svg?branch=master)](https://coveralls.io/github/bquast/diagonals?branch=master)
 
 Block-diagonal matrices can be extracted or removed using two small functions implemented here, in addition, non-square matrices are supported.
 
-Block diagonal matrices occur when we combine two dimensions of a data set along one edge of a matrix. For example, trade-flow data in the [decompr](http://cran.r-project.org/package=decompr) and [gvc](http://cran.r-project.org/package=gvc) package have each country-industry combination occur on each edge of the matrix.
+Block diagonal matrices occur when we combine two dimensions of a data set along one edge of a matrix. For example, trade-flow data in the [decompr](https://cran.r-project.org/package=decompr) and [gvc](https://cran.r-project.org/package=gvc) package have each country-industry combination occur on each edge of the matrix.
 
 
 Installation
 -------------
-The stable version of the `diagonals` package can be install from [CRAN](http://cran.r-project.org/package=diagonals) using:
+The stable version of the `diagonals` package can be install from [CRAN](https://cran.r-project.org/package=diagonals) using:
 
 ```r
 install.packages("diagonals")
@@ -65,9 +66,9 @@ An overview of the changes is available in the NEWS file.
 news(package="diagonals")
 ```
 
-There is also a blog post with information on my [personal website](http://qua.st/).
+There is also a blog post with information on my [personal website](https://qua.st/).
 
-http://qua.st/diagonals/
+https://qua.st/diagonals/
 
 
 Development

diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/inst/doc/fatdiag.R b/inst/doc/fatdiag.R
@@ -1,18 +1,18 @@
-## ------------------------------------------------------------------------
+## -----------------------------------------------------------------------------
 library(diagonals)
 fatdiag(12, steps=3)
 
-## ------------------------------------------------------------------------
+## -----------------------------------------------------------------------------
 ( m <- matrix(111, nrow=6, ncol=9) )
 fatdiag(m, steps=3) <- 5
 m
 
-## ------------------------------------------------------------------------
+## -----------------------------------------------------------------------------
 fatdiag(m, steps=3)
 
-## ------------------------------------------------------------------------
+## -----------------------------------------------------------------------------
 fatdiag(12, size=4)
 
-## ------------------------------------------------------------------------
+## -----------------------------------------------------------------------------
 fatdiag(12, size=c(3,4) )
 
diff --git a/inst/doc/fatdiag.Rmd b/inst/doc/fatdiag.Rmd
@@ -9,7 +9,7 @@ vignette: >
   %\VignetteEncoding{UTF-8}
 ---
 
-Fat diagonal matrices occur when we combine two dimensions of a data set along one edge of a matrix. For example, trade-flow data in the [decompr](http://cran.r-project.org/package=decompr) and [gvc](http://cran.r-project.org/package=gvc) package have each country-industry combination occur on each edge of the matrix. 
+Fat diagonal matrices occur when we combine two dimensions of a data set along one edge of a matrix. For example, trade-flow data in the [decompr](https://cran.r-project.org/package=decompr) and [gvc](https://cran.r-project.org/package=gvc) package have each country-industry combination occur on each edge of the matrix. 
 
 A fat diagonal matrix looks like this.