Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues related to migration to **terra** #174

Merged
merged 52 commits into from
Nov 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
12294a9
Edits
courtiol Oct 15, 2023
9fd7734
Fix typos and outdated URLs
courtiol Nov 8, 2023
3dfcbdb
First saveRDS & readRDS methods (#172)
courtiol Nov 8, 2023
723ef50
PrecipBrickDE: raster -> terra
courtiol Nov 10, 2023
6e9968f
isomultiscape was broken
courtiol Nov 10, 2023
56ded4f
Methods for saveRDS and readRDS
courtiol Nov 10, 2023
07e9da4
Remove pdf after test
courtiol Nov 10, 2023
944940d
Add bookdown link
courtiol Nov 10, 2023
4fd8fa9
Adapt to new IsoriX
courtiol Nov 10, 2023
d298c11
Omnibus saveRDS fn
courtiol Nov 12, 2023
ff8d6d6
Omnibus saveRDS fn
courtiol Nov 12, 2023
529f17b
Use distinct Rproj for bookdown and package
courtiol Nov 12, 2023
d85b3ab
Add comment on terra
courtiol Nov 12, 2023
55c8a09
`terra::aggregate()` does not na.rm by default (unlike `raster::aggre…
courtiol Nov 12, 2023
0afd51c
Minor edits for consistency
courtiol Nov 12, 2023
303ce8b
Fix typo(s)
courtiol Nov 12, 2023
c0b9ad0
NEWS moved to md
courtiol Nov 12, 2023
d395531
Update spelling
courtiol Nov 12, 2023
0c1cc85
Fix typo(s)
courtiol Nov 12, 2023
2fa2ce9
Reoxygenise
courtiol Nov 12, 2023
d3221cf
Minor edit
courtiol Nov 12, 2023
586d0f1
Reformatting
courtiol Nov 12, 2023
372d2cb
Update README
courtiol Nov 12, 2023
a4aa211
Fix wrong index in tests
courtiol Nov 12, 2023
cfe9908
Capture spaMM warnings and messages
courtiol Nov 12, 2023
5f7ef58
New IsoriX options for reviving spaMM warnings and messages
courtiol Nov 12, 2023
e4fedb9
Fix typo(s)
courtiol Nov 12, 2023
cad3702
Better handle NAs in predictions
courtiol Nov 12, 2023
da7580b
`terra::aggregate()` does not na.rm by default (unlike `raster::aggre…
courtiol Nov 12, 2023
572032a
Outdated?
courtiol Nov 12, 2023
00e5c99
Reformating
courtiol Nov 12, 2023
f9bea15
Add local tests
courtiol Nov 12, 2023
38d1f52
Update README
courtiol Nov 12, 2023
8c016f4
Better handle NAs
courtiol Nov 12, 2023
3808313
Add info origin def
courtiol Nov 12, 2023
fccd027
Add bullet points to issue template
courtiol Nov 12, 2023
9460425
Add missing namespace
courtiol Nov 12, 2023
6f74b88
`styler:::style_active_pkg()` and `lintr::lint_package()`
courtiol Nov 12, 2023
bdf5b56
Add path in example
courtiol Nov 12, 2023
6cb613b
Revise spacing
courtiol Nov 12, 2023
1a10a1f
Local test for RDS
courtiol Nov 12, 2023
4dbff6d
Solve S3/S4 remaining issues
courtiol Nov 12, 2023
65c3c30
Complete NEWS
courtiol Nov 12, 2023
6fbdc8f
Polish links
courtiol Nov 12, 2023
f46ad21
Update URL
courtiol Nov 12, 2023
036c7fa
`usethis::use_spell_check(lang = "en-GB")`
courtiol Nov 12, 2023
a266187
`styler:::style_active_pkg()`
courtiol Nov 12, 2023
54f924b
`usethis::use_cran_comments()`
courtiol Nov 12, 2023
614c299
Add steps
courtiol Nov 12, 2023
05f676e
Update CRAN comment
courtiol Nov 12, 2023
f1cbed5
More steps
courtiol Nov 12, 2023
febe992
Bump version number
courtiol Nov 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions IsoriX/.Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ R/testpackage\.R
man/isosim\.Rd
README\.md

^.*\.Rproj$
^\.Rproj\.user$
^cran-comments\.md$
9 changes: 5 additions & 4 deletions IsoriX/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: IsoriX
Version: 0.9.1.9999
Version: 0.9.2
Encoding: UTF-8
Title: Isoscape Computation and Inference of Spatial Origins using Mixed Models
Authors@R: c(
Expand Down Expand Up @@ -41,10 +41,11 @@ Suggests:
rgl,
spelling,
testthat,
webshot2
webshot2,
withr
LazyData: true
URL: https://github.com/courtiol/IsoriX/
BugReports: https://github.com/courtiol/IsoriX/issues/
URL: https://github.com/courtiol/IsoriX, https://bookdown.org/content/782
BugReports: https://github.com/courtiol/IsoriX/issues
RoxygenNote: 7.2.3
Roxygen: list(markdown = TRUE)
Language: en-GB
8 changes: 3 additions & 5 deletions IsoriX_project.Rproj → IsoriX/IsoriX.Rproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Version: 1.0

RestoreWorkspace: No
SaveWorkspace: No
AlwaysSaveHistory: No
RestoreWorkspace: Default
SaveWorkspace: Default
AlwaysSaveHistory: Default

EnableCodeIndexing: Yes
UseSpacesForTab: Yes
Expand All @@ -14,7 +14,5 @@ LaTeX: pdfLaTeX

BuildType: Package
PackageUseDevtools: Yes
PackagePath: IsoriX
PackageInstallArgs: --no-multiarch --with-keep.source
PackageCheckArgs: --as-cran
PackageRoxygenize: rd,collate,namespace
13 changes: 13 additions & 0 deletions IsoriX/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ S3method(print,CALIBFIT)
S3method(print,ISOFIND)
S3method(print,ISOFIT)
S3method(print,ISOSCAPE)
S3method(readRDS,character)
S3method(saveRDS,CALIBFIT)
S3method(saveRDS,ISOFIND)
S3method(saveRDS,ISOSCAPE)
S3method(summary,CALIBFIT)
S3method(summary,ISOFIND)
S3method(summary,ISOFIT)
S3method(summary,ISOSCAPE)
export("crs<-")
export("ext<-")
export()
export(RdBuTheme)
export(calibfit)
export(cellSize)
Expand Down Expand Up @@ -45,9 +50,15 @@ export(prepcipitate)
export(prepraster)
export(prepsources)
export(rast)
export(saveRDS_IsoriX)
export(shift)
export(values)
export(xyplot)
exportClasses(CALIBFIT)
exportClasses(ISOFIND)
exportClasses(ISOSCAPE)
exportMethods(readRDS)
exportMethods(saveRDS)
importFrom(grid,gpar)
importFrom(grid,grid.text)
importFrom(lattice,panel.points)
Expand All @@ -65,5 +76,7 @@ importFrom(terra,plot)
importFrom(terra,points)
importFrom(terra,polys)
importFrom(terra,rast)
importFrom(terra,readRDS)
importFrom(terra,saveRDS)
importFrom(terra,shift)
importFrom(terra,values)
316 changes: 316 additions & 0 deletions IsoriX/NEWS.md

Large diffs are not rendered by default.

Loading