Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions benches/assets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use muse2::simulation::market::{
collect_agent_limits, get_demand_portion_for_market, get_responsible_agents,
};
use muse2::simulation::optimisation::DispatchRun;
use muse2::simulation::prices::{Prices, calculate_prices};
use muse2::simulation::prices::{Prices, calculate_prices_from_solutions};
use rayon::ThreadPoolBuilder;
use std::hint::black_box;
use std::sync::Arc;
Expand Down Expand Up @@ -106,10 +106,11 @@ fn calculate_seed_prices(
.run("bench setup: with candidates", writer)
.expect("Dispatch with candidates failed");

calculate_prices(
calculate_prices_from_solutions(
model,
&solution_existing,
&solution_with_candidates,
candidates,
BASE_YEAR,
)
.expect("Failed to calculate prices")
Expand Down
18 changes: 12 additions & 6 deletions src/simulation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::asset::{Asset, AssetPool, AssetRef};
use crate::model::Model;
use crate::output::DataWriter;
use crate::process::ProcessMap;
use crate::simulation::prices::{Prices, calculate_prices};
use crate::simulation::prices::{Prices, calculate_prices_from_solutions};
use crate::timeit::DispatchTimer;
use crate::units::Capacity;
use anyhow::{Context, Result};
Expand Down Expand Up @@ -221,13 +221,19 @@ fn run_dispatch_for_year(
solution_with_candidates.as_ref(),
) {
(None, None) => Prices::default(),
(Some(existing), None) => calculate_prices(model, existing, existing, year)?,
(Some(existing), Some(with_candidates)) => {
calculate_prices(model, existing, with_candidates, year)?
(Some(existing), None) => {
calculate_prices_from_solutions(model, existing, existing, candidates, year)?
}
(None, Some(with_candidates)) => {
calculate_prices(model, with_candidates, with_candidates, year)?
(Some(existing), Some(with_candidates)) => {
calculate_prices_from_solutions(model, existing, with_candidates, candidates, year)?
}
(None, Some(with_candidates)) => calculate_prices_from_solutions(
model,
with_candidates,
with_candidates,
candidates,
year,
)?,
};

Ok((prices, flow_map))
Expand Down
5 changes: 4 additions & 1 deletion src/simulation/activity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
use crate::asset::AssetRef;
use crate::commodity::CommodityID;
use crate::time_slice::TimeSliceID;
use crate::units::{Activity, Flow};
use crate::units::{Activity, Flow, MoneyPerActivity};
use indexmap::IndexMap;

/// A map of asset activities in each time slice
pub type ActivityMap = IndexMap<(AssetRef, TimeSliceID), Activity>;

/// A map of the dual values of asset activity constraints in each time slice
pub type ActivityDualMap = IndexMap<(AssetRef, TimeSliceID), MoneyPerActivity>;

/// A map of commodity flows for assets in each time slice
pub type FlowMap = IndexMap<(AssetRef, CommodityID, TimeSliceID), Flow>;

Expand Down
24 changes: 15 additions & 9 deletions src/simulation/optimisation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::model::Model;
use crate::output::DataWriter;
use crate::region::RegionID;
use crate::simulation::PriceMap;
use crate::simulation::activity::{FlowMap, create_flow_map};
use crate::simulation::activity::{ActivityDualMap, ActivityMap, FlowMap, create_flow_map};
use crate::simulation::investment::AllDemandMap;
use crate::time_slice::{TimeSliceID, TimeSliceInfo, TimeSliceSelection};
use crate::units::{Activity, Flow, Money, MoneyPerActivity, MoneyPerFlow};
Expand Down Expand Up @@ -200,6 +200,13 @@ impl Solution<'_> {
.map(|((asset, time_slice), &value)| (asset, time_slice, Activity(value)))
}

/// Activity for each existing asset, as an [`ActivityMap`]
pub fn activity_map_for_existing(&self) -> ActivityMap {
self.iter_activity_for_existing()
.map(|(asset, time_slice, activity)| ((asset.clone(), time_slice.clone()), activity))
.collect()
}

/// Activity for each candidate asset
pub fn iter_activity_for_candidates(
&self,
Expand All @@ -212,14 +219,6 @@ impl Solution<'_> {
.map(|((asset, time_slice), &value)| (asset, time_slice, Activity(value)))
}

/// Iterate over the keys for activity for each candidate asset
pub fn iter_activity_keys_for_candidates(
&self,
) -> impl Iterator<Item = (&AssetRef, &TimeSliceID)> {
self.iter_activity_for_candidates()
.map(|(asset, time_slice, _activity)| (asset, time_slice))
}

/// Iterate over unmet demand
pub fn iter_unmet_demand(
&self,
Expand Down Expand Up @@ -270,6 +269,13 @@ impl Solution<'_> {
})
}

/// Dual values for activity constraints, as an [`ActivityDualMap`]
pub fn activity_dual_map(&self) -> ActivityDualMap {
self.iter_activity_duals()
.map(|(asset, time_slice, dual)| ((asset.clone(), time_slice.clone()), dual))
.collect()
}

/// Keys and values for column duals.
pub fn iter_column_duals(
&self,
Expand Down
Loading
Loading