Skip to content

Commit

Permalink
Merge pull request #17 from OB7-IRD/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
JeanneClement authored Dec 5, 2024
2 parents 370cfbf + 66fe092 commit 3223263
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 43 deletions.
12 changes: 8 additions & 4 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ title: 'furdeb: FUnctions for R DEvelopment and Beyond!'
version: 1.0.0
abstract: Functions and processes for R development and beyond!
authors:
- family-names: Clément
given-names: Jeanne
email: jeanne.clement@ird.fr
orcid: https://orcid.org/0000-0002-5228-5015
- family-names: Depetris
given-names: Mathieu
email: mathieu.depetris@ird.fr
Expand All @@ -26,8 +30,8 @@ authors:
repository-code: https://github.com/OB7-IRD/furdeb
url: https://github.com/OB7-IRD/furdeb
contact:
- family-names: Depetris
given-names: Mathieu
email: mathieu.depetris@ird.fr
orcid: https://orcid.org/0000-0001-8080-0531
- family-names: Clément
given-names: Jeanne
email: jeanne.clement@ird.fr
orcid: https://orcid.org/0000-0002-5228-5015

16 changes: 8 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@ Type: Package
Title: FUnctions for R DEvelopment and Beyond!
Version: 1.0.0
Authors@R:
c(person(given = "Mathieu",
c(person(given = "Jeanne",
family = "Clément",
email = "jeanne.clement@ird.fr",
role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-5228-5015")),
person(given = "Mathieu",
family = "Depetris",
email = "mathieu.depetris@ird.fr",
role = c("aut", "cre"),
role = c("aut"),
comment = c(ORCID = "0000-0001-8080-0531")),
person(given = "Oceane",
family = "Bouhineau",
Expand All @@ -27,11 +32,6 @@ Authors@R:
email = "philippe.sabarros@ird.fr",
role = c("ctb"),
comment = c(ORCID = "0000-0001-6135-9015")),
person(given = "Jeanne",
family = "Clément",
email = "jeanne.clement@ird.fr",
role = c("ctb"),
comment = c(ORCID = "0000-0002-5228-5015")),
person(given = "IRD - Ob7",
family = "Observatory of Exploited Tropical Pelagic Ecosystems",
email = "ob7@ird.fr",
Expand All @@ -41,7 +41,7 @@ Description: Functions and processes for R development and beyond!
License: GPL-3 + file LICENSE
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
VignetteBuilder: knitr
URL: https://github.com/OB7-IRD/furdeb
BugReports: https://github.com/OB7-IRD/furdeb/issues
Expand Down
4 changes: 2 additions & 2 deletions R/access_dbconnection.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#' @details
#' Difference between drivers "u_can_access" and "access_jdbc42":
#' \itemize{
#' \item{"u_can_access": }{the main advantage is it's a free java JDBC driver. To understand briefly the process behind, the Access database is converted in HSQLDB system. This conversion could take a long time, especially if the database if large. Furthermore, after the conversion, queries should be faster than if there run on an Access database.}
#' \item{"access_jdbc42": }{this driver is paying. In opposition with the "u_can_access" driver, the Access database is not converted. The connection should be faster but the queries could be longer.}
#' \item{"u_can_access": the main advantage is it's a free java JDBC driver. To understand briefly the process behind, the Access database is converted in HSQLDB system. This conversion could take a long time, especially if the database if large. Furthermore, after the conversion, queries should be faster than if there run on an Access database.}
#' \item{"access_jdbc42": this driver is paying. In opposition with the "u_can_access" driver, the Access database is not converted. The connection should be faster but the queries could be longer.}
#' }
#' @export
access_dbconnection <- function(driver_name = "u_can_access",
Expand Down
14 changes: 7 additions & 7 deletions R/latitude_longitude_to_csquare.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
#' @details
#' For the argument "grid_square", you can choose between 7 modalities:
#' \itemize{
#' \item{10: }{for a grid with a resolution of 10x10 degrees}
#' \item{5: }{for a grid with a resolution of 5x5 degrees}
#' \item{1: }{for a grid with a resolution of 1x1 degrees}
#' \item{0.5: }{for a grid with a resolution of 0.5x0.5 degrees}
#' \item{0.1: }{for a grid with a resolution of 0.1x0.1 degrees}
#' \item{0.05: }{for a grid with a resolution of 0.05x0.05 degrees}
#' \item{0.01: }{for a grid with a resolution of 0.01x0.01 degrees}
#' \item{10: for a grid with a resolution of 10x10 degrees}
#' \item{5: for a grid with a resolution of 5x5 degrees}
#' \item{1: for a grid with a resolution of 1x1 degrees}
#' \item{0.5: for a grid with a resolution of 0.5x0.5 degrees}
#' \item{0.1: for a grid with a resolution of 0.1x0.1 degrees}
#' \item{0.05: for a grid with a resolution of 0.05x0.05 degrees}
#' \item{0.01: for a grid with a resolution of 0.01x0.01 degrees}
#' }
#' This function have been developped regarding a MS Excel worksheet of Tony Rees (Tony.Rees@@csiro.au).
#' If you want more informations about C-square visit http://www.cmar.csiro.au/csquares/spec1-1.htm.
Expand Down
12 changes: 6 additions & 6 deletions R/marine_area_overlay.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
#' @details
#' For the argument "fao_overlay_level", you can choose between 5 modalities (descending size classification):
#' \itemize{
#' \item{ocean: }{ocean area}
#' \item{major: }{major fao fishing area}
#' \item{subarea: }{sub fao fishing area}
#' \item{division: }{division fao fishing area}
#' \item{subdivision: }{sub-division fao fishing area}
#' \item{subunit: }{sub-unit fao fishing area}
#' \item{ocean: ocean area}
#' \item{major: major fao fishing area}
#' \item{subarea: sub fao fishing area}
#' \item{division: division fao fishing area}
#' \item{subdivision: sub-division fao fishing area}
#' \item{subunit: sub-unit fao fishing area}
#' }
#' Specificity for fao fishing area parameters: all the items above your specification (thus contain it at higher levels) will be added in the output. For example, if you select "subarea", you will also have the information about the major area concerning.
#' If you want more information visit http://www.fao.org/fishery/area/search/en
Expand Down
4 changes: 2 additions & 2 deletions man/access_dbconnection.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion man/furdeb-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions man/latitude_longitude_to_csquare.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions man/marine_area_overlay.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3223263

Please sign in to comment.