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

Adjusted Mutual Information #402

Merged
merged 38 commits into from
Nov 10, 2011
Merged

Adjusted Mutual Information #402

merged 38 commits into from
Nov 10, 2011

Commits on Oct 14, 2011

  1. Trying to fix NaN errors, but its not working. Pushing to work on it … 

    …later.
    @robertlayton
    robertlayton committed Oct 14, 2011
    Configuration menu
    Copy the full SHA
    2eb9833 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2011

  1. Mutual information now works (tested!)

    @robertlayton
    robertlayton committed Oct 15, 2011
    Configuration menu
    Copy the full SHA
    c3d3906 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2011

  1. AMI now works, and has been tested against the matlab code (test base… 

    …d on this to come!)
    @robertlayton
    robertlayton committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    9f05c11 View commit details
    Browse the repository at this point in the history

  2. Remove phantom double v-measure !?

    @robertlayton
    robertlayton committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    e473f70 View commit details
    Browse the repository at this point in the history

  3. Added tests. There are two errors, but I'm going to bed. I'll fix the… 

    …m in the morning.
    @robertlayton
    robertlayton committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    2d8677f View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2011

  1. Merge branch 'master' into ami 

    Conflicts:
	sklearn/metrics/cluster/__init__.py
    @robertlayton
    robertlayton committed Oct 20, 2011
    Configuration menu
    Copy the full SHA
    af91582 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ami' of github.com:robertlayton/scikit-learn into ami

    @robertlayton
    robertlayton committed Oct 20, 2011
    Configuration menu
    Copy the full SHA
    770020f View commit details
    Browse the repository at this point in the history

  3. - AMI in the cluster examples 

    - See Also sections updated
- mutual_information -> mutual_information_score (and updating subsequent imports)
    @robertlayton
    robertlayton committed Oct 20, 2011
    Configuration menu
    Copy the full SHA
    193ac02 View commit details
    Browse the repository at this point in the history

  4. Higher level import for ami_score

    @robertlayton
    robertlayton committed Oct 20, 2011
    Configuration menu
    Copy the full SHA
    867ec2f View commit details
    Browse the repository at this point in the history

  5. There is an overflow problem. It can be reproduced with the plot_adju… 

    …sted_for_chance_measures.py example

Commiting to get help on error
    @robertlayton
    robertlayton committed Oct 20, 2011
    Configuration menu
    Copy the full SHA
    18b9a78 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2011

  1. Narrative doc, and I think I fixed the overflow issue (more tests to … 

    …come)
    @robertlayton
    robertlayton committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    aaf5c23 View commit details
    Browse the repository at this point in the history

  2. Fixed logs to match the matlab code results. 

    This fixes the tests (which needed a bit of updating)
    @robertlayton
    robertlayton committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    fb0c3f8 View commit details
    Browse the repository at this point in the history

  3. Test now tests a much larger array

    @robertlayton
    robertlayton committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    db845fa View commit details
    Browse the repository at this point in the history

  4. Test actually does what I meant it to do, and works sufficiently

    @robertlayton
    robertlayton committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    77ec530 View commit details
    Browse the repository at this point in the history

  5. Fixed this example. Tested the others (they worked!)

    @robertlayton
    robertlayton committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    52fc4c5 View commit details
    Browse the repository at this point in the history

  6. pep8 and pyflakes

    @robertlayton
    robertlayton committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    c021b59 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2011

  1. Merge remote-tracking branch 'robertlayton/ami' into robertlayton-ami

    @ogrisel
    ogrisel committed Oct 22, 2011
    Configuration menu
    Copy the full SHA
    3052291 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2011

  1. measure runtimes for various clustering metrics in adjusted for chanc… 

    …e example
    @ogrisel
    ogrisel committed Oct 23, 2011
    Configuration menu
    Copy the full SHA
    b7d7642 View commit details
    Browse the repository at this point in the history

  2. FIX warnings by avoiding 0.0 values in the log + cosmit

    @ogrisel
    ogrisel committed Oct 23, 2011
    Configuration menu
    Copy the full SHA
    3845fd8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3 from ogrisel/robertlayton-ami 

    Fixes for AMI score PR
    @robertlayton
    robertlayton committed Oct 23, 2011
    Configuration menu
    Copy the full SHA
    b89b6d0 View commit details
    Browse the repository at this point in the history

  4. Optimising the expected mutual information code 

    Still a long way to go, but I've halved the time from approx 30 seconds to 16 seconds for an example
    @robertlayton
    robertlayton committed Oct 23, 2011
    Configuration menu
    Copy the full SHA
    77ff098 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2011

  1. Adding old version of EMI, as I'm about to change it

    @robertlayton
    robertlayton committed Oct 29, 2011
    Configuration menu
    Copy the full SHA
    13a48df View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2011

  1. This version doesn't work either. I am uploading for historical sake. 

    I'll be undoing these changes with the gammaln function to see how that goes.
    @robertlayton
    robertlayton committed Nov 2, 2011
    Configuration menu
    Copy the full SHA
    ccc3cad View commit details
    Browse the repository at this point in the history

  2. Initial usage of gammaln. Not yet tested

    @robertlayton
    robertlayton committed Nov 2, 2011
    Configuration menu
    Copy the full SHA
    fb6fe36 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/scikit-learn/scikit-learn … 

    …into ami
    @robertlayton
    robertlayton committed Nov 2, 2011
    Configuration menu
    Copy the full SHA
    a786bdc View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2011

  1. Still overflows, but the closest so far. Using gammaln

    @robertlayton
    robertlayton committed Nov 5, 2011
    Configuration menu
    Copy the full SHA
    75bf5b0 View commit details
    Browse the repository at this point in the history

  2. It works! Still have some optimisation to do, but it works for larger… 

    … arrays
    @robertlayton
    robertlayton committed Nov 5, 2011
    Configuration menu
    Copy the full SHA
    01ae29e View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2011

  1. Moved start and finish outside of loop

    @robertlayton
    robertlayton committed Nov 6, 2011
    Configuration menu
    Copy the full SHA
    f407372 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2011

  1. comments, pep8 and pyflakes

    @robertlayton
    robertlayton committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    88adf3b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/scikit-learn/scikit-learn … 

    …into ami
    @robertlayton
    robertlayton committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    9f6ca7f View commit details
    Browse the repository at this point in the history

  3. ami_score -> adjusted_mutual_info_score 

    Warning about slowness of function
    @robertlayton
    robertlayton committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    2fa1052 View commit details
    Browse the repository at this point in the history

  4. ami_score -> adjusted_mutual_info_score 

    This time, in examples and docs!
    @robertlayton
    robertlayton committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    e51e4d6 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2011

  1. "What's new?" AMI!

    @robertlayton
    robertlayton committed Nov 8, 2011
    Configuration menu
    Copy the full SHA
    66f7a0b View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2011

  1. Merge branch 'ami' of https://github.com/robertlayton/scikit-learn in… 

    …to ami

Conflicts:
	doc/whats_new.rst
    @robertlayton
    robertlayton committed Nov 10, 2011
    Configuration menu
    Copy the full SHA
    b9685ff View commit details
    Browse the repository at this point in the history

  2. mutual_information_score -> mutual_info_score

    @robertlayton
    robertlayton committed Nov 10, 2011
    Configuration menu
    Copy the full SHA
    f26ed76 View commit details
    Browse the repository at this point in the history

  3. and in plot_adjusted example (mutual_info_score)

    @robertlayton
    robertlayton committed Nov 10, 2011
    Configuration menu
    Copy the full SHA
    17ee6c4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/scikit-learn/scikit-learn … 

    …into ami
    @robertlayton
    robertlayton committed Nov 10, 2011
    Configuration menu
    Copy the full SHA
    ff0dbf9 View commit details
    Browse the repository at this point in the history

  5. cosmit

    @robertlayton
    robertlayton committed Nov 10, 2011
    Configuration menu
    Copy the full SHA
    118e8bd View commit details
    Browse the repository at this point in the history