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

Housing #267

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

Housing #267

wants to merge 12 commits into from

Conversation

EllieSherrardSmith
Copy link

Richard S and I have added functionality to 'adapt' housing to have a barrier and or killing impact on top of IRS and ITNs

EllieSherrardSmith added 11 commits September 29, 2023 11:08
…hat reduces the probability of being bitten, or successful biting, and increasing the repeating probability from a feeding attempt AND the option to increase outdoor biting as a consquence of the improved housing
but improving interpretability with names for processes
Copy link
Member

@giovannic giovannic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this!

The vignette doesn't run on the automated build. I've commented in line.

rs_comp <- 1 - rs
ss <- rep(1, n)
ss[protected_index] <- prob_survives_spraying(
ks_prime,
parameters$k0
)
} else {
phi_indoors <- 0
spray_on = 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
spray_on = 0
spray_on <- 0

@@ -65,37 +65,84 @@ prob_bitten <- function(
js_prime,
parameters$k0
)
spray_on = 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
spray_on = 1
spray_on <- 1

```{r, fig.align = 'center', out.width='100%'}
housingparams <- set_housing(
simparams,
timesteps = housingtimesteps,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be defined somewhere.

You can check that all the automated checks will pass with devtools::check

Previously we had added the pathway through prb_bitten_survives and prob_bitten including 1 minus rh to indicate fed mosquitoes and dead ones, and added sh twice. This was capturing the same part of the pathway twice so have removed 1 minus rh

we had missed the need for sh to be passed twice in the prob_repelled pathway so this is also now added

lines 103 to 118
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants