From ec55a6bf101fa94961a317247d98628194a3ed30 Mon Sep 17 00:00:00 2001 From: Luke Kiernan Date: Thu, 10 Sep 2026 11:01:44 -0600 Subject: [PATCH] Follow the DeviceBaseUnit -> ComponentBaseUnit rename InfrastructureSystems#634 renamed the per-unit marker: `IS.DU`/ `IS.DeviceBaseUnit` are now `IS.CU`/`IS.ComponentBaseUnit`, with no shims. Seven sites, all constructing the marker to parameterize a cost curve in the value-curve tests, plus the units tuple in the dispatch-profile script. Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_01LP6eB1zx4eyE3hd7tpvSue --- scripts/units_dispatch_profile.jl | 4 ++-- test/test_linear_curve.jl | 4 ++-- test/test_quadratic_curve.jl | 4 ++-- test/test_ts_value_curve_objective.jl | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/units_dispatch_profile.jl b/scripts/units_dispatch_profile.jl index 3ef6340f..0aa20730 100644 --- a/scripts/units_dispatch_profile.jl +++ b/scripts/units_dispatch_profile.jl @@ -75,13 +75,13 @@ function make_container(devices) end # Build N components, evenly distributed across the 3 unit systems. The cost -# *curves* are concretely typed (CostCurve{LinearCurve, NaturalUnit/SU/DU}) but +# *curves* are concretely typed (CostCurve{LinearCurve, NaturalUnit/SU/CU}) but # the abstractly-typed `MockThermalGen` storage means upstream callers see a # UnionAll. This is the realistic shape of consuming code. function make_workload() devices = MockThermalGen[] curves = Any[] # heterogeneous on U, simulates abstract field upstream - units = (IS.NaturalUnit(), IS.SystemBaseUnit(), IS.DeviceBaseUnit()) + units = (IS.NaturalUnit(), IS.SystemBaseUnit(), IS.ComponentBaseUnit()) for i in 1:N_COMPONENTS u = units[mod1(i, 3)] push!(devices, make_mock_thermal("g$i"; base_power = 50.0 + i)) diff --git a/test/test_linear_curve.jl b/test/test_linear_curve.jl index 0443fd7d..8398b30a 100644 --- a/test/test_linear_curve.jl +++ b/test/test_linear_curve.jl @@ -232,7 +232,7 @@ end # Cost: 30 $/p.u.h in device base units cost_curve = IS.CostCurve( IS.LinearCurve(30.0), - IS.DeviceBaseUnit(), + IS.ComponentBaseUnit(), ) InfrastructureOptimizationModels.add_variable_cost_to_objective!( @@ -312,7 +312,7 @@ end ), DEVICE_BASE = IS.CostCurve( IS.LinearCurve(rate * device_base), - IS.DeviceBaseUnit(), + IS.ComponentBaseUnit(), ), ) diff --git a/test/test_quadratic_curve.jl b/test/test_quadratic_curve.jl index 48aefb81..cf0b33e1 100644 --- a/test/test_quadratic_curve.jl +++ b/test/test_quadratic_curve.jl @@ -318,7 +318,7 @@ end cost_curve = IS.CostCurve( IS.QuadraticCurve(1.0, 20.0, 0.0), - IS.DeviceBaseUnit(), + IS.ComponentBaseUnit(), ) InfrastructureOptimizationModels.add_variable_cost_to_objective!( @@ -404,7 +404,7 @@ end ), DEVICE_BASE = IS.CostCurve( IS.QuadraticCurve(a * device_base^2, b * device_base, 0.0), - IS.DeviceBaseUnit(), + IS.ComponentBaseUnit(), ), ) diff --git a/test/test_ts_value_curve_objective.jl b/test/test_ts_value_curve_objective.jl index b835c5ee..0d8b3103 100644 --- a/test/test_ts_value_curve_objective.jl +++ b/test/test_ts_value_curve_objective.jl @@ -351,7 +351,7 @@ end for (unit_system, expected_slope_factor, expected_bp_factor) in [ (IS.NaturalUnit(), system_base, 1.0 / system_base), ( - IS.DeviceBaseUnit(), + IS.ComponentBaseUnit(), 1.0 / (device_base / system_base), device_base / system_base, ),