Revert "Restructure"

This reverts commit ddec2e5.

Author: tsmbland

src/simulation/investment.rs

@@ -17,9 +17,8 @@ use log::debug;
 use std::collections::HashMap;
 
 pub mod appraisal;
-pub mod coefficients;
 use appraisal::appraise_investment;
-use coefficients::calculate_coefficients_for_assets;
+use appraisal::coefficients::calculate_coefficients_for_assets;
 
 /// A map of demand across time slices for a specific commodity and region
 type DemandMap = IndexMap<TimeSliceID, Flow>;

src/simulation/investment/appraisal.rs

@@ -1,6 +1,5 @@
 //! Calculation for investment tools such as Levelised Cost of X (LCOX) and Net Present Value (NPV).
 use super::DemandMap;
-use super::coefficients::ObjectiveCoefficients;
 use crate::agent::ObjectiveType;
 use crate::asset::AssetRef;
 use crate::commodity::Commodity;
@@ -9,8 +8,11 @@ use crate::model::Model;
 use crate::units::Capacity;
 use anyhow::Result;
 
+pub mod coefficients;
 mod constraints;
+mod costs;
 mod optimisation;
+use coefficients::ObjectiveCoefficients;
 use optimisation::perform_optimisation;
 
 /// The output of investment appraisal required to compare potential investment decisions

src/simulation/investment/coefficients.rs …ion/investment/appraisal/coefficients.rssrc/simulation/investment/coefficients.rs renamed to src/simulation/investment/appraisal/coefficients.rs src/simulation/investment/coefficients.rs renamed to src/simulation/investment/appraisal/coefficients.rs

@@ -1,4 +1,5 @@
 //! Calculation of cost coefficients for investment tools.
+use super::costs::{activity_cost, activity_surplus, annual_fixed_cost};
 use crate::agent::ObjectiveType;
 use crate::asset::AssetRef;
 use crate::model::Model;
@@ -8,12 +9,10 @@ use crate::units::{MoneyPerActivity, MoneyPerCapacity, MoneyPerFlow};
 use indexmap::IndexMap;
 use std::collections::HashMap;
 
-mod costs;
-use costs::{activity_cost, activity_surplus, annual_fixed_cost};
-
 /// Map storing cost coefficients for an asset.
 ///
 /// These are calculated according to the objective type of the agent owning the asset.
+/// Map storing coefficients for each variable
 #[derive(Clone)]
 pub struct ObjectiveCoefficients {
     /// Cost per unit of capacity
@@ -51,7 +50,7 @@ pub fn calculate_coefficients_for_assets(
 }
 
 /// Calculates the cost coefficients for LCOX.
-fn calculate_coefficients_for_lcox(
+pub fn calculate_coefficients_for_lcox(
     asset: &AssetRef,
     time_slice_info: &TimeSliceInfo,
     reduced_costs: &ReducedCosts,
@@ -78,7 +77,7 @@ fn calculate_coefficients_for_lcox(
 }
 
 /// Calculates the cost coefficients for NPV.
-fn calculate_coefficients_for_npv(
+pub fn calculate_coefficients_for_npv(
     asset: &AssetRef,
     time_slice_info: &TimeSliceInfo,
     reduced_costs: &ReducedCosts,

…ulation/investment/coefficients/costs.rs …simulation/investment/appraisal/costs.rssrc/simulation/investment/coefficients/costs.rs renamed to src/simulation/investment/appraisal/costs.rs src/simulation/investment/coefficients/costs.rs renamed to src/simulation/investment/appraisal/costs.rs

@@ -1,6 +1,6 @@
 //! Optimisation problem for investment tools.
-use super::super::coefficients::ObjectiveCoefficients;
 use super::DemandMap;
+use super::coefficients::ObjectiveCoefficients;
 use super::constraints::{
     add_activity_constraints, add_capacity_constraint, add_demand_constraints,
 };