From c965569d2f16a3c35de044afb285795e3b13d7e5 Mon Sep 17 00:00:00 2001 From: Mossa Date: Sun, 9 May 2021 23:21:50 +0200 Subject: [PATCH] Added minor edits just to make clippy happier. --- src/disease_ecs_diagnostic.rs | 4 ++++ src/main.rs | 10 ++++------ src/regulator_active_surveillance/tests.rs | 1 - src/repopulation_by_scaling.rs | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/disease_ecs_diagnostic.rs b/src/disease_ecs_diagnostic.rs index 28ffbe5..d954b96 100644 --- a/src/disease_ecs_diagnostic.rs +++ b/src/disease_ecs_diagnostic.rs @@ -6,8 +6,10 @@ use epi_bevy::{ sir_spread_model::{self, Infected, Susceptible}, }; + /// Printing the disease states whenever invoked. These disease states corresponds /// to [DiseaseCompartments]. +#[allow(dead_code)] fn print_population_disease_states_at_app_exit( tick: Res, query: Query<(&Infected, &Susceptible)>, @@ -28,6 +30,7 @@ fn print_population_disease_states_at_app_exit( /// Print disease states if infected state every half a second; #[deprecated(note = "please use run criteria to handle when systems are run.")] +#[allow(dead_code)] fn log_every_half_second( query: Query<( &FarmId, @@ -50,6 +53,7 @@ fn log_every_half_second( } /// Print disease states if infected state has changed. +#[allow(dead_code)] fn log_changes_in_infected( query: Query< ( diff --git a/src/main.rs b/src/main.rs index 361dd06..d253333 100644 --- a/src/main.rs +++ b/src/main.rs @@ -50,8 +50,7 @@ use bevy::{ log::LogPlugin, }; -use epi_bevy::between_herd_spread_model::print_between_herd_infection_events; -use epi_bevy::cattle_population::{FarmId, HerdSize}; +use epi_bevy::cattle_population::FarmId; use epi_bevy::scenario_time::ScenarioTime; use epi_bevy::sir_spread_model::{ DiseaseCompartments, DiseaseParameters as WithinHerdDiseaseParameters, @@ -154,16 +153,15 @@ fn main() { //FIXME: this is currently unused max_repetitions: 2, }) - // .insert_resource(WithinHerdDiseaseParameters::new(0.0013, 0.008333)) + .insert_resource(WithinHerdDiseaseParameters::new(0.0013, 0.008333)) // .insert_resource(WithinHerdDiseaseParameters::new(0.0013, 0.008333)) //TODO: this block adds parameters, but what I'd ideally want is for the SceneConfiguration to add // them. So is there such a thing as a Bundle of Resources? - .insert_resource(WithinHerdDiseaseParameters::new(0.003, 0.00001)) + // .insert_resource(WithinHerdDiseaseParameters::new(0.003, 0.00001)) // .insert_resource(between_herd_spread_model::ContactRate::new(0.095)) .insert_resource(between_herd_spread_model::ContactRate::new(Rate::new(10.).unwrap())) - .insert_resource(DetectionRate::new( - Rate::try_from(Probability::new(0.0031).unwrap()).unwrap(), + Rate::try_from(Probability::new(0.00031).unwrap()).unwrap(), )) .insert_resource(RemainingProportion::new(Probability::new(0.10).unwrap())) // .insert_resource(DetectionRatePerAnimal(Rate::try_from(Probability::new(0.5).unwrap()).unwrap())) diff --git a/src/regulator_active_surveillance/tests.rs b/src/regulator_active_surveillance/tests.rs index f43b668..cd98a70 100644 --- a/src/regulator_active_surveillance/tests.rs +++ b/src/regulator_active_surveillance/tests.rs @@ -1,5 +1,4 @@ use rand::SeedableRng; - use super::*; #[test] diff --git a/src/repopulation_by_scaling.rs b/src/repopulation_by_scaling.rs index b855cb3..2bd89be 100644 --- a/src/repopulation_by_scaling.rs +++ b/src/repopulation_by_scaling.rs @@ -20,7 +20,7 @@ use crate::{ /// This is intermittently linked with the disease spread model on the within /// herd part and thus couldn't really be updated without some knowledge - +#[allow(dead_code)] fn repopulate_rescale_disease_compartments( mut query: Query<(&mut Susceptible, &mut Infected, &mut Recovered, &HerdSize)>, ) {