Merge pull request #883 from EnergySystemsModellingLab/give-all-assets-an-agent-id

Give candidate assets an agent ID

Author: alexdewar

src/asset.rs

@@ -45,9 +45,7 @@ pub struct AssetID(u32);
 /// `commission_future` or `commission_candidate` respectively.
 ///
 /// `Commissioned` assets can be decommissioned by calling `decommission`.
-#[derive(
-    Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Deserialize, Serialize, strum::Display,
-)]
+#[derive(Clone, Debug, PartialEq, strum::Display)]
 pub enum AssetState {
     /// The asset has been commissioned
     Commissioned {

src/simulation.rs

@@ -47,15 +47,11 @@ pub fn run(
 
     // Gather candidates for the next year, if any
     let next_year = year_iter.peek().copied();
-    let mut candidates = next_year
-        .map(|next_year| {
-            candidate_assets_for_year(
-                &model.processes,
-                next_year,
-                model.parameters.candidate_asset_capacity,
-            )
-        })
-        .unwrap_or_default();
+    let mut candidates = candidate_assets_for_next_year(
+        &model.processes,
+        next_year,
+        model.parameters.candidate_asset_capacity,
+    );
 
     // Run dispatch optimisation
     info!("Running dispatch optimisation...");
@@ -158,15 +154,11 @@ pub fn run(
 
         // Gather candidates for the next year, if any
         let next_year = year_iter.peek().copied();
-        candidates = next_year
-            .map(|next_year| {
-                candidate_assets_for_year(
-                    &model.processes,
-                    next_year,
-                    model.parameters.candidate_asset_capacity,
-                )
-            })
-            .unwrap_or_default();
+        candidates = candidate_assets_for_next_year(
+            &model.processes,
+            next_year,
+            model.parameters.candidate_asset_capacity,
+        );
 
         // Run dispatch optimisation
         info!("Running final dispatch optimisation for year {year}...");
@@ -218,23 +210,27 @@ fn run_dispatch_for_year(
 }
 
 /// Create candidate assets for all potential processes in a specified year
-fn candidate_assets_for_year(
+fn candidate_assets_for_next_year(
     processes: &ProcessMap,
-    year: u32,
+    next_year: Option<u32>,
     candidate_asset_capacity: Capacity,
 ) -> Vec<AssetRef> {
     let mut candidates = Vec::new();
+    let Some(next_year) = next_year else {
+        return candidates;
+    };
+
     for process in processes
         .values()
-        .filter(move |process| process.active_for_year(year))
+        .filter(move |process| process.active_for_year(next_year))
     {
         for region_id in &process.regions {
             candidates.push(
                 Asset::new_candidate(
                     Rc::clone(process),
                     region_id.clone(),
                     candidate_asset_capacity,
-                    year,
+                    next_year,
                 )
                 .unwrap()
                 .into(),

src/simulation/investment.rs

@@ -381,6 +381,7 @@ fn select_best_assets(
     );
 
     let mut round = 0;
+    let objective_type = &agent.objectives[&year];
     while is_any_remaining_demand(&demand) {
         ensure!(
             !opt_assets.is_empty(),
@@ -402,7 +403,7 @@ fn select_best_assets(
                 asset,
                 max_capacity,
                 commodity,
-                &agent.objectives[&year],
+                objective_type,
                 reduced_costs,
                 &demand,
             )?;