Skip to content

Commit

Permalink
fix CRAN feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
mdsumner committed Oct 7, 2019
1 parent ba10696 commit f5e7eaa
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 21 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
^inst/examples
^R/old
^silicate\.Rproj$
^CRAN-RELEASE$
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ Authors@R: c(person("Michael D.","Sumner", role = c("aut", "cre"), email = "mdsu
person("Mark", "Padgham", role = "aut")
)
Description: Generate common data forms for complex data suitable for conversions and
transmission by decomposition as 'paths' or 'primitives'. Paths are sequentially-linked records,
transmission by decomposition as paths or primitives. Paths are sequentially-linked records,
primitives are basic atomic elements and both can model many forms and be grouped into hierarchical
structures. The universal models 'SC0' (structural) and 'SC' (labelled, relational) are composed of
edges and can represent any hierarchical form. Specialist models 'PATH', 'ARC' and 'TRI' provide the
most common intermediate forms used for converting from one form to another.
most common intermediate forms used for converting from one form to another. The methods are
inspired by the simplicial complex <https://en.wikipedia.org/wiki/Simplicial_complex> and
provide intermediate forms that relate spatial data structures to this mathematical construct.
Depends:
R (>= 3.4.0)
License: GPL-3
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# silicate 0.2.0

* Clarified Description and cleaned up examples, thanks to CRAN feedback.

* First viable release.

* Commited to ARC only being relevant to polygon layers.

* New models `TRI0` and `PATH0` as analogues to SC0.


# silicate 0.1.1.9001

* `sc_uid` is now 6L characters by default, controlled by `uid_nchar` argument, and settable in option
Expand Down
7 changes: 0 additions & 7 deletions R/SC-model.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ globalVariables("n")
#' tri <- TRI(minimal_mesh)
#' plot(tri)
#' plot(SC(tri))
#' \dontrun{
#' # library(anglr)
#' #plot(DEL(SC(TRI(minimal_mesh)), max_area = 0.001))
#'
#' ## Nice small triangles in a conforming Delaunay mesh.
#' #plot(SC(DEL(simpleworld[121, ], D = TRUE, max_area = .1)))
#' }
SC <- function(x, ...) {
UseMethod("SC")
}
Expand Down
4 changes: 2 additions & 2 deletions R/silicate-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ NULL
#' it's just what happened doing a quick crop and extract with the mouse. Lord Howe Island and
#' Macquarie Island are both present, as part of New South Wales and Tasmania respectively.
#' @examples
#' \dontrun{
#' \donttest{
#' path <- PATH(inlandwaters)
#' plot(path)
#' obj <- split(path$path_link_vertex, path$path_link_vertex$path_)
Expand All @@ -95,7 +95,7 @@ NULL
#' invisible(NULL)
#' })
#' par(op)
#' }
#' }
#' @aliases inlandwaters
#' @name inlandwaters
#' @docType data
Expand Down
10 changes: 10 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
Resubmission silicate 0.2.0

* Removed single quotes from non-special words in Description
* Added url link to Description
* Removed one \dontrun{} that required a non-CRAN package.
* Replaced one \dontrun{} with \donttest{} to avoid speed penalty.

Thank you very much.

## Test environments

* local ubuntu 18.04, R 3.6.1
* ubuntu 14.04 (on travis-ci), R 3.6.1
* win-builder (devel and release)
Expand Down
7 changes: 0 additions & 7 deletions man/SC.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/inlandwaters.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions man/sc_object.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 comments on commit f5e7eaa

@mpadge
Copy link
Member

@mpadge mpadge commented on f5e7eaa Oct 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, really? This is awesometastic!!!! 🎆 💣 🎆

@mdsumner
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks so much for helping things along!

Please sign in to comment.