Tranching refactor

docs/release_notes/upcoming.md

@@ -34,6 +34,8 @@ ready to be released, carry out the following steps:
 - Fix parsing and validation of agent search space file ([#1293])
 - Use shadow prices rather than market prices for appraisal optimisations and dispatch runs during
   investment ([#1349])
+- Updated input data validation to ensure `capacity_to_activity > 0`. Previously,
+ `capacity_to_activity = 0` was permitted.
 
 [highs-opts-docs]: ../developer_guide/custom_highs_options.md
 [#1259]: https://github.com/EnergySystemsModellingLab/MUSE2/pull/1259

schemas/input/processes.yaml

@@ -31,7 +31,7 @@ fields:
     description:
       Factor relating capacity units (e.g. GW) to activity units (e.g. PJ). It is the
       maximum activity per year for one unit of capacity.
-    notes: Must be >=0. Optional (defaults to 1.0).
+    notes: Must be >0. Optional (defaults to 1.0).
   - name: unit_size
     type: number
     description:

src/fixture.rs

@@ -4,7 +4,7 @@ use crate::agent::{
     Agent, AgentCommodityPortionsMap, AgentID, AgentMap, AgentObjectiveMap, AgentSearchSpaceMap,
     DecisionRule,
 };
-use crate::asset::{Asset, AssetCapacity, AssetPool, AssetRef};
+use crate::asset::{Asset, AssetPool, AssetRef};
 use crate::commodity::{
     Commodity, CommodityID, CommodityLevyMap, CommodityType, DemandMap, PricingStrategy,
 };
@@ -406,7 +406,6 @@ pub fn appraisal_output(asset: Asset, time_slice: TimeSliceID) -> AppraisalOutpu
     let unmet_demand = indexmap! { time_slice.clone() => Flow(5.0) };
     AppraisalOutput {
         asset: AssetRef::from(asset),
-        capacity: AssetCapacity::Continuous(Capacity(42.0)),
         coefficients: Rc::new(ObjectiveCoefficients {
             activity_coefficients,
             market_costs,

src/input/process.rs

@@ -157,8 +157,8 @@ where
 
         // Validate capacity_to_activity
         ensure!(
-            capacity_to_activity >= ActivityPerCapacity(0.0),
-            "Error in process {}: capacity_to_activity must be >= 0",
+            capacity_to_activity > ActivityPerCapacity(0.0),
+            "Error in process {}: capacity_to_activity must be > 0",
             process_raw.id
         );
 

src/output.rs

@@ -486,7 +486,7 @@ impl DebugDataWriter {
                 asset_id: result.asset.id(),
                 process_id: result.asset.process_id().clone(),
                 region_id: result.asset.region_id().clone(),
-                capacity: result.capacity.total_capacity(),
+                capacity: result.asset.capacity().total_capacity(),
                 metric: result.metric.as_ref().map(|m| m.value()),
             };
             self.appraisal_results_writer.serialize(row)?;
@@ -1183,7 +1183,7 @@ mod tests {
             asset_id: None,
             process_id: asset.process_id().clone(),
             region_id: asset.region_id().clone(),
-            capacity: Capacity(42.0),
+            capacity: Capacity(2.0),
             metric: Some(4.14),
         };
         let records: Vec<AppraisalResultsRow> =