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

Added distance_threshold parameter to hierarchical clustering #9069

Merged

Commits on Oct 30, 2017

  1. Distance threshold added to hierarchical clustering

    When distance_threshold is set then it is used to determine the number of clusters to cut the tree at.
    Though it is to be noted that this works only when computer_full_tree=True.
    
    * When building the tree the return_distance set to True if the distance_threshold has been set.
    The distances returned is then used to calculate the number of clusters when cutting the tree.
    
    * Test agglomerative clustering with distance_threshold passed in and compare with the different number of clusters produced with and without connectivity.
    
    Changes to documentation to include distance_threshold
    
    Updates to distance threshold in hierarchical clustering
    
    * Moved the parameter check from init to fit for consistency
    
    * Updates to tests to account for changes made above
    
    Documentation changes based on review
    
    * backticks for variables in docstrings
    
    * formatting without backslashes
    
    Test for hierarchical clustering with distance_threshold
    
    * clusters produced are checked against the linkage tree to confirm that it matches the point where the distance exceeds the threshold set
    * boundary case test when distance_threshold is equal to the distance
    
    * Updated tests to compare clusters and number of clusters
    
    * Allowing users to set n_clusters or distance_threshold and updated tests
    
    * Checking the n_clusters None condition better
    
    * Removed the necessity for n_clusters_ to be set to None and redundant checks
    
    * Updated tests after the above changes
    
    * Cleaned up test to compare clusters produced using n_clusters against distance_threshold
    
    * Added and Simplified test for boundary conditions
    
    * Updated the documentation on distance_threshold restrictions
    VathsalaAchar committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    6c5f957 View commit details
    Browse the repository at this point in the history
  2. Changes based on review

    * Doc string updates for clear information
    
    * Removed redundant attribute n_clusters_
    
    * Fixed tests
    
    * Changes to FeatureAgglomeration to include distance threshold
    VathsalaAchar committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    8ea9afa View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2017

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

Commits on Dec 7, 2017

  1. Updates based on comments

    * Added a new attribute `n_clusters_` to hold clusters computed when distance threshold is set
    VathsalaAchar committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    03709c8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fda248d View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2019

  1. Configuration menu
    Copy the full SHA
    c45ec1f View commit details
    Browse the repository at this point in the history
  2. fix n_components

    adrinjalali committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    6efc3ec View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    47790a3 View commit details
    Browse the repository at this point in the history
  4. add whats_new entry

    adrinjalali committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    71dd010 View commit details
    Browse the repository at this point in the history
  5. minor fix on n_clusters_

    adrinjalali committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    0764729 View commit details
    Browse the repository at this point in the history
  6. fix tests

    adrinjalali committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    0649b29 View commit details
    Browse the repository at this point in the history
  7. fix docstrings

    adrinjalali committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    83600ea View commit details
    Browse the repository at this point in the history
  8. minor fix

    adrinjalali committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    43ef071 View commit details
    Browse the repository at this point in the history
  9. remove assert_true

    adrinjalali committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    7a8fc68 View commit details
    Browse the repository at this point in the history
  10. remove unrelated change

    adrinjalali committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    b37c183 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2019

  1. add a more explicit test

    adrinjalali committed Apr 10, 2019
    Configuration menu
    Copy the full SHA
    38659e4 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. merge upstream/master

    adrinjalali committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    b17a818 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2019

  1. merge upstream/master

    adrinjalali committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    fd44b65 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cd6c9aa View commit details
    Browse the repository at this point in the history
  3. code style change

    adrinjalali committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    c07fa4d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ba326ac View commit details
    Browse the repository at this point in the history
  5. apply more comments

    adrinjalali committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    0b94bef View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2019

  1. Configuration menu
    Copy the full SHA
    680e515 View commit details
    Browse the repository at this point in the history
  2. merge upstream/master

    adrinjalali committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    c84f429 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2019

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

Commits on Apr 26, 2019

  1. improve docstrings

    adrinjalali committed Apr 26, 2019
    Configuration menu
    Copy the full SHA
    3f1a6be View commit details
    Browse the repository at this point in the history
  2. merge upstream/master

    adrinjalali committed Apr 26, 2019
    Configuration menu
    Copy the full SHA
    36cd205 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4ae66fd View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2019

  1. merge upstream/master

    adrinjalali committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    8060020 View commit details
    Browse the repository at this point in the history