Skip to content

Use IndexMap rather than BTreeMap for commodity prices #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexdewar merged 1 commit into from
Dec 19, 2025
Merged

Use IndexMap rather than BTreeMap for commodity prices #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions src/simulation/prices.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ use crate::simulation::optimisation::Solution;
use crate::time_slice::{TimeSliceID, TimeSliceInfo, TimeSliceSelection};
use crate::units::{Activity, Dimensionless, MoneyPerActivity, MoneyPerFlow, Year};
use anyhow::Result;
use indexmap::IndexMap;
use itertools::iproduct;
use std::collections::{BTreeMap, HashMap, HashSet, btree_map};
use std::collections::{HashMap, HashSet};

/// Iterator item type for asset activity iterators
type Item<'a> = (&'a AssetRef, &'a TimeSliceID, Activity);
Expand Down Expand Up @@ -98,7 +99,7 @@ pub fn calculate_prices(model: &Model, solution: &Solution, year: u32) -> Result

/// A map relating commodity ID + region + time slice to current price (endogenous)
#[derive(Default, Clone)]
pub struct CommodityPrices(BTreeMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow>);
pub struct CommodityPrices(IndexMap<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow>);

impl CommodityPrices {
/// Insert a price for the given commodity, region and time slice
Expand Down Expand Up @@ -150,7 +151,9 @@ impl CommodityPrices {
}

/// Iterate over the price map's keys
pub fn keys(&self) -> btree_map::Keys<'_, (CommodityID, RegionID, TimeSliceID), MoneyPerFlow> {
pub fn keys(
&self,
) -> indexmap::map::Keys<'_, (CommodityID, RegionID, TimeSliceID), MoneyPerFlow> {
self.0.keys()
}

Expand Down Expand Up @@ -236,8 +239,7 @@ impl<'a> FromIterator<(&'a CommodityID, &'a RegionID, &'a TimeSliceID, MoneyPerF

impl IntoIterator for CommodityPrices {
type Item = ((CommodityID, RegionID, TimeSliceID), MoneyPerFlow);
type IntoIter =
std::collections::btree_map::IntoIter<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow>;
type IntoIter = indexmap::map::IntoIter<(CommodityID, RegionID, TimeSliceID), MoneyPerFlow>;

fn into_iter(self) -> Self::IntoIter {
self.0.into_iter()
Expand Down
Loading