Skip to content

Commit

Permalink
Change of maintainer and fix C++ issues. (#74)
Browse files Browse the repository at this point in the history
* Getting rid of dplyr and sp: replacing with collapse, sf and s2 + some optimization

* Small fix.

* Need to add sf and rename count column.

* Using R's numeric() instead of alloc().

* Update NEWS

* Fixing #63. The issue on M1 Mac is due to implicit conversion of a double (factor) to long int here: on M1 Macs this is rounded downwards, thus I needed to add a small number. Took me 6 freaking hours of simultaneous debugging on Mac and Windows to find it...

* Adding return_sf argument: set to FALSE for memory efficient long datat frame (can be converted to S2 and other classes).

* Appeasing R CMD check.

* Comment and change of notation as requested by @r-barnes.

* Update CONTRIBUTING.md to explain C++ workflow

* Using dgprintf as requested by @r-barnes.

* Also using dgprintf here.

* Install instructions for fork.

* Update README.md

* Remove magrittr pipe.

* Need to add dplyr for vignette it seems.

* Fix C++ issues.

* Change of maintainer.

* Spacing.

* Remove duplicate.

* Remove installation notes.

* Fix spacing.

---------

Co-authored-by: Richard Barnes <[email protected]>
  • Loading branch information
SebKrantz and r-barnes authored Jul 24, 2024
1 parent 388844a commit e62be73
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
13 changes: 6 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,29 @@ 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 <[email protected]>
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 <[email protected]>
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 = "[email protected]"),
Authors@R: c(person("Richard", "Barnes", role = "aut", email = "[email protected]"),
person("Kevin", "Sahr", role = c("aut", "cph"), email = "[email protected]"),
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 = "[email protected]")
)
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/
BugReports: https://github.com/r-barnes/dggridR/
RoxygenNote: 7.2.3
Encoding: UTF-8
VignetteBuilder: knitr, R.rsp
SystemRequirements: C++11
Language: en-US
8 changes: 4 additions & 4 deletions src/DgBoundedRF.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ template<class A, class B, class DB> class DgBoundedRF

public:

DgBoundedRF<A, B, DB> (const DgDiscRF<A, B, DB>& rfIn,
const A& firstAddIn,
const A& lastAddIn, const A& endAddIn,
bool zBasedIn = true);
DgBoundedRF(const DgDiscRF<A, B, DB>& rfIn,
const A& firstAddIn,
const A& lastAddIn, const A& endAddIn,
bool zBasedIn = true);

const DgDiscRF<A, B, DB>& discRF (void) const { return discRF_; }

Expand Down
4 changes: 2 additions & 2 deletions src/DgParamList.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ template<class T> class DgParameter : public DgAssoc {

public:

DgParameter<T> (const string& nameIn) : DgAssoc (nameIn) { }
DgParameter(const string& nameIn) : DgAssoc (nameIn) { }

DgParameter<T> (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_; }
Expand Down

0 comments on commit e62be73

Please sign in to comment.