Skip to content

Commit

Permalink
Merge pull request #13 from The-Firefighters/master
Browse files Browse the repository at this point in the history
Firefighter problem
  • Loading branch information
erelsgl authored Aug 3, 2024
2 parents 172b51b + 33f73e0 commit a9f1e33
Show file tree
Hide file tree
Showing 32 changed files with 6,452 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ jobs:
- name: Test NetworkZ
run: |
pytest --doctest-modules --durations=10
pytest
- name: Test Dispatching
# Limit this to only a single combination from the matrix
if: ${{ (matrix.os == 'ubuntu') && (matrix.python-version == '3.11') }}
run: |
NetworkZ_GRAPH_CONVERT=nx-loopback pytest --doctest-modules --durations=10
NetworkZ_GRAPH_CONVERT=nx-loopback pytest
extra:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
- name: Test NetworkZ
run: |
pytest --doctest-modules --durations=10
pytest
prerelease:
runs-on: ${{ matrix.os }}-latest
Expand All @@ -147,4 +147,4 @@ jobs:
- name: Test NetworkZ
run: |
pytest --doctest-modules --durations=10
pytest
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
scripts
*.txt

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
NetworkZ is a library of graph algorithms in Python. It is an extension of the [NetworkX](https://github.com/networkx/networkx). It contains (by import) everything that is in NetworkX, plus some additional algorithms that were submitted into NetworkX but not merged yet. Currently, NetworkZ contains the following additional algorithms:

* [Rank-maximal matching](networkz/algorithms/bipartite/rank_maximal_matching.py): by Oriya Alperin, Liel Vaknin and Amiel Lejzor.
* [Maximum-weight fractional matching](networkz/algorithms/max_weight_fractional_matching.py): by Oriya Alperin, Liel Vaknin and Amiel Lejzor.
* [Social-aware coalition formation](networkz/algorithms/approximation/coalition_formation.py) - by Victor Kushnir.
* [Minimum cut on a graph with node capacity](networkz/algorithms/max_flow_with_node_capacity.py): by Yuval Bubnovsky, Almog David and Shaked Levi.
* [Several approximate solutions to the Firefighter problem](networkz/algorithms/approximation/firefighter_problem): by Yuval Bubnovsky, Almog David and Shaked Levi.

## Installation

Expand Down
Loading

0 comments on commit a9f1e33

Please sign in to comment.