Closed iSoron closed 3 years ago
- [ ] Fix
_validate_reserve_and_demand
(this PR breaks it)
Working on this next.
Question: for reserves, is the key "Reserve (MW)" or "Spinning (MW)"? Both are used, I think:
for reserves, is the key "Reserve (MW)" or "Spinning (MW)"? Both are used, I think
"Spinning (MW)" is used in the input file and "Reserve (MW)" is used in the output JSON dictionary. It's inconsistent, but please don't worry about this right now. I'm planning to add support for multiple reserves, and I'll fix this inconsistency then.
- [ ] Fix
_validate_reserve_and_demand
(this PR breaks it)Working on this next.
I think this is now fixed... but check 3d252c5. I accidentally committed before pulling so that triggered the merge. I am not sure how to avoid that (reset --soft
?).
for reserves, is the key "Reserve (MW)" or "Spinning (MW)"? Both are used, I think "Spinning (MW)" is used in the input file and "Reserve (MW)" is used in the output JSON dictionary. It's inconsistent, but please don't worry about this right now. I'm planning to add support for multiple reserves, and I'll fix this inconsistency then.
👍
Thanks, looks good now. I'll merge after all tests finish running.
I accidentally committed before pulling so that triggered the merge. I am not sure how to avoid that (reset --soft?).
No worries. You can avoid that by always running git pull --rebase
instead of git pull
.
Looks like some tests are failing:
Got exception outside of a @test
type Model has no field obj
Stacktrace:
[1] getproperty(x::Model, f::Symbol)
@ Base ./Base.jl:33
[2] _add_reserve_eqs!(model::Model)
@ UnitCommitment ~/work/UnitCommitment.jl/UnitCommitment.jl/src/model/formulations/base/system.jl:48
Thanks, looks good now. I'll merge after all tests finish running.
I made a few updates last night and now all checks are passing.
I accidentally committed before pulling so that triggered the merge. I am not sure how to avoid that (reset --soft?).
No worries. You can avoid that by always running
git pull --rebase
instead ofgit pull
.
Thanks. I will set git config --global pull.rebase true
from now on. Seems like a good default.
Merged in 000215e991e78d0cf8978ef272c29b748fbd9762
@iSoron this says "Closed with unmerged commits" --- is there something left to be merged? if not, we can delete this branch.
This is the same PR as #13, but keeping only changes related to reserve shorfall penalty.
@akazachk Could we focus on getting this PR merged first, then come back to the other changes introduced in #13? Please feel free to commit to branch
feature/reserve-shortfall
directly. Any commits added to that branch will appear here.