mirror of
https://github.com/ANL-CEEESA/UnitCommitment.jl.git
synced 2025-12-06 00:08:52 -06:00
Compare commits
7 Commits
4f04f0dd66
...
7a28a0ca36
| Author | SHA1 | Date | |
|---|---|---|---|
| 7a28a0ca36 | |||
| e4cc95dae1 | |||
| 48094ded6b | |||
| c926f61054 | |||
| 4ac9b2a8d5 | |||
| 8763c8d8f7 | |||
| bbe57f88cd |
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
version: ['1.6', '1.7', '1.8', '1.9']
|
||||
version: ['1.10', '1.12']
|
||||
os:
|
||||
- ubuntu-latest
|
||||
arch:
|
||||
|
||||
@@ -11,6 +11,10 @@ All notable changes to this project will be documented in this file.
|
||||
[semver]: https://semver.org/spec/v2.0.0.html
|
||||
[pkjjl]: https://pkgdocs.julialang.org/v1/compatibility/#compat-pre-1.0
|
||||
|
||||
## [0.4.2] - 2025-11-27
|
||||
### Fixed
|
||||
- KnuOstWat2018: Fixed a bug in `eq_segprod_limit` constraint (#17)
|
||||
|
||||
## [0.4.0] - 2024-05-21
|
||||
### Added
|
||||
- Add support for two-stage stochastic problems
|
||||
|
||||
@@ -2,7 +2,7 @@ name = "UnitCommitment"
|
||||
uuid = "64606440-39ea-11e9-0f29-3303a1d3d877"
|
||||
authors = ["Santos Xavier, Alinson <axavier@anl.gov>"]
|
||||
repo = "https://github.com/ANL-CEEESA/UnitCommitment.jl"
|
||||
version = "0.4.0"
|
||||
version = "0.4.2"
|
||||
|
||||
[deps]
|
||||
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
|
||||
@@ -30,5 +30,5 @@ JuMP = "1"
|
||||
MathOptInterface = "1"
|
||||
MPI = "0.20"
|
||||
PackageCompiler = "1"
|
||||
julia = "1"
|
||||
julia = "1.10"
|
||||
TimerOutputs = "0.5"
|
||||
|
||||
@@ -67,21 +67,19 @@ function _add_production_piecewise_linear_eqs!(
|
||||
(t < T ? Cw * switch_off[gn, t+1] : 0.0)
|
||||
)
|
||||
else
|
||||
# Equation (47a)/(48a) in Kneuven et al. (2020)
|
||||
# Equation (47a) in Kneuven et al. (2020)
|
||||
eq_segprod_limit_b[sc.name, gn, t, k] = @constraint(
|
||||
model,
|
||||
segprod[sc.name, gn, t, k] <=
|
||||
g.cost_segments[k].mw[t] * is_on[gn, t] -
|
||||
Cv * switch_on[gn, t] -
|
||||
(t < T ? max(0, Cv - Cw) * switch_off[gn, t+1] : 0.0)
|
||||
Cv * switch_on[gn, t]
|
||||
)
|
||||
|
||||
# Equation (47b)/(48b) in Kneuven et al. (2020)
|
||||
# Equation (47b) in Kneuven et al. (2020)
|
||||
eq_segprod_limit_c[sc.name, gn, t, k] = @constraint(
|
||||
model,
|
||||
segprod[sc.name, gn, t, k] <=
|
||||
g.cost_segments[k].mw[t] * is_on[gn, t] -
|
||||
max(0, Cw - Cv) * switch_on[gn, t] -
|
||||
(t < T ? Cw * switch_off[gn, t+1] : 0.0)
|
||||
)
|
||||
end
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
|
||||
# Released under the modified BSD license. See COPYING.md for more details.
|
||||
|
||||
import Base.Threads: @threads
|
||||
import Base.Threads: @threads, maxthreadid
|
||||
|
||||
function _find_violations(
|
||||
model::JuMP.Model,
|
||||
@@ -71,7 +71,7 @@ function _find_violations(;
|
||||
B = length(sc.buses) - 1
|
||||
L = length(sc.lines)
|
||||
T = instance.time
|
||||
K = nthreads()
|
||||
K = maxthreadid()
|
||||
|
||||
size(net_injections) == (B, T) || error("net_injections has incorrect size")
|
||||
size(isf) == (L, B) || error("isf has incorrect size")
|
||||
@@ -104,7 +104,7 @@ function _find_violations(;
|
||||
is_vulnerable[c.lines[1].offset] = true
|
||||
end
|
||||
|
||||
@threads for t in 1:T
|
||||
@threads :static for t in 1:T
|
||||
k = threadid()
|
||||
|
||||
# Pre-contingency flows
|
||||
|
||||
BIN
test/fixtures/issue-0057.json.gz
vendored
Normal file
BIN
test/fixtures/issue-0057.json.gz
vendored
Normal file
Binary file not shown.
@@ -23,6 +23,7 @@ include("validation/repair_test.jl")
|
||||
include("lmp/conventional_test.jl")
|
||||
include("lmp/aelmp_test.jl")
|
||||
include("market/market_test.jl")
|
||||
include("regression.jl")
|
||||
|
||||
basedir = dirname(@__FILE__)
|
||||
|
||||
@@ -48,12 +49,13 @@ function runtests()
|
||||
solution_methods_TimeDecomposition_update_solution_test()
|
||||
transform_initcond_test()
|
||||
transform_slice_test()
|
||||
transform_randomize_XavQiuAhm2021_test()
|
||||
# transform_randomize_XavQiuAhm2021_test()
|
||||
validation_repair_test()
|
||||
lmp_conventional_test()
|
||||
lmp_aelmp_test()
|
||||
simple_market_test()
|
||||
stochastic_market_test()
|
||||
regression_test()
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
19
test/src/regression.jl
Normal file
19
test/src/regression.jl
Normal file
@@ -0,0 +1,19 @@
|
||||
# UnitCommitment.jl: Optimization Package for Security-Constrained Unit Commitment
|
||||
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
|
||||
# Released under the modified BSD license. See COPYING.md for more details.
|
||||
|
||||
using UnitCommitment, HiGHS, JuMP
|
||||
|
||||
function regression_test()
|
||||
@testset "GitHub Issue #57" begin
|
||||
instance = UnitCommitment.read(fixture("issue-0057.json.gz"))
|
||||
model = UnitCommitment.build_model(
|
||||
instance = instance,
|
||||
optimizer = HiGHS.Optimizer,
|
||||
)
|
||||
JuMP.set_silent(model)
|
||||
UnitCommitment.optimize!(model)
|
||||
solution = UnitCommitment.solution(model)
|
||||
@test solution["Thermal production (MW)"]["gen_524d4c85"][1] == 90.0
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user