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

Change in handling multilayer to allow for single intra-layer partition object #34

Open
wants to merge 72 commits into
base: master
Choose a base branch
from

Commits on May 24, 2018

  1. Configuration menu
    Copy the full SHA
    c7cfea4 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2018

  1. Configuration menu
    Copy the full SHA
    7c37242 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    af89249 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fba54f5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    50f1be9 View commit details
    Browse the repository at this point in the history
  5. Fix minor syntax issues

    ragibson committed May 25, 2018
    Configuration menu
    Copy the full SHA
    feafeda View commit details
    Browse the repository at this point in the history

Commits on May 29, 2018

  1. Configuration menu
    Copy the full SHA
    47ff4f4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f5b64b View commit details
    Browse the repository at this point in the history
  3. Fix const initialization

    ragibson committed May 29, 2018
    Configuration menu
    Copy the full SHA
    f5731d9 View commit details
    Browse the repository at this point in the history
  4. added GRAPHML class

    wweir827 committed May 29, 2018
    Configuration menu
    Copy the full SHA
    3c6174d View commit details
    Browse the repository at this point in the history

Commits on May 30, 2018

  1. modified WeightedLayers headed to have necessary variables/methods

    modified MutableVertexPartition to make methods virtual
    wweir827 committed May 30, 2018
    Configuration menu
    Copy the full SHA
    17905b8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    75bf37c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d2643e1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f6c7f23 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ae6edf7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4b3982f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. Configuration menu
    Copy the full SHA
    f157b82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    06c4d6d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a1a6976 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2d40c63 View commit details
    Browse the repository at this point in the history
  5. Remove layer_vec and degree_by_layers from partition constructors

    Both these vectors represent properties of the underlying graph (not the
    partition) as should be instantiated as such.
    ragibson committed May 31, 2018
    Configuration menu
    Copy the full SHA
    3d86bfd View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ef93f6f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    65be259 View commit details
    Browse the repository at this point in the history
  8. Fix some issues with RBConfigurationVertexPartitionWeightedLayers

    Reverted changes to MutableVertexPartition.h, removed raising of Python
    exceptions in C++ helper functions, and corrected some references to
    nonexistent variables.
    
    init_admin(), move_node(), diff_move(), and quality() have not been
    changed and remain broken.
    ragibson committed May 31, 2018
    Configuration menu
    Copy the full SHA
    3bf11d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. Configuration menu
    Copy the full SHA
    dc957f2 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/multilayer-graph-helper'

    # Conflicts:
    #	src/VertexPartition.py
    #	src/python_partition_interface.cpp
    wweir827 committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    2fd7c1c View commit details
    Browse the repository at this point in the history
  3. fixed compile errors caused by nesting of cpp fxns using temp.

    inserted divide by m in modularity calculation
    wweir827 committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    cb20996 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fbba4ea View commit details
    Browse the repository at this point in the history
  5. ported over methods to RBConfigurationVertexPartitionWeightedLyaers t…

    …o handle caching of neighbors and edge weights by layer for each vertex
    wweir827 committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    75ddb0f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3aec48f View commit details
    Browse the repository at this point in the history
  7. removed methods that don't need to be overriden

    fixed a few cases to make operations vector based .
    wweir827 committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    16f7aca View commit details
    Browse the repository at this point in the history
  8. removed methods that don't need to be overriden

    fixed a few cases to make operations vector based .
    wweir827 committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    2d8211a View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. Configuration menu
    Copy the full SHA
    c6d0f66 View commit details
    Browse the repository at this point in the history
  2. Refactor to initialize layer data in Graph constructor

    The layer membership vector and per-layer edge weights are now
    initialized in GraphHelper's Graph.
    ragibson committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    58741e3 View commit details
    Browse the repository at this point in the history
  3. Remove debug output

    ragibson committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    d97972b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6d94479 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    adecc5f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    73dc39b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    83253da View commit details
    Browse the repository at this point in the history
  8. Fix computation of total layer weights

    Before, the indices of degree_by_layers were accidentally reversed.
    ragibson committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    b26fc7e View commit details
    Browse the repository at this point in the history
  9. test total_weight_layer

    wweir827 committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    e9516f4 View commit details
    Browse the repository at this point in the history
  10. test total_weight_layer

    wweir827 committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    739dbcc View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. fixed get_empty_communities() to work for RBC...WeightedLayers class

    made _empty_communties vector protected so that it could be modified by the
    inherited class.
    wweir827 committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    54b2726 View commit details
    Browse the repository at this point in the history
  2. fixed get_empty_communities() to work for RBC...WeightedLayers class

    made _empty_communties vector protected so that it could be modified by the
    inherited class.
    wweir827 committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    bfdde5b View commit details
    Browse the repository at this point in the history
  3. fixed adding node strengths for both in and out in the case that it i…

    …s undirected
    
    fixed aggregating total_community_weight to and from where all weight had been being added to the from community
    wweir827 committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    43fe54f View commit details
    Browse the repository at this point in the history
  4. Merge branch 'fix_inheritance'

    # Conflicts:
    #	src/RBConfigurationVertexPartitionWeightedLayers.cpp
    #	tests/test_RBCVPweightedlayers.py
    wweir827 committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    45b358e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    479ffb3 View commit details
    Browse the repository at this point in the history
  6. Change default layer count to zero to fix segfault

    Before, much of the multi-layer data would not be initialized if all
    nodes were assigned to the same layer (i.e. layer count of 1).
    ragibson committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    5764c9d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2fa53a4 View commit details
    Browse the repository at this point in the history
  8. changed unit test to accomodate construction of RBConfigurationWeight…

    …eLayers
    
    removed print lines
    updated diff quality to account for 2* node_size.
    wweir827 committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    ea6f5a4 View commit details
    Browse the repository at this point in the history
  9. overrid fromCpartition method in RBConfigurationWeightedLayers.py to …

    …incorporate edge layer weights into the conglomerated graph
    
    made layer_vec argument unnecessary for construction (default is to treat everything as sinlge layer)
    modified function getting graph edges, weights, and nodes from the c++ side to create agglomerated version that returns edge weights by layers
    wweir827 committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    bd680e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. commented out method to set the edge layer weights from python side (…

    …currently no need to do this)
    
    fixed python facing method to get layer_weights
    wweir827 committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    ec51cf8 View commit details
    Browse the repository at this point in the history
  2. added methods to compute total weights to and from com by summing ove…

    …r the layer valued versions
    wweir827 committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    62471c6 View commit details
    Browse the repository at this point in the history
  3. Remove completed TODO items

    ragibson committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    7db519e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7d000e4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9b340ce View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    26d3a1f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5ab601a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Improve performance of some WeightedLayers functions

    RBConfigurationVertexPartitionWeightedLayers optimization is roughly
    100% faster now (i.e. it will take about half the time it used to).
    
    Also removed an extraneous function in GraphHelper and changed the use
    of IGRAPH_OUT to IGRAPH_IN in weight_from_comm.
    ragibson committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    3478a81 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. Revert various files to original state

    The following files were not significantly changed and have been
    reverted to their state in vtraag/louvain-igraph's master branch:
     - ModularityVertexPartition.h
     - Optimiser.h
     - MutableVertexPartition.cpp
     - python_optimiser_interface.cpp
     - RBConfigurationVertexPartition.cpp
    ragibson committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    cb8ec32 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    50c7cac View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f012ddf View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7c79308 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Configuration menu
    Copy the full SHA
    fb7b9db View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. 4 Configuration menu
    Copy the full SHA
    9762b75 View commit details
    Browse the repository at this point in the history
  2. remove numpy dependency. explicityly cast ints in layer_vec to preven…

    …t PyLong_Check from failing
    wweir827 committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    383478f View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. removed numpy dependency. Cast layer_vec to list

    handle list values using PyNumber_AsSsize_t instead of PyLong_AsLong
    raises python index error if unable to convert them.
    wweir827 committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    54f2207 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2018

  1. added resolution parameter to calculation of quality for RBCweightedL…

    …ayers
    
    changed PyLong Check to PyNumber Check for same compatibility
    wweir827 committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    57707f6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3ec4bdd View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2020

  1. Configuration menu
    Copy the full SHA
    9612a20 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Configuration menu
    Copy the full SHA
    4143497 View commit details
    Browse the repository at this point in the history
  2. Tweak setup.py

    ragibson committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    f9f25a5 View commit details
    Browse the repository at this point in the history