Skip to content

Commit

Permalink
Merge pull request #78 from ropensci/feat/fission-fusion
Browse files Browse the repository at this point in the history
Feat/fission fusion
  • Loading branch information
robitalec authored Sep 19, 2024
2 parents fa88e1f + 77df7e9 commit f441f2e
Show file tree
Hide file tree
Showing 12 changed files with 486 additions and 54 deletions.
70 changes: 46 additions & 24 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
# -----------------------------------------------------------
# CITATION file created with {cffr} R package, v0.5.0
# --------------------------------------------
# CITATION file created with {cffr} R package
# See also: https://docs.ropensci.org/cffr/
# -----------------------------------------------------------
# --------------------------------------------

cff-version: 1.2.0
message: 'To cite package "spatsoc" in publications use:'
type: software
license: GPL-3.0-only
title: 'spatsoc: Group Animal Relocation Data by Spatial and Temporal Relationship'
version: 0.2.2
version: 0.2.4.9000
identifiers:
- type: doi
value: 10.32614/CRAN.package.spatsoc
abstract: Detects spatial and temporal groups in GPS relocations (Robitaille et al.
(2019) <doi:10.1111/2041-210X.13215>). It can be used to convert GPS relocations
to gambit-of-the-group format to build proximity-based social networks In addition,
the randomizations function provides data-stream randomization methods suitable
for GPS data.
(2019) <https://doi.org/10.1111/2041-210X.13215>). It can be used to convert GPS
relocations to gambit-of-the-group format to build proximity-based social networks
In addition, the randomizations function provides data-stream randomization methods
suitable for GPS data.
authors:
- family-names: Robitaille
given-names: Alec L.
Expand Down Expand Up @@ -63,11 +66,10 @@ references:
url: https://www.R-project.org/
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2023'
institution:
name: R Foundation for Statistical Computing
address: Vienna, Austria
year: '2024'
version: '>= 3.4'
- type: software
title: adehabitatHR
Expand All @@ -79,7 +81,8 @@ references:
given-names: Clement
- family-names: Fortmann-Roe
given-names: contributions from Scott
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.adehabitatHR
version: '>= 0.4.21'
- type: software
title: data.table
Expand All @@ -88,13 +91,24 @@ references:
url: https://r-datatable.com
repository: https://CRAN.R-project.org/package=data.table
authors:
- family-names: Barrett
given-names: Tyson
email: t.barrett88@gmail.com
- family-names: Dowle
given-names: Matt
email: mattjdowle@gmail.com
- family-names: Srinivasan
given-names: Arun
email: asrini@pm.me
year: '2023'
- family-names: Gorecki
given-names: Jan
- family-names: Chirico
given-names: Michael
- family-names: Hocking
given-names: Toby
orcid: https://orcid.org/0000-0002-3146-0865
year: '2024'
doi: 10.32614/CRAN.package.data.table
version: '>= 1.10.5'
- type: software
title: igraph
Expand Down Expand Up @@ -128,7 +142,8 @@ references:
given-names: Kirill
email: kirill@cynkra.com
orcid: https://orcid.org/0000-0002-1416-3412
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.igraph
- type: software
title: sf
abstract: 'sf: Simple Features for R'
Expand All @@ -140,18 +155,18 @@ references:
given-names: Edzer
email: edzer.pebesma@uni-muenster.de
orcid: https://orcid.org/0000-0001-8049-7069
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.sf
- type: software
title: stats
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2023'
institution:
name: R Foundation for Statistical Computing
address: Vienna, Austria
year: '2024'
- type: software
title: units
abstract: 'units: Measurement Units for R Vectors'
Expand All @@ -172,7 +187,8 @@ references:
given-names: Iñaki
email: iucar@fedoraproject.org
orcid: https://orcid.org/0000-0001-6403-5550
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.units
- type: software
title: asnipe
abstract: 'asnipe: Animal Social Network Inference and Permutations for Ecologists'
Expand All @@ -182,7 +198,8 @@ references:
- family-names: Farine
given-names: Damien R.
email: dfarine@ab.mpg.de
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.asnipe
- type: software
title: knitr
abstract: 'knitr: A General-Purpose Package for Dynamic Report Generation in R'
Expand All @@ -194,7 +211,8 @@ references:
given-names: Yihui
email: xie@yihui.name
orcid: https://orcid.org/0000-0003-0645-5666
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.knitr
- type: software
title: markdown
abstract: 'markdown: Render Markdown with ''commonmark'''
Expand All @@ -210,7 +228,8 @@ references:
given-names: JJ
- family-names: Horner
given-names: Jeffrey
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.markdown
- type: software
title: rmarkdown
abstract: 'rmarkdown: Dynamic Documents for R'
Expand Down Expand Up @@ -253,7 +272,8 @@ references:
given-names: Richard
email: rich@posit.co
orcid: https://orcid.org/0000-0003-3925-190X
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.rmarkdown
- type: software
title: testthat
abstract: 'testthat: Unit Testing for R'
Expand All @@ -264,5 +284,7 @@ references:
- family-names: Wickham
given-names: Hadley
email: hadley@posit.co
year: '2023'
year: '2024'
doi: 10.32614/CRAN.package.testthat
version: '>= 2.1.0'

2 changes: 0 additions & 2 deletions CRAN-RELEASE

This file was deleted.

3 changes: 0 additions & 3 deletions CRAN-SUBMISSION

This file was deleted.

4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: spatsoc
Title: Group Animal Relocation Data by Spatial and Temporal Relationship
Version: 0.2.3
Version: 0.2.4.9000
Authors@R: c(
person("Alec L.", "Robitaille", , "robit.alec@gmail.com", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-4706-1762")),
Expand Down Expand Up @@ -38,6 +38,6 @@ VignetteBuilder:
knitr
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
SystemRequirements: GDAL (>= 2.0.1), GEOS (>= 3.4.0), PROJ (>= 4.8.0),
sqlite3
7 changes: 0 additions & 7 deletions Makefile

This file was deleted.

1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export(build_polys)
export(dyad_id)
export(edge_dist)
export(edge_nn)
export(fusion_id)
export(get_gbi)
export(group_lines)
export(group_polys)
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v 0.2.4.9000

* (experimental) `fusion_id` function for flexibly identifying fission-fusion
events [PR 78](https://github.com/ropensci/spatsoc/pull/78)


# v 0.2.3

* Fix/replace igraph clusters with components [PR 61](https://github.com/ropensci/spatsoc/pull/61)
Expand Down
Loading

0 comments on commit f441f2e

Please sign in to comment.