Amalgamate get_id_by_str with get_id

Author: alexdewar

src/id.rs

@@ -75,39 +75,21 @@ pub(crate) use define_id_getter;
 
 /// A data structure containing a set of IDs
 pub trait IDCollection<ID: IDLike> {
-    /// Get the ID from the collection by its string representation.
-    ///
-    /// # Arguments
-    ///
-    /// * `id` - The string representation of the ID
-    ///
-    /// # Returns
-    ///
-    /// A copy of the ID in `self`, or an error if not found.
-    fn get_id_by_str(&self, id: &str) -> Result<ID>;
-
     /// Check if the ID is in the collection, returning a copy of it if found.
     ///
     /// # Arguments
     ///
-    /// * `id` - The ID to check
+    /// * `id` - The ID to check (can be string or ID type)
     ///
     /// # Returns
     ///
     /// A copy of the ID in `self`, or an error if not found.
-    fn get_id(&self, id: &ID) -> Result<ID>;
+    fn get_id<T: Borrow<str> + Display + ?Sized>(&self, id: &T) -> Result<ID>;
 }
 
 macro_rules! define_id_methods {
     () => {
-        fn get_id_by_str(&self, id: &str) -> Result<ID> {
-            let found = self
-                .get(id)
-                .with_context(|| format!("Unknown ID {id} found"))?;
-            Ok(found.clone())
-        }
-
-        fn get_id(&self, id: &ID) -> Result<ID> {
+        fn get_id<T: Borrow<str> + Display + ?Sized>(&self, id: &T) -> Result<ID> {
             let found = self
                 .get(id.borrow())
                 .with_context(|| format!("Unknown ID {id} found"))?;

src/input/agent/cost_limit.rs

@@ -61,7 +61,7 @@ where
         let years = parse_year_str(&agent_cost_limits_raw.years, milestone_years)?;
 
         // Get agent ID
-        let agent_id = agent_ids.get_id_by_str(&agent_cost_limits_raw.agent_id)?;
+        let agent_id = agent_ids.get_id(&agent_cost_limits_raw.agent_id)?;
 
         // Get or create entry in the map
         let entry = map.entry(agent_id.clone()).or_default();

src/input/agent/search_space.rs

@@ -52,7 +52,7 @@ impl AgentSearchSpaceRaw {
         let search_space = Rc::new(parse_search_space_str(&self.search_space, process_ids)?);
 
         // Get commodity
-        let commodity_id = commodity_ids.get_id_by_str(&self.commodity_id)?;
+        let commodity_id = commodity_ids.get_id(&self.commodity_id)?;
 
         // Check that the year is a valid milestone year
         let year = parse_year_str(&self.years, milestone_years)?;
@@ -86,7 +86,7 @@ fn parse_search_space_str(
     } else {
         search_space
             .split(';')
-            .map(|id| process_ids.get_id_by_str(id.trim()))
+            .map(|id| process_ids.get_id(id.trim()))
             .try_collect()
     }
 }

src/input/asset.rs

@@ -69,11 +69,11 @@ where
     I: Iterator<Item = AssetRaw>,
 {
     iter.map(|asset| -> Result<_> {
-        let agent_id = agent_ids.get_id_by_str(&asset.agent_id)?;
+        let agent_id = agent_ids.get_id(&asset.agent_id)?;
         let process = processes
             .get(asset.process_id.as_str())
             .with_context(|| format!("Invalid process ID: {}", &asset.process_id))?;
-        let region_id = region_ids.get_id_by_str(&asset.region_id)?;
+        let region_id = region_ids.get_id(&asset.region_id)?;
 
         Asset::new(
             agent_id,

src/input/commodity/cost.rs

@@ -78,7 +78,7 @@ where
     let mut commodity_regions: HashMap<CommodityID, HashSet<RegionID>> = HashMap::new();
 
     for cost in iter {
-        let commodity_id = commodity_ids.get_id_by_str(&cost.commodity_id)?;
+        let commodity_id = commodity_ids.get_id(&cost.commodity_id)?;
         let regions = parse_region_str(&cost.regions, region_ids)?;
         let years = parse_year_str(&cost.years, milestone_years)?;
         let ts_selection = time_slice_info.get_selection(&cost.time_slice)?;

src/input/commodity/demand.rs

@@ -110,14 +110,14 @@ where
     let mut map = AnnualDemandMap::new();
     for demand in iter {
         let commodity_id = svd_commodity_ids
-            .get_id_by_str(&demand.commodity_id)
+            .get_id(&demand.commodity_id)
             .with_context(|| {
                 format!(
                     "Can only provide demand data for SVD commodities. Found entry for '{}'",
                     demand.commodity_id
                 )
             })?;
-        let region_id = region_ids.get_id_by_str(&demand.region_id)?;
+        let region_id = region_ids.get_id(&demand.region_id)?;
 
         ensure!(
             milestone_years.binary_search(&demand.year).is_ok(),

src/input/commodity/demand_slicing.rs

@@ -64,14 +64,14 @@ where
 
     for slice in iter {
         let commodity_id = svd_commodity_ids
-            .get_id_by_str(&slice.commodity_id)
+            .get_id(&slice.commodity_id)
             .with_context(|| {
                 format!(
                     "Can only provide demand slice data for SVD commodities. Found entry for '{}'",
                     slice.commodity_id
                 )
             })?;
-        let region_id = region_ids.get_id_by_str(&slice.region_id)?;
+        let region_id = region_ids.get_id(&slice.region_id)?;
 
         // We need to know how many time slices are covered by the current demand slice entry and
         // how long they are relative to one another so that we can divide up the demand for this

src/input/process/availability.rs

@@ -109,7 +109,7 @@ where
         record.validate()?;
 
         // Get process
-        let id = process_ids.get_id_by_str(&record.process_id)?;
+        let id = process_ids.get_id(&record.process_id)?;
         let process = processes
             .get(&id)
             .with_context(|| format!("Process {id} not found"))?;

src/input/process/flow.rs

@@ -82,7 +82,7 @@ where
         record.validate()?;
 
         // Get process
-        let id = process_ids.get_id_by_str(&record.process_id)?;
+        let id = process_ids.get_id(&record.process_id)?;
         let process = processes
             .get(&id)
             .with_context(|| format!("Process {id} not found"))?;

src/input/process/parameter.rs

@@ -117,7 +117,7 @@ where
     let mut map: HashMap<ProcessID, ProcessParameterMap> = HashMap::new();
     for param_raw in iter {
         // Get process
-        let id = process_ids.get_id_by_str(&param_raw.process_id)?;
+        let id = process_ids.get_id(&param_raw.process_id)?;
         let process = processes
             .get(&id)
             .with_context(|| format!("Process {id} not found"))?;