Implement IDCollection for IndexMap

Author: alexdewar

src/id.rs

@@ -1,6 +1,6 @@
 //! Code for handling IDs
 use anyhow::{Context, Result};
-use indexmap::IndexSet;
+use indexmap::{IndexMap, IndexSet};
 use std::borrow::Borrow;
 use std::collections::HashSet;
 use std::fmt::Display;
@@ -105,3 +105,12 @@ impl<ID: IDLike> IDCollection<ID> for HashSet<ID> {
 impl<ID: IDLike> IDCollection<ID> for IndexSet<ID> {
     define_id_methods!();
 }
+
+impl<ID: IDLike, V> IDCollection<ID> for IndexMap<ID, V> {
+    fn get_id<T: Borrow<str> + Display + ?Sized>(&self, id: &T) -> Result<&ID> {
+        let (found, _) = self
+            .get_key_value(id.borrow())
+            .with_context(|| format!("Unknown ID {id} found"))?;
+        Ok(found)
+    }
+}

src/input/agent/commodity_portion.rs

@@ -2,6 +2,7 @@
 use super::super::*;
 use crate::agent::{AgentCommodityPortionsMap, AgentID, AgentMap};
 use crate::commodity::{CommodityID, CommodityMap, CommodityType};
+use crate::id::IDCollection;
 use crate::region::RegionID;
 use crate::year::parse_year_str;
 use anyhow::{ensure, Context, Result};
@@ -66,9 +67,7 @@ where
     for agent_commodity_portion_raw in iter {
         // Get agent ID
         let agent_id_raw = agent_commodity_portion_raw.agent_id.as_str();
-        let (id, _agent) = agents
-            .get_key_value(agent_id_raw)
-            .with_context(|| format!("Invalid agent ID {agent_id_raw}"))?;
+        let id = agents.get_id(agent_id_raw)?;
 
         // Get/create entry for agent
         let entry = agent_commodity_portions
@@ -77,9 +76,7 @@ where
 
         // Insert portion for the commodity/year(s)
         let commodity_id_raw = agent_commodity_portion_raw.commodity_id.as_str();
-        let (commodity_id, _commodity) = commodities
-            .get_key_value(commodity_id_raw)
-            .with_context(|| format!("Invalid commodity ID {commodity_id_raw}"))?;
+        let commodity_id = commodities.get_id(commodity_id_raw)?;
         let years = parse_year_str(&agent_commodity_portion_raw.years, milestone_years)?;
         for year in years {
             try_insert(

src/input/agent/search_space.rs

@@ -57,9 +57,7 @@ impl AgentSearchSpaceRaw {
         // Check that the year is a valid milestone year
         let year = parse_year_str(&self.years, milestone_years)?;
 
-        let (agent_id, _) = agents
-            .get_key_value(self.agent_id.as_str())
-            .context("Invalid agent ID")?;
+        let agent_id = agents.get_id(&self.agent_id)?;
 
         Ok(AgentSearchSpace {
             agent_id: agent_id.clone(),