diff --git a/weaponry/src/database.rs b/weaponry/src/database.rs index ac8ccac..755a68c 100644 --- a/weaponry/src/database.rs +++ b/weaponry/src/database.rs @@ -34,16 +34,13 @@ fn generate_select_query( table_name: &str, filter: Option<&str>, ) -> String { - format!( - "SELECT {} FROM {}{};", - T::attributes_slice() - .iter() - .map(|(k, _v)| k.to_owned()) - .collect::>() - .join(","), - table_name, - filter.map_or_else(String::default, |j| " WHERE ".to_string() + j) - ) + let fields = T::attributes_slice() + .iter() + .map(|(k, _v)| k.to_owned()) + .collect::>() + .join(","); + let filter = filter.map_or_else(String::default, |j| " WHERE ".to_string() + j); + format!("SELECT {} FROM {}{};", fields, table_name, filter) } /// Generate create table_name with fields as columns diff --git a/weaponry/src/interfaces.rs b/weaponry/src/interfaces.rs index ba67fe1..bdafb57 100644 --- a/weaponry/src/interfaces.rs +++ b/weaponry/src/interfaces.rs @@ -61,24 +61,25 @@ where /// A blanket implementation giving all combinaisons of recipes with another RecipeCollection /// /// This method doesn't make use of parallel iterators as the workload is way faster than would be the memory dispatch + // #[coverage(off)] // Tarpaulin cannot deal with iter and long lines fn combine_all(&mut self, other: &G) where G: RecipeCollection, { self.assign_inner( self.ref_inner() - .iter() + .iter() // Iterate over every recipe .flat_map(|inner_recipes| { other - .ref_inner() - .iter() + .ref_inner() // Take a reference of recipe + .iter() // Iterate overe every recipe .filter(|&external_recipes| external_recipes.backward_filter(inner_recipes)) .map(|external_recipes: &Self::Recipes| { inner_recipes.add_ref_to_self(external_recipes) }) - .collect::>() - }) - .collect::>(), + .collect::>() // Collect all a vector of recipe + }) // Flatten all the vector of recipes into a big vector + .collect::>(), // Updates the inner collection to the collected recipes ); } diff --git a/weaponry/src/lib.rs b/weaponry/src/lib.rs index 8d2e64e..e035bd5 100644 --- a/weaponry/src/lib.rs +++ b/weaponry/src/lib.rs @@ -2,6 +2,7 @@ // File: weaponry/src/lib.rs //! Weaponry module, handling all weaponry creation and analysis +#![feature(coverage_attribute)] #![feature(int_roundings)] #![warn(missing_docs, clippy::missing_docs_in_private_items)] #![feature(iter_intersperse, generic_arg_infer)] diff --git a/weaponry/src/weaponry_structs/equipement_advanced_tools.rs b/weaponry/src/weaponry_structs/equipement_advanced_tools.rs index cec8a29..39d045b 100644 --- a/weaponry/src/weaponry_structs/equipement_advanced_tools.rs +++ b/weaponry/src/weaponry_structs/equipement_advanced_tools.rs @@ -81,7 +81,7 @@ pub(super) fn get_damage_with_simulation( precision: Precision(9), }, ]; - if value.speed >= 0 { + if (value.speed >= 5) || (value.range > 0) { turns.push(TurnInfo { actions, attacks, @@ -309,7 +309,10 @@ mod test { equipement_thin_types::{Actions, Attacks}, }; - use super::{BestDamageScenarios, Dices, Precision, binomial_dice_distribution}; + use super::{ + BestDamageScenarios, Dices, Precision, binomial_dice_distribution, + get_damage_with_simulation, + }; fn new_inner_eq() -> InnerEquipementStats { InnerEquipementStats { @@ -374,6 +377,7 @@ mod test { p_damage: 2, precision: 0, rmax: 2, + speed: 10, action_cost: 2, ..Default::default() }; @@ -382,6 +386,7 @@ mod test { p_damage: 2, precision: 0, rmax: 2, + range: 10, action_cost: 2, reload_cost: Some(2), ..Default::default() @@ -543,4 +548,68 @@ mod test { assert_close!(val.clone().map_or(0., |v| v.damage_done), res); }); } + + #[test] + fn test_scenario_damage() { + let eq1 = InnerEquipementStats { + damage: 10, + p_damage: 2, + precision: 0, + rmax: 2, + action_cost: 2, + ..Default::default() + }; + let eq2 = InnerEquipementStats { + damage: 10, + p_damage: 2, + precision: 0, + rmax: 2, + speed: 10, + action_cost: 2, + ..Default::default() + }; + let eq3 = InnerEquipementStats { + damage: 10, + p_damage: 2, + precision: 0, + rmax: 2, + range: 10, + action_cost: 2, + reload_cost: Some(2), + ..Default::default() + }; + assert_close!( + get_damage_with_simulation(&eq1, Actions(2), Attacks(1)), + 8.3998 + ); + assert_close!( + get_damage_with_simulation(&eq2, Actions(2), Attacks(1)), + 9.6936 + ); + assert_close!( + get_damage_with_simulation(&eq3, Actions(2), Attacks(1)), + 9.6936 + ); + } + #[test] + fn test_basic_impl_damage_scenario() { + let eq1 = InnerEquipementStats { + damage: 10, + p_damage: 2, + precision: 0, + rmax: 2, + action_cost: 2, + ..Default::default() + }; + let d1 = BestDamageScenarios::from_action_constraints_it( + &eq1, + Actions(2), + Attacks(2), + Dices(2), + Precision(2), + ) + .unwrap(); + let d2 = d1.clone() + d1; + let _deref_damage = *d2; + } } diff --git a/weaponry/src/weaponry_structs/equipement_structs.rs b/weaponry/src/weaponry_structs/equipement_structs.rs index c7a5a86..0014d36 100644 --- a/weaponry/src/weaponry_structs/equipement_structs.rs +++ b/weaponry/src/weaponry_structs/equipement_structs.rs @@ -61,8 +61,8 @@ pub(crate) fn filter_id_unique_and_right_category() (Some(a), Some(b)) => a.can_apply_onto(b), // TODO: Unsound to have a generic nature, this should be caught at serialisation // There is no target and the part about to be added is generic - (None, _) => panic!("The EqNature about to be added cannot be generic"), - (Some(_), None) => panic!("The part about to be added unto cannot be generic"), + (None, _) => false, //panic!("The part about to be added cannot be generic"), + (Some(_), None) => false, //panic!("The part about to be added unto cannot be generic"), } } } @@ -300,7 +300,7 @@ mod test { fn test_creating_all_equipements() { let shape = vec![EqShape::default().into(), EqShape::default().into()]; - let _nature: Vec = vec![EqNature::default().into(), EqNature::default().into()]; + // let _nature: Vec = vec![EqNature::default().into(), EqNature::default().into()]; let material = vec![EqMaterial::default().into(), EqMaterial::default().into()]; let finishing = vec![EqFinishing::default().into(), EqMaterial::default().into()];