diff --git a/ethicml/__init__.py b/ethicml/__init__.py index f47e5d13..d9c32ffb 100644 --- a/ethicml/__init__.py +++ b/ethicml/__init__.py @@ -46,27 +46,7 @@ from .data.vision_data.genfaces import * from .evaluators.cross_validator import * from .evaluators.evaluate_models import * -from .metrics.accuracy import * -from .metrics.anti_spur import AS -from .metrics.average_odds import AverageOddsDiff -from .metrics.balanced_accuracy import BalancedAccuracy -from .metrics.bcr import BCR -from .metrics.confusion_matrix import LabelOutOfBounds, confusion_matrix -from .metrics.cv import CV, AbsCV -from .metrics.dependence_measures import * -from .metrics.fnr import FNR -from .metrics.fpr import FPR -from .metrics.hsic import Hsic -from .metrics.metric import * -from .metrics.npv import NPV -from .metrics.per_sensitive_attribute import * -from .metrics.ppv import PPV -from .metrics.prob_neg import ProbNeg -from .metrics.prob_outcome import ProbOutcome -from .metrics.prob_pos import ProbPos -from .metrics.theil import Theil -from .metrics.tnr import TNR -from .metrics.tpr import TPR +from .metrics import * from .preprocessing.adjust_labels import * from .preprocessing.biased_split import * from .preprocessing.domain_adaptation import * diff --git a/ethicml/metrics/__init__.py b/ethicml/metrics/__init__.py index a1778df7..8cc2f9bb 100644 --- a/ethicml/metrics/__init__.py +++ b/ethicml/metrics/__init__.py @@ -9,22 +9,23 @@ em.run_metrics(predictions, test_data, metrics=[em.Accuracy(), em.TPR(), em.ProbPos()]) """ from .accuracy import * -from .anti_spur import AS -from .average_odds import AverageOddsDiff -from .balanced_accuracy import BalancedAccuracy -from .bcr import BCR -from .confusion_matrix import LabelOutOfBounds, confusion_matrix -from .cv import CV, AbsCV +from .anti_spur import * +from .average_odds import * +from .balanced_accuracy import * +from .bcr import * +from .confusion_matrix import * +from .cv import * from .dependence_measures import * -from .fnr import FNR -from .fpr import FPR -from .hsic import Hsic -from .metric import Metric -from .npv import NPV -from .ppv import PPV -from .prob_neg import ProbNeg -from .prob_outcome import ProbOutcome -from .prob_pos import ProbPos -from .theil import Theil -from .tnr import TNR -from .tpr import TPR +from .fnr import * +from .fpr import * +from .hsic import * +from .metric import * +from .npv import * +from .per_sensitive_attribute import * +from .ppv import * +from .prob_neg import * +from .prob_outcome import * +from .prob_pos import * +from .theil import * +from .tnr import * +from .tpr import * diff --git a/ethicml/metrics/anti_spur.py b/ethicml/metrics/anti_spur.py index 7e38409c..d1b93ddd 100644 --- a/ethicml/metrics/anti_spur.py +++ b/ethicml/metrics/anti_spur.py @@ -9,6 +9,8 @@ from .metric import BaseMetric, Metric +__all__ = ["AS"] + @dataclass class AS(BaseMetric): diff --git a/ethicml/metrics/average_odds.py b/ethicml/metrics/average_odds.py index f5a23c8d..ff137d49 100644 --- a/ethicml/metrics/average_odds.py +++ b/ethicml/metrics/average_odds.py @@ -11,6 +11,8 @@ from .per_sensitive_attribute import diff_per_sensitive_attribute, metric_per_sensitive_attribute from .tpr import TPR +__all__ = ["AverageOddsDiff"] + @dataclass class AverageOddsDiff(CfmMetric): diff --git a/ethicml/metrics/balanced_accuracy.py b/ethicml/metrics/balanced_accuracy.py index 55497fec..a4270282 100644 --- a/ethicml/metrics/balanced_accuracy.py +++ b/ethicml/metrics/balanced_accuracy.py @@ -9,6 +9,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["BalancedAccuracy"] + @dataclass class BalancedAccuracy(CfmMetric): diff --git a/ethicml/metrics/bcr.py b/ethicml/metrics/bcr.py index 916ec82a..34359a5a 100644 --- a/ethicml/metrics/bcr.py +++ b/ethicml/metrics/bcr.py @@ -10,6 +10,8 @@ from .tnr import TNR from .tpr import TPR +__all__ = ["BCR"] + @dataclass class BCR(CfmMetric): diff --git a/ethicml/metrics/confusion_matrix.py b/ethicml/metrics/confusion_matrix.py index c43ac253..b56dfa63 100644 --- a/ethicml/metrics/confusion_matrix.py +++ b/ethicml/metrics/confusion_matrix.py @@ -7,6 +7,8 @@ from ethicml.utility import DataTuple, Prediction +__all__ = ["LabelOutOfBounds", "confusion_matrix"] + class LabelOutOfBounds(Exception): """Metric Not Applicable per sensitive attribute, apply to whole dataset instead.""" diff --git a/ethicml/metrics/cv.py b/ethicml/metrics/cv.py index 6a847858..b025826d 100644 --- a/ethicml/metrics/cv.py +++ b/ethicml/metrics/cv.py @@ -10,6 +10,8 @@ from .per_sensitive_attribute import diff_per_sensitive_attribute, metric_per_sensitive_attribute from .prob_pos import ProbPos +__all__ = ["AbsCV", "CV"] + @dataclass class CV(CfmMetric): diff --git a/ethicml/metrics/fnr.py b/ethicml/metrics/fnr.py index cab32280..deaf1557 100644 --- a/ethicml/metrics/fnr.py +++ b/ethicml/metrics/fnr.py @@ -9,6 +9,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["FNR"] + @dataclass class FNR(CfmMetric): diff --git a/ethicml/metrics/fpr.py b/ethicml/metrics/fpr.py index 3f26aea2..a7b7e23d 100644 --- a/ethicml/metrics/fpr.py +++ b/ethicml/metrics/fpr.py @@ -9,6 +9,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["FPR"] + @dataclass class FPR(CfmMetric): diff --git a/ethicml/metrics/hsic.py b/ethicml/metrics/hsic.py index 8275bed1..643ed4f8 100644 --- a/ethicml/metrics/hsic.py +++ b/ethicml/metrics/hsic.py @@ -12,6 +12,8 @@ from ethicml.metrics.metric import BaseMetric from ethicml.utility import DataTuple, Prediction +__all__ = ["Hsic"] + def hsic( prediction: np.ndarray, label: np.ndarray, sigma_first: float, sigma_second: float diff --git a/ethicml/metrics/npv.py b/ethicml/metrics/npv.py index f25c06ba..e51c62e1 100644 --- a/ethicml/metrics/npv.py +++ b/ethicml/metrics/npv.py @@ -9,6 +9,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["NPV"] + @dataclass class NPV(CfmMetric): diff --git a/ethicml/metrics/ppv.py b/ethicml/metrics/ppv.py index d183b703..84423d8e 100644 --- a/ethicml/metrics/ppv.py +++ b/ethicml/metrics/ppv.py @@ -9,6 +9,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["PPV"] + @dataclass class PPV(CfmMetric): diff --git a/ethicml/metrics/prob_neg.py b/ethicml/metrics/prob_neg.py index 7465b65b..e59f50a8 100644 --- a/ethicml/metrics/prob_neg.py +++ b/ethicml/metrics/prob_neg.py @@ -9,6 +9,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["ProbNeg"] + @dataclass class ProbNeg(CfmMetric): diff --git a/ethicml/metrics/prob_outcome.py b/ethicml/metrics/prob_outcome.py index eaa5c539..1bd088d8 100644 --- a/ethicml/metrics/prob_outcome.py +++ b/ethicml/metrics/prob_outcome.py @@ -8,6 +8,8 @@ from .metric import BaseMetric, Metric +__all__ = ["ProbOutcome"] + @dataclass class ProbOutcome(BaseMetric): diff --git a/ethicml/metrics/prob_pos.py b/ethicml/metrics/prob_pos.py index 69f38fa9..6597b2dc 100644 --- a/ethicml/metrics/prob_pos.py +++ b/ethicml/metrics/prob_pos.py @@ -9,6 +9,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["ProbPos"] + @dataclass class ProbPos(CfmMetric): diff --git a/ethicml/metrics/theil.py b/ethicml/metrics/theil.py index 71513349..9c279819 100644 --- a/ethicml/metrics/theil.py +++ b/ethicml/metrics/theil.py @@ -13,6 +13,8 @@ from .metric import BaseMetric +__all__ = ["Theil"] + @dataclass class Theil(BaseMetric): diff --git a/ethicml/metrics/tnr.py b/ethicml/metrics/tnr.py index 003f827b..bc618786 100644 --- a/ethicml/metrics/tnr.py +++ b/ethicml/metrics/tnr.py @@ -10,6 +10,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["TNR"] + @dataclass class TNR(CfmMetric): diff --git a/ethicml/metrics/tpr.py b/ethicml/metrics/tpr.py index 3bbdcefe..66f84f92 100644 --- a/ethicml/metrics/tpr.py +++ b/ethicml/metrics/tpr.py @@ -9,6 +9,8 @@ from .confusion_matrix import confusion_matrix from .metric import CfmMetric, Metric +__all__ = ["TPR"] + @dataclass class TPR(CfmMetric):