Use ProcessMap to represent processes everywhere in input code

Author: alexdewar

src/input/process.rs

@@ -11,6 +11,7 @@ use itertools::iproduct;
 use serde::Deserialize;
 use std::collections::{HashMap, HashSet};
 use std::path::Path;
+use std::rc::Rc;
 
 mod availability;
 use availability::read_process_availabilities;
@@ -69,6 +70,8 @@ pub fn read_processes(
 
     // Add data to Process objects
     for (id, process) in processes.iter_mut() {
+        // This will always succeed as we know there will only be one reference to the process here
+        let process = Rc::get_mut(process).unwrap();
         process.activity_limits = activity_limits
             .remove(id)
             .with_context(|| format!("Missing availabilities for process {id}"))?;
@@ -80,20 +83,14 @@ pub fn read_processes(
             .with_context(|| format!("Missing parameters for process {id}"))?;
     }
 
-    // Create ProcessMap
-    let mut process_map = ProcessMap::new();
-    for (id, process) in processes {
-        process_map.insert(id, process.into());
-    }
-
-    Ok(process_map)
+    Ok(processes)
 }
 
 fn read_processes_file(
     model_dir: &Path,
     milestone_years: &[u32],
     region_ids: &HashSet<RegionID>,
-) -> Result<HashMap<ProcessID, Process>> {
+) -> Result<ProcessMap> {
     let file_path = model_dir.join(PROCESSES_FILE_NAME);
     let processes_csv = read_csv(&file_path)?;
     read_processes_file_from_iter(processes_csv, milestone_years, region_ids)
@@ -104,11 +101,11 @@ fn read_processes_file_from_iter<I>(
     iter: I,
     milestone_years: &[u32],
     region_ids: &HashSet<RegionID>,
-) -> Result<HashMap<ProcessID, Process>>
+) -> Result<ProcessMap>
 where
     I: Iterator<Item = ProcessRaw>,
 {
-    let mut processes = HashMap::new();
+    let mut processes = ProcessMap::new();
     for process_raw in iter {
         let start_year = process_raw.start_year.unwrap_or(milestone_years[0]);
         let end_year = process_raw
@@ -143,7 +140,7 @@ where
         };
 
         ensure!(
-            processes.insert(process_raw.id, process).is_none(),
+            processes.insert(process_raw.id, process.into()).is_none(),
             "Duplicate process ID"
         );
     }

src/input/process/availability.rs

@@ -1,6 +1,6 @@
 //! Code for reading process availabilities CSV file
 use super::super::*;
-use crate::process::{Process, ProcessActivityLimitsMap, ProcessID};
+use crate::process::{ProcessActivityLimitsMap, ProcessID, ProcessMap};
 use crate::region::parse_region_str;
 use crate::time_slice::TimeSliceInfo;
 use crate::year::parse_year_str;
@@ -77,7 +77,7 @@ enum LimitType {
 /// error.
 pub fn read_process_availabilities(
     model_dir: &Path,
-    processes: &HashMap<ProcessID, Process>,
+    processes: &ProcessMap,
     time_slice_info: &TimeSliceInfo,
 ) -> Result<HashMap<ProcessID, ProcessActivityLimitsMap>> {
     let file_path = model_dir.join(PROCESS_AVAILABILITIES_FILE_NAME);
@@ -89,7 +89,7 @@ pub fn read_process_availabilities(
 /// Process raw process availabilities input data into [`ProcessActivityLimitsMap`]s
 fn read_process_availabilities_from_iter<I>(
     iter: I,
-    processes: &HashMap<ProcessID, Process>,
+    processes: &ProcessMap,
     time_slice_info: &TimeSliceInfo,
 ) -> Result<HashMap<ProcessID, ProcessActivityLimitsMap>>
 where
@@ -147,7 +147,7 @@ where
 /// Check that the activity limits cover every time slice and all regions/years of the process
 fn validate_activity_limits_maps(
     map: &HashMap<ProcessID, ProcessActivityLimitsMap>,
-    processes: &HashMap<ProcessID, Process>,
+    processes: &ProcessMap,
     time_slice_info: &TimeSliceInfo,
 ) -> Result<()> {
     for (process_id, map) in map.iter() {

src/input/process/flow.rs

@@ -1,7 +1,7 @@
 //! Code for reading process flows file
 use super::super::*;
 use crate::commodity::CommodityMap;
-use crate::process::{FlowType, Process, ProcessFlow, ProcessFlowsMap, ProcessID};
+use crate::process::{FlowType, Process, ProcessFlow, ProcessFlowsMap, ProcessID, ProcessMap};
 use crate::region::parse_region_str;
 use crate::year::parse_year_str;
 use anyhow::{ensure, Context, Result};
@@ -55,7 +55,7 @@ impl ProcessFlowRaw {
 /// Read process flows from a CSV file
 pub fn read_process_flows(
     model_dir: &Path,
-    processes: &HashMap<ProcessID, Process>,
+    processes: &ProcessMap,
     commodities: &CommodityMap,
 ) -> Result<HashMap<ProcessID, ProcessFlowsMap>> {
     let file_path = model_dir.join(PROCESS_FLOWS_FILE_NAME);
@@ -67,7 +67,7 @@ pub fn read_process_flows(
 /// Read 'ProcessFlowRaw' records from an iterator and convert them into 'ProcessFlow' records.
 fn read_process_flows_from_iter<I>(
     iter: I,
-    processes: &HashMap<ProcessID, Process>,
+    processes: &ProcessMap,
     commodities: &CommodityMap,
 ) -> Result<HashMap<ProcessID, ProcessFlowsMap>>
 where

src/input/process/parameter.rs

@@ -1,6 +1,6 @@
 //! Code for reading process parameters CSV file
 use super::super::*;
-use crate::process::{Process, ProcessID, ProcessParameter, ProcessParameterMap};
+use crate::process::{ProcessID, ProcessMap, ProcessParameter, ProcessParameterMap};
 use crate::region::parse_region_str;
 use crate::year::parse_year_str;
 use ::log::warn;
@@ -95,7 +95,7 @@ impl ProcessParameterRaw {
 /// Read process parameters from the specified model directory
 pub fn read_process_parameters(
     model_dir: &Path,
-    processes: &HashMap<ProcessID, Process>,
+    processes: &ProcessMap,
 ) -> Result<HashMap<ProcessID, ProcessParameterMap>> {
     let file_path = model_dir.join(PROCESS_PARAMETERS_FILE_NAME);
     let iter = read_csv::<ProcessParameterRaw>(&file_path)?;
@@ -104,7 +104,7 @@ pub fn read_process_parameters(
 
 fn read_process_parameters_from_iter<I>(
     iter: I,
-    processes: &HashMap<ProcessID, Process>,
+    processes: &ProcessMap,
 ) -> Result<HashMap<ProcessID, ProcessParameterMap>>
 where
     I: Iterator<Item = ProcessParameterRaw>,