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

Add bipartite adjacency maps #207

Merged

snowleopard merged 22 commits into snowleopard:master from vasalf:bipartite

Jun 27, 2019

Contributor

vasalf commented May 31, 2019

No description provided.


          Add bipartite adjacency maps

cea4b51

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

vasalf added 10 commits

June 2, 2019 14:39


          Small fix for small patch

6fe1f25

1. Simplify consistency check for bipartite adjacency maps.
2. Change Bipartite.AdjacencyMap.hasEdge signature to match other Alga
modules.


          Add Bipartite.AdjacencyMap construction functions

d00b8c2


          Add first tests for bipartite graphs

5c46e2c


          fix && add more tests

6c45c64


          Final BAM tests

6dc2799


          Merge branch 'master' into bipartite

5b4578f


          Fix broken build after previous commit


          docs

73004bf


          Unify docs and tests for bipartite graphs

90d4b17


          Merge branch 'master' of github.com:snowleopard/alga into bipartite

acae7de

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

Owner

snowleopard commented Jun 11, 2019

@vasalf Many thanks for the PR! I've left a bunch of comments, please have a look.

snowleopard added the unfinished label

vasalf added 2 commits

June 19, 2019 11:48


          Docs & tests for construction primitives & simple properties

1e31e0c


          Biparite graph propeties & constructors

ac970f8

nobrakal reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

test/Algebra/Graph/Test/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved


          Fix minor warnings

b5bcdc2

adithyaov reviewed

View reviewed changes

test/Main.hs Outdated Show resolved Hide resolved

adithyaov reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved


          Add Show instance for bipartite graphs

f1473d5

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

vasalf added 3 commits

June 22, 2019 12:03


          More tests & docs on swap

62531a3


          Prettify tests

f7c9909


          Fix variable names in tests

5a8a124

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

test/Algebra/Graph/Test/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

snowleopard reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved


          Minor fix

16f957a

adithyaov reviewed

View reviewed changes

src/Algebra/Graph/Bipartite/AdjacencyMap.hs Outdated Show resolved Hide resolved

vasalf added 2 commits

June 25, 2019 18:15


          Remove implementation dependency in docs

4b1d6fa


          Remove the adjacency maps docs part completely

08b9b41

Owner

snowleopard commented Jun 26, 2019

@vasalf There is a test failure:

============ Eq (Bipartite.AdjacencyMap a b) ============
Test failure:
    (x == y) == ((leftAdjacencyMap x == rightAdjacencyMap x) && (leftAdjacencyMap y == rightAdjacencyMap y))
*** Failed! Falsified (after 3 tests):
empty
vertices [-2] [-2]

The full log is here: https://travis-ci.org/snowleopard/alga/jobs/550349421

Please investigate.


          Fix Show instance & Eq test

a4a9e6c

Contributor Author

vasalf commented Jun 26, 2019

@vasalf There is a test failure:
============ Eq (Bipartite.AdjacencyMap a b) ============
Test failure:
    (x == y) == ((leftAdjacencyMap x == rightAdjacencyMap x) && (leftAdjacencyMap y == rightAdjacencyMap y))
*** Failed! Falsified (after 3 tests):
empty
vertices [-2] [-2]
The full log is here: https://travis-ci.org/snowleopard/alga/jobs/550349421

Please investigate.

@snowleopard Thanks for pointing it out! It turned out that the test was wrong. I fixed it. Hope it will pass this time (it passes on my machine, but we know that means nothing).

I also fixed a small bug in Show instance.

snowleopard merged commit 7c43d08 into snowleopard:master

Owner

snowleopard commented Jun 27, 2019

Thanks, merged!

snowleopard removed the unfinished label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet