Skip to content

Commit

Permalink
Merge pull request #95 from y-takashina/develop
Browse files Browse the repository at this point in the history
fixed docstring
  • Loading branch information
ytakashina committed Oct 2, 2018
2 parents 8d251ff + 4f8569d commit 36bb106
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 4 additions & 6 deletions depynd/information/_information.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ def mutual_information(X, Y, mi_estimator='auto', is_discrete='auto', force_non_
Y : array-like, shape (n_samples, n_features_y) or (n_samples)
Observations of the other variable.
mi_estimator : {'knn', 'dr', 'plugin', 'auto'}, default 'auto'
MI estimator. If 'auto', MI estimator will be selected depending on whether all features are purely discrete,
purely continuous, or discrete-continuous mixed. If purely discrete, 'plugin' estimator will be used. Otherwise,
'knn' estimator will be selected.
MI estimator. If 'auto', MI estimator will be selected depending on whether all features are purely discrete or
not. If purely discrete, 'plugin' estimator will be used. Otherwise, 'knn' estimator will be selected.
is_discrete : {'auto', bool}, default 'auto'
If ``bool``, then it determines whether to consider all features purely discrete or purely continuous. If
'auto', a column which contains duplicate elements will be considered discrete.
Expand Down Expand Up @@ -93,9 +92,8 @@ def conditional_mutual_information(X, Y, Z, mi_estimator='auto', is_discrete='au
Z : array-like, shape (n_samples, n_features_z) or (n_samples)
Observations of the conditioning variable.
mi_estimator : {'knn', 'dr', 'plugin', 'auto'}, default 'auto'
MI estimator. If 'auto', MI estimator will be selected depending on whether all features are purely discrete,
purely continuous, or discrete-continuous mixed. If purely discrete, 'plugin' estimator will be used. Otherwise,
'knn' estimator will be selected.
MI estimator. If 'auto', MI estimator will be selected depending on whether all features are purely discrete or
not. If purely discrete, 'plugin' estimator will be used. Otherwise, 'knn' estimator will be selected.
is_discrete : {'auto', bool}, default 'auto'
If ``bool``, then it determines whether to consider all features purely discrete or purely continuous. If
'auto', a column which contains duplicate elements will be considered discrete.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='depynd',
version='0.6.2',
version='0.6.3',
description='Evaluating dependencies among random variables.',
long_description=long_description,
author='Yuya Takashina',
Expand Down

0 comments on commit 36bb106

Please sign in to comment.