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

Merging new feature calculations and improvements from graph-survey #41

Merged
merged 102 commits into from Sep 27, 2013

Conversation

bdsullivan
Copy link
Owner

Adds support for numerous graph features and statistics, driver (graph_stats) with timing data, which has been added to README.

Josh Lothian and others added 30 commits June 25, 2013 12:41
Adding eigenspectrum from Matt
Need boost/math/special_functions/zeta.hpp and accompanying headers to compile.
Also, the directory holding these headers needs to be included in lib_graphd/src/Makefile
jlothian and others added 28 commits August 27, 2013 11:57
Added R-MAT and RIG generators to GraphCreator.
    let avg_path_length handle disconnected graphs
    Fix avg_path_length so it compiles
    Changes to accomodate getting a largest component from a graph without first writing it to do, or requiring weights
    Don't try to record number of hops for vertices an infinite distance away
    correct some output functions
    Ensure that boost algorithm uses our distance for infinity
    Add option to graph_stats to record timing to file in addition to stdout
    cleaning up code
Conflicts:
	lib_graphd/inc/Graph.h
	lib_graphd/src/Graph.cpp
	lib_graphd/src/GraphCreator.cpp
	lib_graphd/src/GraphProperties.cpp
	lib_graphd/src/GraphReader.cpp
	lib_graphd/src/GraphUtil.cpp
	util/Makefile
	util/src/graph_stats.cpp
Fix average shortest paths calculations on large graphs
bdsullivan added a commit that referenced this pull request Sep 27, 2013
Merging new feature calculations and improvements from graph-survey
@bdsullivan bdsullivan merged commit 4bf6618 into master Sep 27, 2013
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.

None yet

4 participants