Simpler method

Author: tsmbland

src/asset.rs

@@ -6,19 +6,20 @@ use crate::region::RegionID;
 use crate::time_slice::TimeSliceID;
 use anyhow::{ensure, Context, Result};
 use indexmap::IndexMap;
+use serde::{Deserialize, Serialize};
 use std::hash::{Hash, Hasher};
 use std::ops::{Deref, RangeInclusive};
 use std::rc::Rc;
 
 /// A unique identifier for an asset
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Deserialize, Serialize)]
 pub struct AssetID(u32);
 
 /// An asset controlled by an agent.
 #[derive(Clone, Debug, PartialEq)]
 pub struct Asset {
     /// A unique identifier for the asset
-    id: Option<AssetID>,
+    pub id: Option<AssetID>,
     /// A unique identifier for the agent
     pub agent_id: AgentID,
     /// The [`Process`] that this asset corresponds to
@@ -34,11 +35,6 @@ pub struct Asset {
 }
 
 impl Asset {
-    /// Get the asset's ID as a u32
-    pub fn get_id(&self) -> Option<u32> {
-        self.id.map(|AssetID(id)| id)
-    }
-
     /// Create a new [`Asset`].
     ///
     /// The `id` field is initially set to `None`, but is changed to a unique value when the asset

src/output.rs

@@ -1,6 +1,6 @@
 //! The module responsible for writing output data to disk.
 use crate::agent::AgentID;
-use crate::asset::{Asset, AssetRef};
+use crate::asset::{Asset, AssetID, AssetRef};
 use crate::commodity::CommodityID;
 use crate::process::ProcessID;
 use crate::region::RegionID;
@@ -70,7 +70,7 @@ pub fn create_output_directory(output_dir: &Path) -> Result<()> {
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 struct AssetRow {
     milestone_year: u32,
-    asset_id: u32,
+    asset_id: AssetID,
     process_id: ProcessID,
     region_id: RegionID,
     agent_id: AgentID,
@@ -82,7 +82,7 @@ impl AssetRow {
     fn new(milestone_year: u32, asset: &Asset) -> Self {
         Self {
             milestone_year,
-            asset_id: asset.get_id().unwrap(),
+            asset_id: asset.id.unwrap(),
             process_id: asset.process.id.clone(),
             region_id: asset.region_id.clone(),
             agent_id: asset.agent_id.clone(),
@@ -95,7 +95,7 @@ impl AssetRow {
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 struct CommodityFlowRow {
     milestone_year: u32,
-    asset_id: u32,
+    asset_id: AssetID,
     commodity_id: CommodityID,
     time_slice: TimeSliceID,
     flow: f64,
@@ -115,7 +115,7 @@ struct CommodityPriceRow {
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 struct CapacityDualsRow {
     milestone_year: u32,
-    asset_id: u32,
+    asset_id: AssetID,
     time_slice: TimeSliceID,
     value: f64,
 }
@@ -183,7 +183,7 @@ impl DebugDataWriter {
         for (asset, time_slice, value) in iter {
             let row = CapacityDualsRow {
                 milestone_year,
-                asset_id: asset.get_id().unwrap(),
+                asset_id: asset.id.unwrap(),
                 time_slice: time_slice.clone(),
                 value,
             };
@@ -278,7 +278,7 @@ impl DataWriter {
         for ((asset, commodity_id, time_slice), flow) in flow_map {
             let row = CommodityFlowRow {
                 milestone_year,
-                asset_id: asset.get_id().unwrap(),
+                asset_id: asset.id.unwrap(),
                 commodity_id: commodity_id.clone(),
                 time_slice: time_slice.clone(),
                 flow: *flow,
@@ -381,7 +381,7 @@ mod tests {
         // Read back and compare
         let expected = CommodityFlowRow {
             milestone_year,
-            asset_id: asset.get_id().unwrap(),
+            asset_id: asset.id.unwrap(),
             commodity_id,
             time_slice,
             flow: 42.0,
@@ -486,7 +486,7 @@ mod tests {
         // Read back and compare
         let expected = CapacityDualsRow {
             milestone_year,
-            asset_id: asset.get_id().unwrap(),
+            asset_id: asset.id.unwrap(),
             time_slice,
             value,
         };