Skip to content

Commit

Permalink
Merge pull request #58 from ropensci/fix/cran-n-cores
Browse files Browse the repository at this point in the history
Fix/CRAN n cores notes
  • Loading branch information
robitalec committed Sep 8, 2023
2 parents 0239eb8 + 716cdf3 commit 2edd03c
Show file tree
Hide file tree
Showing 42 changed files with 5,995 additions and 32 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ Makefile
^\.github$
^CITATION\.cff$
^CRAN-SUBMISSION$
^data-raw$
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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.1
version: 0.2.2
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,
Expand Down
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 0.2.1
Date: 2023-08-23 13:44:44 UTC
SHA: e622be89152f83e216955bb7517bfdae813eff94
Version: 0.2.2
Date: 2023-09-07 20:22:33 UTC
SHA: c3ec2a5725d30b8576e48cb0a3e2928def2320cf
2 changes: 1 addition & 1 deletion 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.1
Version: 0.2.2
Authors@R: c(
person("Alec L.", "Robitaille", , "robit.alec@gmail.com", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-4706-1762")),
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# v 0.2.2 (2023-09-07)

* fixed CRAN notes about number of cores/parallel process/threads [PR 58](https://github.com/ropensci/spatsoc/pull/58)


# v 0.2.1 (2023-08-23)

* fixed CRAN notes [PR 56](https://github.com/ropensci/spatsoc/pull/56)
Expand Down
1 change: 1 addition & 0 deletions R/build_lines.R
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/build_polys.R
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/dyads.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/edge_dist.R
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/edge_nn.R
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/extdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/get_gbi.R
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/group_lines.R
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/group_polys.R
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/group_pts.R
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/group_times.R
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
1 change: 1 addition & 0 deletions R/randomizations.R
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
#' @examples
#' # Load data.table
#' library(data.table)
#' \dontshow{data.table::setDTthreads(1)}
#'
#' # Read example data
#' DT <- fread(system.file("extdata", "DT.csv", package = "spatsoc"))
Expand Down
2 changes: 1 addition & 1 deletion R/spatsoc.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
.onAttach <- function(libname, pkgname) {
packageStartupMessage(
'Note: spatsoc has been updated to follow the R-spatial evolution. \n',
'Package dependencies and functions have been modified. \n',
'Package dependencies and some functions have been modified. \n',
'Please see the NEWS for details: \n',
'https://docs.ropensci.org/spatsoc/index.html#news'
)
Expand Down
4 changes: 2 additions & 2 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"codeRepository": "https://github.com/ropensci/spatsoc",
"issueTracker": "https://github.com/ropensci/spatsoc/issues",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "0.2.1",
"version": "0.2.2",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down Expand Up @@ -190,7 +190,7 @@
},
"SystemRequirements": "GDAL (>= 2.0.1), GEOS (>= 3.4.0), PROJ (>= 4.8.0),\n sqlite3"
},
"fileSize": "1493.18KB",
"fileSize": "1868.342KB",
"citation": [
{
"@type": "ScholarlyArticle",
Expand Down
10 changes: 10 additions & 0 deletions data-raw/DT_predator.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
library(data.table)
DT <- fread('inst/extdata/DT.csv')

DT_predator <- DT[ID %in% LETTERS[seq.int(2)]][sample(.N, 100)]

DT_predator[, c('X', 'Y') := .(X + 1e4, Y - 5e4)]
DT_predator[, type := 'predator']

# usethis::use_data(DT_predator, overwrite = TRUE)
fwrite(DT_predator, 'inst/extdata/DT_predator.csv')
10 changes: 10 additions & 0 deletions data-raw/DT_prey.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
library(data.table)
DT <- fread('inst/extdata/DT.csv')

DT_prey <- DT[ID %in% LETTERS[seq(4, 7)]]

DT_prey[, c('X', 'Y') := .(X + 1e4, Y - 5e4)]
DT_prey[, type := 'prey']

# usethis::use_data(DT_prey, overwrite = TRUE)
fwrite(DT_prey, 'inst/extdata/DT_prey.csv')
101 changes: 101 additions & 0 deletions inst/extdata/DT_predator.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
ID,X,Y,datetime,population,type
B,708315.618680218,5460839.134457,2016-11-30T14:00:45Z,1,predator
A,709764.191173999,5458230.80456887,2017-01-05T10:00:54Z,1,predator
B,709472.307110792,5460132.36214218,2016-12-03T08:00:42Z,1,predator
A,713630.460756843,5456393.297055,2017-01-27T02:01:16Z,1,predator
B,707303.212649706,5461003.37446115,2016-12-17T18:00:54Z,1,predator
A,717525.097032082,5464081.78516923,2016-11-30T00:00:53Z,1,predator
B,708497.883818022,5461558.24375727,2016-11-03T12:00:54Z,1,predator
A,707836.594244911,5460808.34209177,2017-01-18T16:01:12Z,1,predator
B,707992.187513549,5461630.28928403,2016-12-29T22:00:54Z,1,predator
B,708106.423940381,5460969.53164933,2016-12-19T12:01:12Z,1,predator
B,706999.002205433,5461810.22024471,2016-11-05T14:00:49Z,1,predator
B,708312.395555645,5461320.14759248,2016-12-10T06:00:42Z,1,predator
B,709376.160114707,5460960.20926193,2016-12-04T10:00:53Z,1,predator
A,706852.266627862,5456301.85319749,2017-01-11T08:00:51Z,1,predator
A,713556.01167805,5461345.13339445,2017-02-13T16:01:13Z,1,predator
B,708350.155391149,5460932.11042714,2016-11-26T00:00:53Z,1,predator
B,708513.163265223,5461530.04360405,2016-12-31T10:00:55Z,1,predator
B,707902.717973461,5461365.86971774,2017-01-05T00:00:54Z,1,predator
A,726129.145169889,5455376.8655546,2016-12-04T08:01:00Z,1,predator
A,720496.379491835,5457793.02248365,2016-11-24T12:01:59Z,1,predator
A,717242.561160755,5462664.22514332,2017-02-23T12:02:58Z,1,predator
B,708549.240578948,5460694.42674601,2016-11-11T22:01:20Z,1,predator
A,706607.090265106,5456958.72354102,2016-12-23T16:00:47Z,1,predator
A,706249.3380459,5458659.27467154,2017-01-16T14:00:30Z,1,predator
A,714313.557451021,5455794.47270195,2016-11-16T06:00:53Z,1,predator
A,713515.22860374,5457502.31772494,2017-02-07T00:00:36Z,1,predator
B,707934.276068132,5460983.92403926,2016-12-17T22:00:53Z,1,predator
A,707880.913043861,5460578.6695832,2017-01-19T12:01:19Z,1,predator
A,711001.472335186,5455897.53301092,2016-11-10T14:00:45Z,1,predator
B,707158.533420734,5461621.91004273,2017-02-12T00:00:54Z,1,predator
A,709614.676006902,5458604.65849113,2017-01-23T16:00:57Z,1,predator
B,708477.821379121,5461101.91080325,2016-11-30T02:01:18Z,1,predator
A,720622.651225804,5456177.1173919,2016-11-08T06:01:30Z,1,predator
A,712927.414089065,5460566.51638603,2017-02-12T12:01:42Z,1,predator
A,722682.482065411,5454906.08461844,2016-11-21T16:00:54Z,1,predator
B,709129.926550696,5460204.81872591,2016-12-03T12:00:48Z,1,predator
B,707901.590436143,5461555.39207475,2016-12-29T04:00:54Z,1,predator
A,716371.082621349,5460548.19898128,2017-02-26T14:01:23Z,1,predator
A,723574.661852947,5455360.62644296,2016-11-06T06:00:45Z,1,predator
B,707183.492056362,5461223.00384561,2017-02-05T22:00:53Z,1,predator
A,706851.599758742,5459244.93667569,2017-01-18T08:00:54Z,1,predator
B,708228.965071089,5461718.54898446,2016-12-08T22:00:53Z,1,predator
B,708485.11822261,5461895.17427155,2016-12-30T20:00:54Z,1,predator
A,707246.115441426,5455506.12462222,2017-01-10T14:01:23Z,1,predator
B,707887.753258521,5460844.61776609,2016-12-12T18:00:41Z,1,predator
A,716171.558722321,5460135.30618512,2017-02-17T04:01:25Z,1,predator
B,707932.432210113,5460984.69839146,2016-12-13T00:00:47Z,1,predator
A,705809.592726557,5458645.07302082,2017-01-16T04:00:42Z,1,predator
B,707726.767204345,5460652.788159,2016-12-17T16:00:37Z,1,predator
B,709501.307066368,5461364.82782341,2016-12-26T04:00:54Z,1,predator
B,710160.167939319,5458380.34908604,2016-11-21T12:01:03Z,1,predator
A,725851.44751505,5455339.89910182,2016-11-01T00:00:54Z,1,predator
B,712833.490018524,5456252.95811863,2017-01-26T04:00:42Z,1,predator
B,714020.496174865,5456546.34595295,2017-01-26T16:00:25Z,1,predator
B,710562.659279084,5458202.84826894,2017-02-18T04:00:47Z,1,predator
B,709947.638998092,5457421.60908515,2016-11-15T04:00:51Z,1,predator
B,708392.123418134,5461644.5813826,2016-12-09T14:00:54Z,1,predator
A,706817.322737865,5457829.71781585,2017-02-01T02:02:38Z,1,predator
A,711883.459933565,5455001.60527773,2016-11-10T10:00:54Z,1,predator
A,710237.363706701,5456731.20372609,2016-12-25T10:00:55Z,1,predator
A,716220.100840758,5459830.33749803,2017-02-27T08:00:50Z,1,predator
A,707932.423882519,5457157.24341795,2016-12-12T00:00:48Z,1,predator
B,707525.799905846,5461464.09599729,2017-01-10T16:00:54Z,1,predator
B,708803.383396588,5460830.2098382,2016-12-03T20:00:37Z,1,predator
A,717684.876665354,5463832.62649861,2016-12-01T04:00:47Z,1,predator
B,709192.635300645,5460228.74633006,2016-11-02T06:00:41Z,1,predator
A,706191.532018898,5458361.92728743,2017-01-17T00:00:47Z,1,predator
A,706840.860359525,5455735.99584056,2017-01-09T22:01:27Z,1,predator
A,709994.263588677,5457841.74555159,2017-01-05T16:00:47Z,1,predator
B,708546.822832261,5461883.55397937,2016-12-31T14:00:42Z,1,predator
B,707668.251678506,5461059.95936302,2017-02-25T06:00:54Z,1,predator
A,709788.397444498,5458640.44911141,2017-01-01T18:01:35Z,1,predator
A,708790.453569048,5456993.21099731,2016-12-19T08:00:54Z,1,predator
A,708525.306634862,5457168.15910522,2016-12-17T00:01:25Z,1,predator
A,714121.314742883,5459528.74539122,2017-02-09T20:01:12Z,1,predator
A,710557.138301978,5455173.59912094,2016-12-10T12:01:49Z,1,predator
B,709968.294538956,5458833.29441443,2017-01-22T12:00:54Z,1,predator
B,708493.807927562,5461940.84378893,2017-01-05T22:00:47Z,1,predator
A,716916.363539119,5457346.95320393,2016-11-19T08:00:24Z,1,predator
A,707938.283090513,5457046.60346561,2016-12-19T14:01:12Z,1,predator
A,713092.639585467,5454715.46410387,2016-11-13T10:00:54Z,1,predator
B,709611.706395617,5458968.70776207,2016-11-23T12:01:03Z,1,predator
A,710164.666618407,5457203.42875619,2017-01-28T14:00:52Z,1,predator
B,709997.691900351,5457291.08373553,2016-11-15T00:01:17Z,1,predator
A,716173.531617738,5460149.57435383,2017-02-17T02:01:24Z,1,predator
B,708821.012630436,5459557.90287574,2017-02-22T00:00:45Z,1,predator
A,708523.628477521,5458143.76770236,2016-12-14T10:00:42Z,1,predator
A,709533.757975966,5458404.54494398,2017-01-24T00:00:53Z,1,predator
B,709952.829415211,5458251.40020203,2017-02-20T08:00:25Z,1,predator
B,708616.269404156,5460833.67628442,2016-12-16T18:00:42Z,1,predator
A,709003.034654307,5455269.17961997,2016-12-09T04:01:26Z,1,predator
A,715407.21596001,5457376.26577979,2016-11-18T14:01:08Z,1,predator
B,708456.097593401,5461011.04887069,2016-12-20T08:00:45Z,1,predator
B,710052.4318184,5458817.5742933,2017-01-22T04:00:47Z,1,predator
A,720506.492277287,5456290.02806081,2016-11-08T12:01:14Z,1,predator
A,709565.147963763,5456229.02799246,2016-12-16T18:01:13Z,1,predator
B,707634.531069084,5461736.84787752,2017-01-12T02:00:53Z,1,predator
A,711926.102852216,5454968.86187871,2016-11-10T04:01:14Z,1,predator
A,708898.050784441,5457102.33823484,2016-12-13T08:01:00Z,1,predator
A,713934.749013885,5458737.75304814,2017-02-11T04:02:39Z,1,predator

0 comments on commit 2edd03c

Please sign in to comment.