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

Added vertex-limited network flow reduction #8720

Closed
wants to merge 6 commits into from

Conversation

iiloni-umd
Copy link

Describe your change:

Implemented a reduction algorithm for flow networks that have capacities on vertices instead of edges. This reduction converts such a flow network into a standard flow network for which the Ford-Fulkerson algorithm can compute a max-flow.

  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the commit message contains Fixes: #{$ISSUE_NO}.

@algorithms-keeper algorithms-keeper bot added the tests are failing Do not merge until tests pass label May 10, 2023
@algorithms-keeper algorithms-keeper bot added require tests Tests [doctest/unittest/pytest] are required require type hints https://docs.python.org/3/library/typing.html labels May 10, 2023
Copy link

@algorithms-keeper algorithms-keeper bot left a comment

Choose a reason for hiding this comment

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

Click here to look at the relevant links ⬇️

🔗 Relevant Links

Repository:

Python:

Automated review generated by algorithms-keeper. If there's any problem regarding this review, please open an issue about it.

algorithms-keeper commands and options

algorithms-keeper actions can be triggered by commenting on this PR:

  • @algorithms-keeper review to trigger the checks for only added pull request files
  • @algorithms-keeper review-all to trigger the checks for all the pull request files, including the modified files. As we cannot post review comments on lines not part of the diff, this command will post all the messages in one comment.

NOTE: Commands are in beta and so this feature is restricted only to a member or owner of the organization.

"""


def vertex_limited(graph, limits):

Choose a reason for hiding this comment

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

As there is no test file in this pull request nor any test function or class in the file networking_flow/vertex_limited.py, please provide doctest for the function vertex_limited

Please provide return type hint for the function: vertex_limited. If the function does not return a value, please provide the type hint as: def function() -> None:

Please provide type hint for the parameter: graph

Please provide type hint for the parameter: limits

@algorithms-keeper algorithms-keeper bot added the awaiting reviews This PR is ready to be reviewed label May 10, 2023
@iiloni-umd
Copy link
Author

It appears that ruff is catching issues from files that I have not modified. I'm not sure what I need to do to get ruff to pass.

@tianyizheng02
Copy link
Contributor

tianyizheng02 commented May 10, 2023

It appears that ruff is catching issues from files that I have not modified. I'm not sure what I need to do to get ruff to pass.

Other people have been having that issue with their PRs too. Try running ruff --fix .

@iiloni-umd
Copy link
Author

These are the results from running ruff --fix .
image

I did not contribute to the maths directory, is there something I can do to make this PR pass or would I need to modify those other files?

@tianyizheng02
Copy link
Contributor

Not sure. It also seems that whether ruff identifies these errors is system-dependent: the errors appear when GitHub Actions runs ruff on my fork but not when I run ruff on my local git repo. @cclauss any ideas on how @iiloni-umd and others can get rid of these ruff errors?

@tianyizheng02
Copy link
Contributor

@iiloni-umd The ruff issue has been fixed in #8732. Update your branch and ruff should pass this time

@stale
Copy link

stale bot commented Jun 18, 2023

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the stale Used to mark an issue or pull request stale. label Jun 18, 2023
@tianyizheng02
Copy link
Contributor

@iiloni-umd Could you rebase your branch to bring in the latest commits? The ruff errors have been fixed

@stale stale bot removed the stale Used to mark an issue or pull request stale. label Aug 19, 2023
@tianyizheng02
Copy link
Contributor

Closing due to lack of response. In addition, please read the contributing guidelines to make sure that your code follows our requirements

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaiting reviews This PR is ready to be reviewed require tests Tests [doctest/unittest/pytest] are required require type hints https://docs.python.org/3/library/typing.html tests are failing Do not merge until tests pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants