Initial work on adding documentation, reorganises modules

tests/common/data_getter.rs

@@ -1,6 +1,7 @@
-use pkmn_lib::dynamic_data::models::battle::Battle;
 use serde::Deserialize;
 
+use pkmn_lib::dynamic_data::Battle;
+
 #[derive(Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum TestDataGetter {

tests/common/library_loader.rs

@@ -1,22 +1,24 @@
+use std::convert::TryFrom;
+use std::fmt::Debug;
+use std::fs::File;
+use std::io::Read;
+
 use hashbrown::HashSet;
 use num_traits::PrimInt;
+use project_root::get_project_root;
+use serde_json::Value;
+
 use pkmn_lib::defines::LevelInt;
-use pkmn_lib::dynamic_data::libraries::battle_stat_calculator::BattleStatCalculator;
-use pkmn_lib::dynamic_data::libraries::damage_library::Gen7DamageLibrary;
-use pkmn_lib::dynamic_data::libraries::dynamic_library::DynamicLibrary;
-use pkmn_lib::dynamic_data::libraries::misc_library::Gen7MiscLibrary;
+use pkmn_lib::dynamic_data::DynamicLibrary;
+use pkmn_lib::dynamic_data::Gen7BattleStatCalculator;
+use pkmn_lib::dynamic_data::Gen7DamageLibrary;
+use pkmn_lib::dynamic_data::Gen7MiscLibrary;
 use pkmn_lib::static_data::{
     Ability, AbilityLibrary, BattleItemCategory, DataLibrary, EffectParameter, Form, GrowthRateLibrary, Item,
     ItemLibrary, LearnableMoves, LibrarySettings, LookupGrowthRate, MoveData, MoveLibrary, Nature, NatureLibrary,
     SecondaryEffect, Species, StaticData, StaticStatisticSet, Statistic, TypeLibrary,
 };
 use pkmn_lib::StringKey;
-use project_root::get_project_root;
-use serde_json::Value;
-use std::convert::TryFrom;
-use std::fmt::Debug;
-use std::fs::File;
-use std::io::Read;
 
 pub fn load_library() -> DynamicLibrary {
     let mut path = get_project_root().unwrap();
@@ -32,7 +34,7 @@ pub fn load_library() -> DynamicLibrary {
     load_species(&path, &mut data);
     let dynamic = DynamicLibrary::new(
         data,
-        BattleStatCalculator {},
+        Box::new(Gen7BattleStatCalculator {}),
         Box::new(Gen7DamageLibrary::new(false)),
         Box::new(Gen7MiscLibrary::new()),
     );

tests/common/test_case.rs

@@ -1,15 +1,18 @@
-use super::test_step::TestStep;
-use pkmn_lib::defines::LevelInt;
-use pkmn_lib::dynamic_data::libraries::dynamic_library::DynamicLibrary;
-use pkmn_lib::dynamic_data::models::battle::Battle;
-use pkmn_lib::dynamic_data::models::battle_party::BattleParty;
-use pkmn_lib::dynamic_data::models::pokemon::Pokemon;
-use pkmn_lib::dynamic_data::models::pokemon_builder::PokemonBuilder;
-use pkmn_lib::dynamic_data::models::pokemon_party::PokemonParty;
-use pkmn_lib::StringKey;
-use serde::Deserialize;
 use std::sync::Arc;
 
+use serde::Deserialize;
+
+use pkmn_lib::defines::LevelInt;
+use pkmn_lib::dynamic_data::Battle;
+use pkmn_lib::dynamic_data::BattleParty;
+use pkmn_lib::dynamic_data::DynamicLibrary;
+use pkmn_lib::dynamic_data::Pokemon;
+use pkmn_lib::dynamic_data::PokemonBuilder;
+use pkmn_lib::dynamic_data::PokemonParty;
+use pkmn_lib::StringKey;
+
+use super::test_step::TestStep;
+
 #[derive(Deserialize)]
 pub struct TestCase {
     pub name: String,

tests/common/test_step.rs

@@ -1,9 +1,11 @@
-use super::data_getter::TestDataGetter;
-use pkmn_lib::dynamic_data::choices::{MoveChoice, PassChoice, TurnChoice};
-use pkmn_lib::dynamic_data::models::battle::Battle;
-use pkmn_lib::StringKey;
 use serde::Deserialize;
 
+use pkmn_lib::dynamic_data::Battle;
+use pkmn_lib::dynamic_data::{MoveChoice, PassChoice, TurnChoice};
+use pkmn_lib::StringKey;
+
+use super::data_getter::TestDataGetter;
+
 #[derive(Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum TestStep {

tests/main.rs

@@ -2,13 +2,15 @@
 #![feature(once_cell)]
 #![test_runner(datatest::runner)]
 
-use crate::common::{library_loader, TestCase};
-use pkmn_lib::dynamic_data::libraries::dynamic_library::DynamicLibrary;
 use std::fs::File;
 use std::io::Read;
 use std::lazy::SyncLazy;
 use std::path::Path;
 
+use pkmn_lib::dynamic_data::DynamicLibrary;
+
+use crate::common::{library_loader, TestCase};
+
 pub mod common;
 
 static LIBRARY: SyncLazy<DynamicLibrary> = SyncLazy::new(|| {