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.

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

Add fair distribution options #751

Merged
merged 35 commits into from
Nov 20, 2023
Merged

Add fair distribution options #751

merged 35 commits into from
Nov 20, 2023

Conversation

SouthEndMusic
Copy link
Collaborator

Fixes #726.

@SouthEndMusic SouthEndMusic marked this pull request as draft November 7, 2023 14:25
@SouthEndMusic
Copy link
Collaborator Author

To do: remove demands as capacity constraints, are now in objective function.

@SouthEndMusic
Copy link
Collaborator Author

As a follow-up to #743 (comment), here are some allocation results that are more fair:

simple_subnetwork
allocation_result_quadratic_absolute
allocation_result_quadratic_relative

@gijsber
Copy link
Contributor

gijsber commented Nov 8, 2023

Nice :-). in quadratic_relative, is 5 going up or 6 going down?

@SouthEndMusic SouthEndMusic marked this pull request as ready for review November 14, 2023 13:16
@SouthEndMusic SouthEndMusic requested a review from visr November 14, 2023 13:16
@SouthEndMusic SouthEndMusic marked this pull request as draft November 14, 2023 13:18
@SouthEndMusic SouthEndMusic marked this pull request as ready for review November 14, 2023 13:28
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
docs/core/allocation.qmd Show resolved Hide resolved
@SouthEndMusic SouthEndMusic requested a review from visr November 17, 2023 08:42
visr and others added 2 commits November 20, 2023 14:22
This runs our tests on 8 workers. I haven't played around with the
number yet, but as-is this is over 2x faster locally.

It uses https://github.com/JuliaTesting/ReTestItems.jl/. This runs each
testitem in a separate module. Before we were using SafeTestSets to run
each test file in a separate module. Therefore some changes were needed,
to make each item self-contained. Possibly we can make things a bit
nicer with the `testsetup` macro as well.

This also collects the output, so overall seems a lot more like our
pytest setup. It also makes it easier to run a part of the tests with a
regex or tag.

I removed the TeamCity and TimerOutput tests, since they were just a PoC
and not actually used. I we bring the XML report back we should probably
use the [ReTestItems report
keyword](https://github.com/JuliaTesting/ReTestItems.jl/blob/7bdf3bb79c756555bb9a55e2902a21b413fae8d3/src/ReTestItems.jl#L157).

---------

Co-authored-by: Maarten Pronk <[email protected]>
@visr visr merged commit 41b69de into main Nov 20, 2023
@visr visr deleted the fair_distribution branch November 20, 2023 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fairness of allocation in times of scarcity
3 participants