Reorganize files; document some methods

This commit is contained in:
2021-05-28 22:48:12 -05:00
parent e594a68492
commit 4e8426beba
30 changed files with 849 additions and 636 deletions

View File

@@ -7,7 +7,7 @@ using UnitCommitment
@testset "convert" begin
@testset "EGRET solution" begin
solution =
UnitCommitment._read_egret_solution("fixtures/egret_output.json.gz")
UnitCommitment.read_egret_solution("fixtures/egret_output.json.gz")
for attr in ["Is on", "Production (MW)", "Production cost (\$)"]
@test attr in keys(solution)
@test "115_STEAM_1" in keys(solution[attr])

View File

@@ -149,7 +149,7 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
# Should be able to build model without errors
optimizer = optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0)
model = build_model(
model = UnitCommitment.build_model(
instance = modified,
optimizer = optimizer,
variable_names = true,

View File

@@ -11,7 +11,7 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP
line.normal_flow_limit[t] = 10.0
end
optimizer = optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0)
model = build_model(
model = UnitCommitment.build_model(
instance = instance,
optimizer = optimizer,
variable_names = true,

View File

@@ -3,16 +3,17 @@
# Released under the modified BSD license. See COPYING.md for more details.
using UnitCommitment, Test, LinearAlgebra
import UnitCommitment: Violation, _offer, _query
import UnitCommitment: _Violation, _offer, _query
@testset "Screening" begin
@testset "Violation filter" begin
@testset "_Violation filter" begin
instance = UnitCommitment.read_benchmark("test/case14")
filter = UnitCommitment.ViolationFilter(max_per_line = 1, max_total = 2)
filter =
UnitCommitment._ViolationFilter(max_per_line = 1, max_total = 2)
_offer(
filter,
Violation(
_Violation(
time = 1,
monitored_line = instance.lines[1],
outage_line = nothing,
@@ -21,7 +22,7 @@ import UnitCommitment: Violation, _offer, _query
)
_offer(
filter,
Violation(
_Violation(
time = 1,
monitored_line = instance.lines[1],
outage_line = instance.lines[1],
@@ -30,7 +31,7 @@ import UnitCommitment: Violation, _offer, _query
)
_offer(
filter,
Violation(
_Violation(
time = 1,
monitored_line = instance.lines[1],
outage_line = instance.lines[5],
@@ -39,7 +40,7 @@ import UnitCommitment: Violation, _offer, _query
)
_offer(
filter,
Violation(
_Violation(
time = 1,
monitored_line = instance.lines[1],
outage_line = instance.lines[4],
@@ -48,7 +49,7 @@ import UnitCommitment: Violation, _offer, _query
)
_offer(
filter,
Violation(
_Violation(
time = 1,
monitored_line = instance.lines[2],
outage_line = instance.lines[1],
@@ -57,7 +58,7 @@ import UnitCommitment: Violation, _offer, _query
)
_offer(
filter,
Violation(
_Violation(
time = 1,
monitored_line = instance.lines[2],
outage_line = instance.lines[8],
@@ -67,13 +68,13 @@ import UnitCommitment: Violation, _offer, _query
actual = _query(filter)
expected = [
Violation(
_Violation(
time = 1,
monitored_line = instance.lines[2],
outage_line = instance.lines[1],
amount = 200.0,
),
Violation(
_Violation(
time = 1,
monitored_line = instance.lines[1],
outage_line = instance.lines[5],
@@ -106,6 +107,8 @@ import UnitCommitment: Violation, _offer, _query
overflow = overflow,
isf = isf,
lodf = lodf,
max_per_line = 1,
max_per_period = 5,
)
@test length(violations) == 20
end