Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Vertex Cover #949

Merged
merged 20 commits into from
Sep 17, 2018
Merged

Vertex Cover #949

merged 20 commits into from
Sep 17, 2018

Conversation

SohamTamba
Copy link
Contributor

@codecov
Copy link

codecov bot commented Jul 27, 2018

Codecov Report

Merging #949 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #949      +/-   ##
==========================================
+ Coverage   99.85%   99.85%   +<.01%     
==========================================
  Files          80       83       +3     
  Lines        2691     2707      +16     
==========================================
+ Hits         2687     2703      +16     
  Misses          4        4

Copy link
Contributor

@jpfairbanks jpfairbanks left a comment

Choose a reason for hiding this comment

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

I would rather these be

vertex_cover(g::AbstractGraph, alg::RandomCover)
vertex_cover(g::AbstractGraph, alg::DegreeCover)
vertex_cover(g::AbstractGraph, alg::ParallelCover)

or

vertex_cover_random(g::AbstractGraph)
vertex_cover_degree(g::AbstractGraph)
vertex_cover_parallel(g::AbstractGraph)

so that the methods sort together in tab complete.

@sbromberger which bikeshed color do you prefer? I am in favor of more alg types. We could also make it kwargs.

@sbromberger
Copy link
Owner

which bikeshed color do you prefer?

Blue.

I think that consistency dictates we use either a passed struct to designate the algorithm (the way we do with loadgraph), or use a symbol (the way we do w/ adjacency_matrix). Making this a kwarg is preferable if there's an obvious default.

@SohamTamba SohamTamba force-pushed the VertexCover branch 5 times, most recently from 313f86c to 0aa787a Compare July 28, 2018 17:33
@SohamTamba
Copy link
Contributor Author

@sbromberger can you take a look at this?

@sbromberger
Copy link
Owner

This looks good to me, but I'd like @jpfairbanks to take a look as well.

@IssamT
Copy link
Contributor

IssamT commented Jul 30, 2018

Can we have some naming convention that helps recognizing heuristics from exact algorithms?

@SohamTamba SohamTamba force-pushed the VertexCover branch 2 times, most recently from d5450df to aa6562f Compare July 31, 2018 13:27
@SohamTamba
Copy link
Contributor Author

@somil55
mapreduce seems to have the same run time as the sequential code.
Should I use @distributed instead?

@sbromberger sbromberger added this to the v1.1.0 milestone Jul 31, 2018
@dsrivastavv
Copy link
Contributor

@SohamTamba Try benchmarking it using @distributed [reducer] for loop.

@SohamTamba
Copy link
Contributor Author

Efficiency is being discussed in #960

@sbromberger
Copy link
Owner

@SohamTamba this needs a conflict resolution. Also, what's the status? Are we ready for review? (cc @somil55 )

@SohamTamba
Copy link
Contributor Author

@sbromberger It's ready but can we merge #960 first?

Changes will have to be made to this PR based on how #960 ends up.

VPetukhov and others added 9 commits September 9, 2018 23:24
…r#984)

* Fix kruskal_mst for working with abstract graphs

* Remove abstract edge type in kruskal

* Fix edgetype
We will probably want to move this into SimpleGraphs at some point, but until then, I think this is good.
* attempt 32-bit compatibility

* don't allow downsampling to Int32: introduces accuracy bugs

* add 0.7 and nightly tests

* allow integers in betweenness centrality

* attempt to fix parallel 32-bit

* work around splitrange issue

* Revert "work around splitrange issue"

This reverts commit 58cbcf8.

* splitrange overload
ChrisRackauckas and others added 7 commits September 9, 2018 23:24
* Add simple_cycles_limited_length.

* Revisions after review comments.

Merging because it looks like codecov is hung up.
Fix zenodo error
* OneTo

* fixes reverse (sbromberger#994)

We will probably want to move this into SimpleGraphs at some point, but until then, I think this is good.

* Lots more doctests (sbromberger#995)

* SimpleGraph(SimpleGraph) plus tests. (sbromberger#998)

* added documentation for SimpleGraph and SimpleDiGraph constructors (sbromberger#1001)

* fixes edgeiter equality (sbromberger#1002)

* 32-bit compatibility (sbromberger#999)

* attempt 32-bit compatibility

* don't allow downsampling to Int32: introduces accuracy bugs

* add 0.7 and nightly tests

* allow integers in betweenness centrality

* attempt to fix parallel 32-bit

* work around splitrange issue

* Revert "work around splitrange issue"

This reverts commit 58cbcf8.

* splitrange overload

* MultiThreaded Centrality Measures Implementations (sbromberger#987)

* misc doc fixes (sbromberger#1003)

* Fix sbromberger#999 (sbromberger#1004)

* Parallel BFS

Generate Reduce
@SohamTamba
Copy link
Contributor Author

@somil55 can you take a look?

@sbromberger
Copy link
Owner

@somil55 @jpfairbanks @SohamTamba - can we make a decision on this PR please? What needs to happen here? Thank you.

@SohamTamba
Copy link
Contributor Author

@sbromberger I think its ready.

I changed the interface to use structs as requested.

@sbromberger
Copy link
Owner

Congrats, @SohamTamba - and thanks for a great GSOC!!!

@sbromberger sbromberger merged commit bfda546 into sbromberger:master Sep 17, 2018
@SohamTamba
Copy link
Contributor Author

@sbromberger
Thanks alot :)

It was a great experience working with you'll

@matbesancon
Copy link
Contributor

congrats @SohamTamba :)

sbromberger pushed a commit that referenced this pull request Sep 24, 2018
* Fix kruskal_mst function for working with abstract graphs (#984)

* Fix kruskal_mst for working with abstract graphs

* Remove abstract edge type in kruskal

* Fix edgetype

* fixes reverse (#994)

We will probably want to move this into SimpleGraphs at some point, but until then, I think this is good.

* Lots more doctests (#995)

* SimpleGraph(SimpleGraph) plus tests. (#998)

* added documentation for SimpleGraph and SimpleDiGraph constructors (#1001)

* fixes edgeiter equality (#1002)

* 32-bit compatibility (#999)

* attempt 32-bit compatibility

* don't allow downsampling to Int32: introduces accuracy bugs

* add 0.7 and nightly tests

* allow integers in betweenness centrality

* attempt to fix parallel 32-bit

* work around splitrange issue

* Revert "work around splitrange issue"

This reverts commit 58cbcf8.

* splitrange overload

* MultiThreaded Centrality Measures Implementations (#987)

* misc doc fixes (#1003)

* Fix #999 (#1004)

* Karger Min Cut (#988)

* Fix misspelling. (#1005)

* Fixed some bugs in simplecycles_hawick_james (#1007)

* Add function to find short cycles (#1006)

* Add simple_cycles_limited_length.

* Revisions after review comments.

Merging because it looks like codecov is hung up.

* Update .zenodo.json

Fix zenodo error

* Parallel BFS with static and dynamic load balancing (#943)

* OneTo

* fixes reverse (#994)

We will probably want to move this into SimpleGraphs at some point, but until then, I think this is good.

* Lots more doctests (#995)

* SimpleGraph(SimpleGraph) plus tests. (#998)

* added documentation for SimpleGraph and SimpleDiGraph constructors (#1001)

* fixes edgeiter equality (#1002)

* 32-bit compatibility (#999)

* attempt 32-bit compatibility

* don't allow downsampling to Int32: introduces accuracy bugs

* add 0.7 and nightly tests

* allow integers in betweenness centrality

* attempt to fix parallel 32-bit

* work around splitrange issue

* Revert "work around splitrange issue"

This reverts commit 58cbcf8.

* splitrange overload

* MultiThreaded Centrality Measures Implementations (#987)

* misc doc fixes (#1003)

* Fix #999 (#1004)

* Parallel BFS

Generate Reduce

* VertexCover
@SohamTamba SohamTamba mentioned this pull request Sep 24, 2018
sbromberger added a commit that referenced this pull request Oct 3, 2018
* inflate

* Vertex Cover (#949)

* Fix kruskal_mst function for working with abstract graphs (#984)

* Fix kruskal_mst for working with abstract graphs

* Remove abstract edge type in kruskal

* Fix edgetype

* fixes reverse (#994)

We will probably want to move this into SimpleGraphs at some point, but until then, I think this is good.

* Lots more doctests (#995)

* SimpleGraph(SimpleGraph) plus tests. (#998)

* added documentation for SimpleGraph and SimpleDiGraph constructors (#1001)

* fixes edgeiter equality (#1002)

* 32-bit compatibility (#999)

* attempt 32-bit compatibility

* don't allow downsampling to Int32: introduces accuracy bugs

* add 0.7 and nightly tests

* allow integers in betweenness centrality

* attempt to fix parallel 32-bit

* work around splitrange issue

* Revert "work around splitrange issue"

This reverts commit 58cbcf8.

* splitrange overload

* MultiThreaded Centrality Measures Implementations (#987)

* misc doc fixes (#1003)

* Fix #999 (#1004)

* Karger Min Cut (#988)

* Fix misspelling. (#1005)

* Fixed some bugs in simplecycles_hawick_james (#1007)

* Add function to find short cycles (#1006)

* Add simple_cycles_limited_length.

* Revisions after review comments.

Merging because it looks like codecov is hung up.

* Update .zenodo.json

Fix zenodo error

* Parallel BFS with static and dynamic load balancing (#943)

* OneTo

* fixes reverse (#994)

We will probably want to move this into SimpleGraphs at some point, but until then, I think this is good.

* Lots more doctests (#995)

* SimpleGraph(SimpleGraph) plus tests. (#998)

* added documentation for SimpleGraph and SimpleDiGraph constructors (#1001)

* fixes edgeiter equality (#1002)

* 32-bit compatibility (#999)

* attempt 32-bit compatibility

* don't allow downsampling to Int32: introduces accuracy bugs

* add 0.7 and nightly tests

* allow integers in betweenness centrality

* attempt to fix parallel 32-bit

* work around splitrange issue

* Revert "work around splitrange issue"

This reverts commit 58cbcf8.

* splitrange overload

* MultiThreaded Centrality Measures Implementations (#987)

* misc doc fixes (#1003)

* Fix #999 (#1004)

* Parallel BFS

Generate Reduce

* VertexCover

* More examples... (#1014)

* More examples...

* Update core.jl

shortcut to Digraph creation

* Update bipartition.jl

* More doctests (#1016)

* Xrefs/examples again

* More examples! (#1018)

* Centrality examples (#1019)

* Biconnectivity examples (#1021)

* Examples for some operators (#1022)

* Fixes https://github.com/JuliaGraphs/MetaGraphs.jl/issues/55 (#1023)

* Fixes https://github.com/JuliaGraphs/MetaGraphs.jl/issues/55 (#1023)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.