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.

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

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

Merged
merged 102 commits into from Sep 27, 2013
Merged

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

merged 102 commits into from Sep 27, 2013

Commits on Jun 25, 2013

  1. Adding a #define for INDDGO_INFINITY (used in shortest path calcs)

    Josh Lothian committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    3396ee6 View commit details
    Browse the repository at this point in the history

  2. Adding avg shortest path length calculation; updating djikstra stuff … 

    …to use INDDGO_INFINITY
    Josh Lothian committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    f3f417c View commit details
    Browse the repository at this point in the history

  3. Adding avg_path_length to graph_stats driver

    Josh Lothian committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    78210c5 View commit details
    Browse the repository at this point in the history

  4. cleaning up code

    Josh Lothian committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    bca2a6d View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2013

  1. fixing icc error

    Josh Lothian committed Jun 27, 2013
    Configuration menu
    Copy the full SHA
    8577d1e View commit details
    Browse the repository at this point in the history

  2. output the input filename in the stats file

    Josh Lothian committed Jun 27, 2013
    Configuration menu
    Copy the full SHA
    bc963b7 View commit details
    Browse the repository at this point in the history

  3. change \n to endl for better monitoring of progress during batch jobs

    Josh Lothian committed Jun 27, 2013
    Configuration menu
    Copy the full SHA
    8e6bdf1 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2013

  1. Add Petsc and Slepc options to build system

    @MattBBaker
    MattBBaker committed Jul 2, 2013
    Configuration menu
    Copy the full SHA
    68c4a5d View commit details
    Browse the repository at this point in the history

  2. Initial version of eigen spectrum solver

    @MattBBaker
    MattBBaker committed Jul 2, 2013
    Configuration menu
    Copy the full SHA
    7b011cb View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2013

  1. Bug fixes.

    @MattBBaker
    MattBBaker committed Jul 3, 2013
    Configuration menu
    Copy the full SHA
    ee53b1b View commit details
    Browse the repository at this point in the history

  2. spelling errors

    @MattBBaker
    MattBBaker committed Jul 3, 2013
    Configuration menu
    Copy the full SHA
    7ef2a5d View commit details
    Browse the repository at this point in the history

  3. sorted out merge of graph_stats.cpp

    @MattBBaker
    MattBBaker committed Jul 3, 2013
    Configuration menu
    Copy the full SHA
    03a9c75 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2013

  1. in-progress changes for dijkstra-heap

    Josh Lothian committed Jul 5, 2013
    Configuration menu
    Copy the full SHA
    30cf19a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream' into kcore-merge

    Josh Lothian committed Jul 5, 2013
    Configuration menu
    Copy the full SHA
    ed1a3ff View commit details
    Browse the repository at this point in the history

  3. Clean up new k-core code

    Josh Lothian committed Jul 5, 2013
    Configuration menu
    Copy the full SHA
    7fdfd0c View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2013

  1. Power law fitting added to GraphProperties

    Jonathan Schrock committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    b127388 View commit details
    Browse the repository at this point in the history

  2. create a self tester for eigen solver, requres a define at compile time

    @MattBBaker
    MattBBaker committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    67a31c1 View commit details
    Browse the repository at this point in the history

  3. Merge branches 'josh-upstream' and 'eigen_spectrum'

    @MattBBaker
    MattBBaker committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    4977b99 View commit details
    Browse the repository at this point in the history

  4. Power Law fitting added to GraphProperties and compiles. Added a gtes… 

    …t, but currently doesn't work.
    Jonathan Schrock committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    fdab34c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #28 from MattBBaker/master 

    Adding eigenspectrum from Matt
    @jlothian
    jlothian committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    c6657e7 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2013

  1. Power law fitting has been added as well as a gtest for it. 

    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
    Jonathan Schrock committed Jul 11, 2013
    Configuration menu
    Copy the full SHA
    07a645d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'features'

    Jonathan Schrock committed Jul 11, 2013
    Configuration menu
    Copy the full SHA
    f5dc0b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2013

  1. Log macros are broken in some configurations. Disable them for now.

    @MattBBaker
    MattBBaker committed Jul 15, 2013
    Configuration menu
    Copy the full SHA
    807ebc1 View commit details
    Browse the repository at this point in the history

  2. add macosx option

    @MattBBaker
    MattBBaker committed Jul 15, 2013
    Configuration menu
    Copy the full SHA
    ba459d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2013

  1. starting to add in boost shortest paths

    Josh Lothian committed Jul 16, 2013
    Configuration menu
    Copy the full SHA
    d191b21 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2013

  1. clean up code; final boost changes

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    fedb98d View commit details
    Browse the repository at this point in the history

  2. adding binomial heap libs

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    ae4dada View commit details
    Browse the repository at this point in the history

  3. remove binomial heap code

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    469ec5c View commit details
    Browse the repository at this point in the history

  4. Remove heap code from graph_stats

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    e29bb87 View commit details
    Browse the repository at this point in the history

  5. update make.inc.X to include boost definitions

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    b69bebc View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into dijsktra-boost

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    e63aa2d View commit details
    Browse the repository at this point in the history

  7. merge PETSC code with BOOST code

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    6176b42 View commit details
    Browse the repository at this point in the history

  8. removing binomial heap code

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    ae45509 View commit details
    Browse the repository at this point in the history

  9. Clean up build errors related to BOOST and PETSC merge

    Josh Lothian committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    db10b88 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2013

  1. Merge remote-tracking branch 'upstream/master'

    @MattBBaker
    MattBBaker committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    8fe4d03 View commit details
    Browse the repository at this point in the history

  2. - Add doxygen comments to k-cores code 

    - Add function to Util for writing out k-core array
- Update graph-stats for degeneracy and k-core output
    Josh Lothian committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    c4ac183 View commit details
    Browse the repository at this point in the history

  3. doxygen comments for eigen spectrum

    @MattBBaker
    MattBBaker committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    92b7bcc View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master'

    @MattBBaker
    MattBBaker committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    52358fb View commit details
    Browse the repository at this point in the history

  5. Fix graph_stats to emit a warning if calling shortest_paths_boost and… 

    … it's not compiled in. Previously was silently failing
    Josh Lothian committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    f617e5b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #30 from MattBBaker/master 

    parallel make fixups
    @jlothian
    jlothian committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    d45e051 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2013

  1. Starting BC calculations; gives wrong answer

    Josh Lothian committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    336bd6c View commit details
    Browse the repository at this point in the history

  2. - reimplement betweenness centrality using boost methods 

    - code clean
    Josh Lothian committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    4508105 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'betweenness'

    Josh Lothian committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    9cf01b3 View commit details
    Browse the repository at this point in the history

  4. Added delta hyperbolicity code along with corresponding gtests. 

    The gtests cover connected and disconnected graphs.
Currently, requires omp to compile and run.
    Jonathan Schrock committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    cf6a2af View commit details
    Browse the repository at this point in the history

  5. Merge remote branch 'upstream/master'

    Jonathan Schrock committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    4eeaf5a View commit details
    Browse the repository at this point in the history

  6. Fix valgrind complaints about memory leaks

    Josh Lothian committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    aba88b7 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #29 from jdlschrock/master 

    Adding power law fitting from jdlschrock
    @jlothian
    jlothian committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    7744468 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into features 

    Conflicts:
	lib_graphd/inc/GraphProperties.h
	lib_graphd/src/GraphProperties.cpp
    Jonathan Schrock committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    cca84cd View commit details
    Browse the repository at this point in the history

  9. Added powerlaw and delta hyperbolicity to graph_stats.cpp

    Jonathan Schrock committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    32f5480 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2013

  1. Merge remote branch 'upstream/master' into merge_test 

    Conflicts:
	util/src/graph_stats.cpp
    Jonathan Schrock committed Jul 22, 2013
    Configuration menu
    Copy the full SHA
    75cff94 View commit details
    Browse the repository at this point in the history

  2. Fixing boost_graph not wrapped in ifdef and moving betweenness variab… 

    …le outside ifdef region in header.
    @bdsullivan
    bdsullivan committed Jul 22, 2013
    Configuration menu
    Copy the full SHA
    83eec4b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-kcores'

    Josh Lothian committed Jul 22, 2013
    Configuration menu
    Copy the full SHA
    0291834 View commit details
    Browse the repository at this point in the history

  4. Merge remote branch 'upstream/master'

    Jonathan Schrock committed Jul 22, 2013
    Configuration menu
    Copy the full SHA
    e627ec7 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2013

  1. Merge branch 'master' of github.com:jlothian/INDDGO-survey

    Josh Lothian committed Jul 23, 2013
    Configuration menu
    Copy the full SHA
    a1e1ef4 View commit details
    Browse the repository at this point in the history

  2. Merging upstream

    Josh Lothian committed Jul 23, 2013
    Configuration menu
    Copy the full SHA
    07433c6 View commit details
    Browse the repository at this point in the history

  3. Fixing METIS+ no OpenMP compilation

    Josh Lothian committed Jul 23, 2013
    Configuration menu
    Copy the full SHA
    7525582 View commit details
    Browse the repository at this point in the history

  4. Merging powerlaw and delta hyperbolicity code from Schrock

    Josh Lothian committed Jul 23, 2013
    Configuration menu
    Copy the full SHA
    733908f View commit details
    Browse the repository at this point in the history

  5. Fix compile issue in graph_stats

    Josh Lothian committed Jul 23, 2013
    Configuration menu
    Copy the full SHA
    6c276ef View commit details
    Browse the repository at this point in the history

  6. Added some conditional defines to enable gtest and boost to co-exist … 

    …in relative peace and tranquility
    Josh Lothian committed Jul 23, 2013
    Configuration menu
    Copy the full SHA
    38c95dd View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2013

  1. Fixing GraphReaderTest - gtest apparently really likes pointers to be… 

    … passed around instead of objects
    Josh Lothian committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    4b0c72d View commit details
    Browse the repository at this point in the history

  2. Build C++ tests using CXXFLAGS instead of CFLAGS

    Josh Lothian committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    076d2da View commit details
    Browse the repository at this point in the history

  3. Adding unit tests for clustering, based on results from networx

    Josh Lothian committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    dd7b690 View commit details
    Browse the repository at this point in the history

  4. Cleaning up code

    Josh Lothian committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    47e8acf View commit details
    Browse the repository at this point in the history

  5. Fixing makefile to rebuild tests if libgraphd.a changed

    Josh Lothian committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    55315b5 View commit details
    Browse the repository at this point in the history

  6. Merge remote branch 'upstream/master'

    Jonathan Schrock committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    3b8dfd8 View commit details
    Browse the repository at this point in the history

  7. Added HAS_BOOST wrappers around powerlaw functions. 

    Also, replaced EXPECT_LE with EXPECT_NEAR in several gtests
    Jonathan Schrock committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    9d7da8e View commit details
    Browse the repository at this point in the history

  8. A couple more fixes to compile BOOST-y things with gtest

    Josh Lothian committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    9bd7fa3 View commit details
    Browse the repository at this point in the history

  9. Protect powerlaw call in graph_stats with #ifdef; clean GraphProperti… 

    …es code
    Josh Lothian committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    e80d23a View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2013

  1. Merge remote branch 'upstream/master'

    Josh Lothian committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    6dc7d8d View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2013

  1. Add a -a option to append stats to an existing file.

    @MattBBaker
    MattBBaker committed Aug 27, 2013
    Configuration menu
    Copy the full SHA
    1253837 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branches 'upstream/master' and 'origin'

    @MattBBaker
    MattBBaker committed Aug 27, 2013
    Configuration menu
    Copy the full SHA
    2ee644c View commit details
    Browse the repository at this point in the history

  3. Merge login.nautilus.nics.utk.edu:/lustre/medusa/proj/tug1649/graph/I… 

    …NDDGO-survey into append
    @MattBBaker
    MattBBaker committed Aug 27, 2013
    Configuration menu
    Copy the full SHA
    61f3b60 View commit details
    Browse the repository at this point in the history

  4. remove random debug line that should have been removed long ago

    @MattBBaker
    MattBBaker committed Aug 27, 2013
    Configuration menu
    Copy the full SHA
    0c60eeb View commit details
    Browse the repository at this point in the history

  5. Fixing type on string

    @MattBBaker
    MattBBaker committed Aug 27, 2013
    Configuration menu
    Copy the full SHA
    6589c37 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #34 from MattBBaker/master 

    Append option
    @jlothian
    jlothian committed Aug 27, 2013
    Configuration menu
    Copy the full SHA
    b8cad69 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2013

  1. Revised random number generator initialization for speedup. 

    Added R-MAT and RIG generators to GraphCreator.
    @tdgoodrich
    tdgoodrich authored and Josh Lothian committed Sep 17, 2013
    Configuration menu
    Copy the full SHA
    da0a92b View commit details
    Browse the repository at this point in the history

  2. Fixing code to work with disconnected graphs/take largest components 

        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
    Josh Lothian committed Sep 17, 2013
    Configuration menu
    Copy the full SHA
    3c62493 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2013

  1. Change deg. dist output to: 'degree value' instead of just 'value'

    Josh Lothian committed Sep 19, 2013
    Configuration menu
    Copy the full SHA
    8961b6d View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2013

  1. Add APSP matrix output functions

    Josh Lothian committed Sep 20, 2013
    Configuration menu
    Copy the full SHA
    d285cf2 View commit details
    Browse the repository at this point in the history

  2. add new method to specify writing of apsp matrix

    Josh Lothian committed Sep 20, 2013
    Configuration menu
    Copy the full SHA
    b91b313 View commit details
    Browse the repository at this point in the history

  3. Fix merge conflicts with spacing in student code and Matt's file appe… 

    …nd code
    Josh Lothian committed Sep 20, 2013
    Configuration menu
    Copy the full SHA
    b9ed5d4 View commit details
    Browse the repository at this point in the history

  4. clean-code

    Josh Lothian committed Sep 20, 2013
    Configuration menu
    Copy the full SHA
    7af3ad2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upstream'

    Josh Lothian committed Sep 20, 2013
    Configuration menu
    Copy the full SHA
    e43c0f4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'upstream' 

    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
    Josh Lothian committed Sep 20, 2013
    Configuration menu
    Copy the full SHA
    2cac33f View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2013

  1. fix my backwards append logic

    Josh Lothian committed Sep 21, 2013
    Configuration menu
    Copy the full SHA
    fd330be View commit details
    Browse the repository at this point in the history

  2. default output file stats to outprefix instead of graph-stats.txt

    Josh Lothian committed Sep 21, 2013
    Configuration menu
    Copy the full SHA
    2010ac1 View commit details
    Browse the repository at this point in the history

  3. write apsp matrix after other stats calculations, and fix its timing

    Josh Lothian committed Sep 21, 2013
    Configuration menu
    Copy the full SHA
    bda62d0 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2013

  1. fix output of nodes and edges

    Josh Lothian committed Sep 22, 2013
    Configuration menu
    Copy the full SHA
    715854f View commit details
    Browse the repository at this point in the history

  2. fix timing output/node output

    Josh Lothian committed Sep 22, 2013
    Configuration menu
    Copy the full SHA
    58e0151 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2013

  1. Hopefully fixing memory issues with large APSP matrices 

    Remove extraneous debug infoz
    Josh Lothian committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    628a9a6 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2013

  1. Check some more type declarations for apsp matrix

    Josh Lothian committed Sep 25, 2013
    Configuration menu
    Copy the full SHA
    67f6212 View commit details
    Browse the repository at this point in the history

  2. fix output for largest components

    Josh Lothian committed Sep 25, 2013
    Configuration menu
    Copy the full SHA
    5aec096 View commit details
    Browse the repository at this point in the history

  3. potential fix for overflow in avg_path_length

    Josh Lothian committed Sep 25, 2013
    Configuration menu
    Copy the full SHA
    29087c6 View commit details
    Browse the repository at this point in the history

  4. Adding routines to read in APSP matrices

    Josh Lothian committed Sep 25, 2013
    Configuration menu
    Copy the full SHA
    91a64ec View commit details
    Browse the repository at this point in the history

  5. cleaning up tons of merged code

    Josh Lothian committed Sep 25, 2013
    Configuration menu
    Copy the full SHA
    e8c27f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2013

  1. fix output for largest components

    Josh Lothian committed Sep 26, 2013
    Configuration menu
    Copy the full SHA
    c0972c7 View commit details
    Browse the repository at this point in the history

  2. fix merge

    Josh Lothian committed Sep 26, 2013
    Configuration menu
    Copy the full SHA
    23c7c4e View commit details
    Browse the repository at this point in the history

  3. add correct output of data we calculate (eccentricity, expansion) 

    Fix average shortest paths calculations on large graphs
    Josh Lothian committed Sep 26, 2013
    Configuration menu
    Copy the full SHA
    ee4e572 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix-avg-path'

    Josh Lothian committed Sep 26, 2013
    Configuration menu
    Copy the full SHA
    365dcfc View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2013

  1. Fix compilation erros when using uint64_t and boost isn't enabled

    Josh Lothian committed Sep 27, 2013
    Configuration menu
    Copy the full SHA
    389849a View commit details
    Browse the repository at this point in the history

  2. Resolving merge conflicts for survey/merge-2.0 and testing branch.

    @bdsullivan
    bdsullivan committed Sep 27, 2013
    Configuration menu
    Copy the full SHA
    ce5dd16 View commit details
    Browse the repository at this point in the history

  3. Adding example for running graph_stats

    @bdsullivan
    bdsullivan committed Sep 27, 2013
    Configuration menu
    Copy the full SHA
    5188957 View commit details
    Browse the repository at this point in the history