Add back ironing out loop

Author: tsmbland

src/model/parameters.rs

@@ -47,7 +47,7 @@ define_unit_param_default!(default_candidate_asset_capacity, Capacity, 0.0001);
 define_unit_param_default!(default_capacity_limit_factor, Dimensionless, 0.1);
 define_unit_param_default!(default_value_of_lost_load, MoneyPerFlow, 1e9);
 define_unit_param_default!(default_price_tolerance, Dimensionless, 1e-6);
-define_param_default!(default_max_ironing_out_iterations, u32, 1);
+define_param_default!(default_max_ironing_out_iterations, u32, 10);
 
 /// Model parameters as defined in the `model.toml` file.
 ///

src/simulation/investment.rs

@@ -300,14 +300,14 @@ fn select_assets_for_cycle(
     previously_selected_assets: &[AssetRef],
     writer: &mut DataWriter,
 ) -> Result<Vec<AssetRef>> {
-    // Get markets to balance: all seen so far plus all in loop
+    // Get markets to balance: all seen so far plus all in the cycle
     let mut markets_to_balance = seen_markets.to_vec();
     markets_to_balance.extend_from_slice(markets);
 
-    // Initialise list of unbalanced markets: start with all markets in the cycle
+    // Initialise queue of unbalanced markets: start with all markets in the cycle
     let mut unbalanced_markets = VecDeque::from(markets.to_vec());
 
-    // Iterate while there are markets in the unbalanced list
+    // Iterate while there are still markets in the queue, or until max iterations reached
     let mut current_demand = demand.clone();
     let mut selected_assets = HashMap::new();
     let mut loop_iter = 0;
@@ -321,11 +321,11 @@ fn select_assets_for_cycle(
             break;
         }
 
-        // Pop off the first market
+        // Pop off the first market from the queue
         // If there are no markets with unmet demand, we're done
         let Some(current_market) = unbalanced_markets.pop_front() else {
             debug!(
-                "Cycle investment for '{}' converged after {} iterations",
+                "Investment for cycle '({})' converged after {} iterations",
                 markets.iter().join(", "),
                 loop_iter
             );
@@ -365,24 +365,21 @@ fn select_assets_for_cycle(
             .with_unmet_demand_vars(&markets_with_unmet_demand)
             .run(
                 &format!(
-                    "cycle ({}) iteration {}",
+                    "cycle ({}) post {} investment (iteration {})",
                     markets.iter().join(", "),
+                    &current_market,
                     loop_iter
                 ),
                 writer,
             )?;
 
-        // Find markets with unmet demand and add these to the unbalanced list if not already present
+        // Find markets with unmet demand and add these to the queue if not already present
         let coms = solution.get_markets_with_unmet_demand();
         for market in coms {
             if !unbalanced_markets.contains(&market) {
                 unbalanced_markets.push_back(market);
             }
         }
-        println!(
-            "Unbalanced markets: {}",
-            unbalanced_markets.iter().join(", ")
-        );
 
         // Calculate a new demand map for the next iteration
         current_demand.clone_from(demand);