diff --git a/DESCRIPTION b/DESCRIPTION index cc391ee..1abfd33 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,24 +2,24 @@ Package: dggridR Type: Package Title: Discrete Global Grids Version: 3.1.0 -Date: 2024-05-21 -Author: Richard Barnes [aut, cre], Kevin Sahr [aut, cph], Gerald Evenden [cph], Angus Johnson [cph], Frank Warmerdam [cph], Even Rouault [cph], Lian Song [ctb], Sebastian Krantz [ctb] -Maintainer: Richard Barnes +Date: 2024-07-17 +Author: Richard Barnes [aut], Kevin Sahr [aut, cph], Gerald Evenden [cph], Angus Johnson [cph], Frank Warmerdam [cph], Even Rouault [cph], Lian Song [ctb], Sebastian Krantz [ctb, cre] +Maintainer: Sebastian Krantz NeedsCompilation: yes Depends: R (>= 3.4.0) Imports: Rcpp (>= 0.12.12), collapse (>= 1.8.0), sf (>= 1.0), s2 (>= 1.1) LinkingTo: Rcpp RcppModules: dgfuncs, gridgens, gridstats -Suggests: ggplot2, dplyr, knitr, rmarkdown, maps, mapproj, R.rsp, testthat +Suggests: ggplot2, knitr, rmarkdown, dplyr, maps, R.rsp, testthat License: AGPL (>= 3) -Authors@R: c(person("Richard", "Barnes", role = c("aut", "cre"), email = "rijard.barnes@gmail.com"), +Authors@R: c(person("Richard", "Barnes", role = "aut", email = "rijard.barnes@gmail.com"), person("Kevin", "Sahr", role = c("aut", "cph"), email = "sahrk@sou.edu"), person("Gerald", "Evenden", role = "cph"), person("Angus", "Johnson", role = "cph"), person("Frank", "Warmerdam", role = "cph"), person("Even", "Rouault", role = "cph"), person("Lian", "Song", role = "ctb"), - person("Sebastian", "Krantz", role = "ctb") + person("Sebastian", "Krantz", role = c("ctb", "cre"), email = "sebastian.krantz@graduateinstitute.ch") ) Description: Spatial analyses involving binning require that every bin have the same area, but this is impossible using a rectangular grid laid over the Earth or over any projection of the Earth. Discrete global grids use hexagons, triangles, and diamonds to overcome this issue, overlaying the Earth with equally-sized bins. This package provides utilities for working with discrete global grids, along with utilities to aid in plotting such data. URL: https://github.com/r-barnes/dggridR/ @@ -27,5 +27,4 @@ BugReports: https://github.com/r-barnes/dggridR/ RoxygenNote: 7.2.3 Encoding: UTF-8 VignetteBuilder: knitr, R.rsp -SystemRequirements: C++11 Language: en-US diff --git a/src/DgBoundedRF.h b/src/DgBoundedRF.h index c66cc05..d051387 100644 --- a/src/DgBoundedRF.h +++ b/src/DgBoundedRF.h @@ -41,10 +41,10 @@ template class DgBoundedRF public: - DgBoundedRF (const DgDiscRF& rfIn, - const A& firstAddIn, - const A& lastAddIn, const A& endAddIn, - bool zBasedIn = true); + DgBoundedRF(const DgDiscRF& rfIn, + const A& firstAddIn, + const A& lastAddIn, const A& endAddIn, + bool zBasedIn = true); const DgDiscRF& discRF (void) const { return discRF_; } diff --git a/src/DgParamList.h b/src/DgParamList.h index b2d6217..e50a599 100644 --- a/src/DgParamList.h +++ b/src/DgParamList.h @@ -166,9 +166,9 @@ template class DgParameter : public DgAssoc { public: - DgParameter (const string& nameIn) : DgAssoc (nameIn) { } + DgParameter(const string& nameIn) : DgAssoc (nameIn) { } - DgParameter (const string& nameIn, const T& valIn, bool validIn = true) + DgParameter(const string& nameIn, const T& valIn, bool validIn = true) : DgAssoc (nameIn), value_ (valIn) { DgAssoc::setIsValid(validIn); } const T& value (void) const { return value_; }