Drop demand field from AppraisalOutput

The demand map is the same for all `AppraisalOutput`s for a given appraisal iteration, so there's no need to store it. If many assets are being appraised, it could result in many clones.

Author: alexdewar

src/fixture.rs

@@ -382,7 +382,6 @@ pub fn time_slice_info2() -> TimeSliceInfo {
 pub fn appraisal_output(asset: Asset, time_slice: TimeSliceID) -> AppraisalOutput {
     let activity_coefficients = indexmap! { time_slice.clone() => MoneyPerActivity(0.5) };
     let activity = indexmap! { time_slice.clone() => Activity(10.0) };
-    let demand = indexmap! { time_slice.clone() => Flow(100.0) };
     let unmet_demand = indexmap! { time_slice.clone() => Flow(5.0) };
     AppraisalOutput {
         asset: AssetRef::from(asset),
@@ -393,7 +392,6 @@ pub fn appraisal_output(asset: Asset, time_slice: TimeSliceID) -> AppraisalOutpu
             unmet_demand_coefficient: MoneyPerFlow(10000.0),
         },
         activity,
-        demand,
         unmet_demand,
         metric: Box::new(LCOXMetric::new(MoneyPerActivity(4.14))),
     }

src/output.rs

@@ -467,11 +467,12 @@ impl DebugDataWriter {
         milestone_year: u32,
         run_description: &str,
         appraisal_results: &[AppraisalOutput],
+        demand: &IndexMap<TimeSliceID, Flow>,
     ) -> Result<()> {
         for result in appraisal_results {
             for (time_slice, activity) in &result.activity {
                 let activity_coefficient = result.coefficients.activity_coefficients[time_slice];
-                let demand = result.demand[time_slice];
+                let demand = demand[time_slice];
                 let unmet_demand = result.unmet_demand[time_slice];
                 let row = AppraisalResultsTimeSliceRow {
                     milestone_year,
@@ -564,13 +565,15 @@ impl DataWriter {
         milestone_year: u32,
         run_description: &str,
         appraisal_results: &[AppraisalOutput],
+        demand: &IndexMap<TimeSliceID, Flow>,
     ) -> Result<()> {
         if let Some(wtr) = &mut self.debug_writer {
             wtr.write_appraisal_results(milestone_year, run_description, appraisal_results)?;
             wtr.write_appraisal_time_slice_results(
                 milestone_year,
                 run_description,
                 appraisal_results,
+                demand,
             )?;
         }
 
@@ -1006,6 +1009,7 @@ mod tests {
         let milestone_year = 2020;
         let run_description = "test_run".to_string();
         let dir = tempdir().unwrap();
+        let demand = indexmap! {time_slice.clone() => Flow(100.0) };
 
         // Write appraisal time slice results
         {
@@ -1015,6 +1019,7 @@ mod tests {
                     milestone_year,
                     &run_description,
                     &[appraisal_output],
+                    &demand,
                 )
                 .unwrap();
             writer.flush().unwrap();

src/simulation/investment.rs

@@ -796,6 +796,7 @@ fn select_best_assets(
             year,
             &format!("{} {} round {}", &commodity.id, &agent.id, round),
             &outputs_for_opts,
+            &demand,
         )?;
 
         sort_appraisal_outputs_by_investment_priority(&mut outputs_for_opts);

src/simulation/investment/appraisal.rs

@@ -61,8 +61,6 @@ pub struct AppraisalOutput {
     pub metric: Box<dyn MetricTrait>,
     /// Capacity and activity coefficients used in the appraisal
     pub coefficients: ObjectiveCoefficients,
-    /// Demand profile used in the appraisal
-    pub demand: DemandMap,
 }
 
 impl AppraisalOutput {
@@ -252,7 +250,6 @@ fn calculate_lcox(
         unmet_demand: results.unmet_demand,
         metric: Box::new(LCOXMetric::new(cost_index)),
         coefficients: coefficients.clone(),
-        demand: demand.clone(),
     })
 }
 
@@ -299,7 +296,6 @@ fn calculate_npv(
         unmet_demand: results.unmet_demand,
         metric: Box::new(NPVMetric::new(profitability_index)),
         coefficients: coefficients.clone(),
-        demand: demand.clone(),
     })
 }
 
@@ -557,7 +553,6 @@ mod tests {
                     unmet_demand_coefficient: MoneyPerFlow(0.0),
                 },
                 activity: IndexMap::new(),
-                demand: IndexMap::new(),
                 unmet_demand: IndexMap::new(),
                 metric,
             })
@@ -887,7 +882,6 @@ mod tests {
                     unmet_demand_coefficient: MoneyPerFlow(0.0),
                 },
                 activity: IndexMap::new(),
-                demand: IndexMap::new(),
                 unmet_demand: IndexMap::new(),
                 metric,
             })