Skip to content

D-NMDT bilinear/quadratic approximation with optional T-D-NMDT tightening #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jd-lara merged 4 commits into from
Mar 10, 2026
Merged

D-NMDT bilinear/quadratic approximation with optional T-D-NMDT tightening #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1eb2511
Merge pull request #38 from NREL-Sienna/jd/hybs_impl
jd-lara Mar 10, 2026
b3fa43a
Initial plan
Copilot Mar 10, 2026
9604de9
Merge remote-tracking branch 'origin/main' into copilot/sub-pr-39
Copilot Mar 10, 2026
79a64d9
Merge main into branch; fix HybSProductExpression, add local HYBS_MET…
Copilot Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/quadratic_approximations/epigraph.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ function _add_epigraph_quadratic_approx!(
meta,
)

# Precompute breakpoint values and upper bound (invariant across names and time steps)
step = delta / (n_breakpoints - 1)
breakpoints = [(x_min + (k - 1) * step) for k in 1:n_breakpoints]
# Precompute upper bound (invariant across names and time steps)
z_ub = max(x_min^2, x_max^2)

for name in names, t in time_steps
Expand Down
7 changes: 4 additions & 3 deletions test/test_dnmdt_approximations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const DNMDT_META = "DNMDTTest"
const DNMDT_HYBS_META = "HybSTest"

@testset "D-NMDT Univariate Approximation" begin
@testset "Binary expansion correctness" begin
Expand Down Expand Up @@ -445,11 +446,11 @@ end
IOM._add_hybs_bilinear_approx!(
setup_h.container, MockThermalGen, ["dev1"], 1:1,
setup_h.x_var_container, setup_h.y_var_container,
0.0, 1.0, 0.0, 1.0, depth, HYBS_META,
0.0, 1.0, 0.0, 1.0, depth, DNMDT_HYBS_META,
)
expr_h = IOM.get_expression(
setup_h.container, IOM.HybSProductExpression(),
MockThermalGen, HYBS_META,
setup_h.container, IOM.BilinearProductExpression(),
MockThermalGen, DNMDT_HYBS_META,
)

JuMP.@objective(setup_h.jump_model, Max, expr_h["dev1", 1])
Expand Down
Loading