[FIX] tab5: switch to run_expanded_optimization, filter hidden resources, expose Other method variants in method selector

tabs/tab5_sensitivity.py

@@ -2,9 +2,10 @@ import copy
 import pandas as pd
 import streamlit as st
 import plotly.express as px
-from config.config import CO2_UNIT, method_order, resource_order
-from optimization.optimization import run_optimization
-from utils.data_utils import get_resource_to_unit
+from config.config import CO2_UNIT, hidden_resource_names, method_order, resource_order
+from utils.data_utils import (get_resource_to_unit, run_expanded_optimization,
+                              is_other_method, get_other_method_variants, make_variant_name,
+                              default_constraint)
 from utils.ui_helpers import register_chart_data, show_bar
 
 
@@ -17,16 +18,17 @@ def compute_baseline():
             all_resources     – standard resources + custom batch names.
             resource_to_unit  – {resource: unit} including custom batches.
     """
-    baseline_success, baseline_result = run_optimization(
+    baseline_success, baseline_result = run_expanded_optimization(
         resource_caps=st.session_state.resource_caps,
         method_constraints=st.session_state.constraints,
-        method_costs=st.session_state.costs,
+        costs=st.session_state.costs,
         custom_resources=st.session_state.get("custom_resources", []),
+        enabled_methods=st.session_state.get("enabled_methods", {}),
     )
     baseline_removed = baseline_result["total_removed"] if baseline_success else 0
 
     custom_resource_names = [b["name"] for b in st.session_state.get("custom_resources", [])]
-    all_resources = resource_order + custom_resource_names
+    all_resources = [r for r in resource_order if r not in hidden_resource_names] + custom_resource_names
 
     resource_to_unit = get_resource_to_unit()
     for b in st.session_state.get("custom_resources", []):
@@ -79,11 +81,12 @@ def panel_resource_sensitivity(baseline_removed, all_resources, resource_to_unit
             actual_amount = base_cap * pct / 100
             perturbed_caps[resource] = actual_amount
 
-            success, result = run_optimization(
+            success, result = run_expanded_optimization(
                 resource_caps=perturbed_caps,
                 method_constraints=st.session_state.constraints,
-                method_costs=st.session_state.costs,
+                costs=st.session_state.costs,
                 custom_resources=st.session_state.get("custom_resources", []),
+                enabled_methods=st.session_state.get("enabled_methods", {}),
             )
             all_data.append({
                 "Input": resource,
@@ -130,8 +133,23 @@ def panel_method_sensitivity(baseline_removed):
         '<p class="crra-sub-heading">Impact of max allocation per method</p>',
         unsafe_allow_html=True,
     )
+
+    # "Other"-tagged methods with custom batches attached are expanded into
+    # independent variants (e.g. "Enhanced weathering - Other mineral: Ganite")
+    # by run_expanded_optimization — offer those variants as selectable
+    # entries too, alongside the standard method names, so their own cap can
+    # be swept just like any other method.
+    custom_resources = st.session_state.get("custom_resources", [])
+    method_options = []
+    for m in method_order:
+        variants = get_other_method_variants(m, custom_resources)
+        if variants:
+            method_options.extend(make_variant_name(m, b["name"]) for b in variants)
+        else:
+            method_options.append(m)
+
     selected_methods = st.multiselect(
-        "Select one or more methods:", method_order, key="crra-select-method"
+        "Select one or more methods:", method_options, key="crra-select-method"
     )
 
     if not selected_methods:
@@ -143,8 +161,9 @@ def panel_method_sensitivity(baseline_removed):
     skipped = []
 
     for method in selected_methods:
-        cap_type = st.session_state.constraints[method].get("cap_type", "percent")
-        current_cap = st.session_state.constraints[method].get(
+        constraint = st.session_state.constraints.get(method) or default_constraint()
+        cap_type = constraint.get("cap_type", "percent")
+        current_cap = constraint.get(
             "cap_value", 100 if cap_type == "percent" else 0.0
         )
 
@@ -154,6 +173,7 @@ def panel_method_sensitivity(baseline_removed):
 
         for pct in percentages:
             perturbed_constraints = copy.deepcopy(st.session_state.constraints)
+            perturbed_constraints.setdefault(method, default_constraint())
             if cap_type == "percent":
                 actual_cap = min(100, current_cap * pct / 100)
                 perturbed_constraints[method]["cap_value"] = actual_cap
@@ -163,11 +183,12 @@ def panel_method_sensitivity(baseline_removed):
                 perturbed_constraints[method]["cap_value"] = actual_cap
                 cap_label = f"{actual_cap:.2f} {CO2_UNIT}/yr"
 
-            success, result = run_optimization(
+            success, result = run_expanded_optimization(
                 resource_caps=st.session_state.resource_caps,
                 method_constraints=perturbed_constraints,
-                method_costs=st.session_state.costs,
-                custom_resources=st.session_state.get("custom_resources", []),
+                costs=st.session_state.costs,
+                custom_resources=custom_resources,
+                enabled_methods=st.session_state.get("enabled_methods", {}),
             )
             all_data.append({
                 "Method": method,