Skip to content
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

Jump to bottom

Allocation beyond max flow #663

Merged
merged 34 commits into from
Oct 19, 2023
Merged

Allocation beyond max flow #663

merged 34 commits into from
Oct 19, 2023

Conversation

SouthEndMusic
Copy link
Collaborator

@SouthEndMusic SouthEndMusic commented Oct 11, 2023 •
edited
Loading

Fixes #632, fixes #14, fixes #349, using JuMP.jl and HiGHS.

@SouthEndMusic SouthEndMusic marked this pull request as draft October 11, 2023 14:04
@SouthEndMusic SouthEndMusic reopened this Oct 17, 2023
@SouthEndMusic SouthEndMusic mentioned this pull request Oct 17, 2023
Closed
15 tasks
@SouthEndMusic SouthEndMusic marked this pull request as ready for review October 17, 2023 09:46
@SouthEndMusic SouthEndMusic requested a review from visr October 17, 2023 09:46
visr
visr reviewed Oct 17, 2023
View reviewed changes
core/src/allocation.jl Outdated Show resolved Hide resolved
core/src/Ribasim.jl Outdated Show resolved Hide resolved
core/src/Ribasim.jl Outdated Show resolved Hide resolved
core/src/solve.jl Outdated Show resolved Hide resolved
core/src/solve.jl Outdated Show resolved Hide resolved
core/src/allocation.jl Outdated Show resolved Hide resolved
core/src/allocation.jl Outdated Show resolved Hide resolved
core/src/allocation.jl Outdated Show resolved Hide resolved
core/src/allocation.jl Outdated Show resolved Hide resolved
core/src/allocation.jl Outdated Show resolved Hide resolved
Hofer-Julian
Hofer-Julian reviewed Oct 18, 2023
View reviewed changes
Copy link
Contributor

@Hofer-Julian Hofer-Julian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a few comments :)

core/src/allocation.jl Outdated Show resolved Hide resolved
core/test/time.jl Outdated Show resolved Hide resolved
core/src/allocation.jl Outdated Show resolved Hide resolved
core/src/allocation.jl Outdated Show resolved Hide resolved
@visr visr mentioned this pull request Oct 18, 2023
Merged
Hofer-Julian pushed a commit that referenced this pull request Oct 18, 2023
@visr
opt in to extrapolation for rating curves on DataInterpolations 4.4 (#…
35320c0 
…677)

Originally made in #663 as commit
959075f.
But since it fixes breakage, best to get it on main as soon as possible.
visr
visr approved these changes Oct 19, 2023
View reviewed changes
Copy link
Member

@visr visr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's get this merged.

@visr visr merged commit 26d90a6 into main Oct 19, 2023
15 checks passed
@visr visr deleted the allocation_beyond_max_flow branch October 19, 2023 14:36
@SouthEndMusic SouthEndMusic restored the allocation_beyond_max_flow branch October 19, 2023 14:38
visr added a commit that referenced this pull request Oct 25, 2023
@SouthEndMusic @visr
Allocation beyond max flow (#663)
32c9674 
Fixes #632, fixes
#14, fixes
#349, using `JuMP.jl` and
`HiGHS`.

---------

Co-authored-by: Martijn Visser <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hofer-Julian Hofer-Julian Hofer-Julian left review comments

@visr visr visr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@SouthEndMusic @visr @Hofer-Julian