Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
sit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
UMR-ASTRE
sit
Commits
6f3257e7
Commit
6f3257e7
authored
2 years ago
by
Facundo Muñoz
Browse files
Options
Downloads
Patches
Plain Diff
Override check causing conflicts between dm and sf.
parent
7f49106e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
DESCRIPTION
+3
-3
3 additions, 3 deletions
DESCRIPTION
R/sit.R
+3
-3
3 additions, 3 deletions
R/sit.R
with
6 additions
and
6 deletions
DESCRIPTION
+
3
−
3
View file @
6f3257e7
...
...
@@ -2,14 +2,14 @@ Package: sit
Type: Package
Title: Analyse Mark-Release-Recapture Data from Sterile Insect
Technique (SIT) Field Experiments
Version: 1.1.2.900
4
Version: 1.1.2.900
5
Authors@R: c(person("Françoise", "Chirara", email =
"francoise.chirara@cirad.fr", role = c("ctb"), comment = "Logo
designer"), person("Facundo", "Muñoz", email =
"facundo.munoz@cirad.fr", role = c("aut", "cre"), comment =
c("Package developer", ORCID = "0000-0002-5061-4241")),
person("Joint FAO/IAEA Centre of Nuclear Techniques in Food and
Agriculture",
role = c("fnd", "cph")))
person("Joint FAO/IAEA Centre of Nuclear Techniques in Food and
Agriculture",
role = c("fnd", "cph")))
Description: Import field data about the study design such as the
location and types of adult and egg traps, the release events,
the trap surveys and the egg hatches. Provide functions to
...
...
This diff is collapsed.
Click to expand it.
R/sit.R
+
3
−
3
View file @
6f3257e7
...
...
@@ -197,8 +197,8 @@ sit <- function(traps, release_events, adult_surveys = NULL, egg_surveys = NULL)
ans
<-
dm_add_pk
(
ans
,
trap_types
,
"id"
,
check
=
TRUE
)
## Specify foreign keys and check correspondence
ans
<-
dm_add_fk
(
ans
,
egg_surveys
,
"trap_id"
,
traps
,
check
=
TRU
E
)
ans
<-
dm_add_fk
(
ans
,
adult_surveys
,
"trap_id"
,
traps
,
check
=
TRU
E
)
ans
<-
dm_add_fk
(
ans
,
egg_surveys
,
"trap_id"
,
traps
,
check
=
FALS
E
)
ans
<-
dm_add_fk
(
ans
,
adult_surveys
,
"trap_id"
,
traps
,
check
=
FALS
E
)
ans
<-
dm_add_fk
(
ans
,
adult_surveys
,
...
...
@@ -208,7 +208,7 @@ sit <- function(traps, release_events, adult_surveys = NULL, egg_surveys = NULL)
## populations, which are not present in table release_events.
check
=
FALSE
)
ans
<-
dm_add_fk
(
ans
,
release_events
,
"site_id"
,
release_sites
,
check
=
TRU
E
)
ans
<-
dm_add_fk
(
ans
,
release_events
,
"site_id"
,
release_sites
,
check
=
FALS
E
)
## Avoid checking for consistency. Problematic since traps is `sf`
## https://github.com/cynkra/dm/issues/705
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment