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

Import metrics with star import #555

Merged
merged 1 commit into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions ethicml/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
37 changes: 19 additions & 18 deletions ethicml/metrics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
2 changes: 2 additions & 0 deletions ethicml/metrics/anti_spur.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

from .metric import BaseMetric, Metric

__all__ = ["AS"]


@dataclass
class AS(BaseMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/average_odds.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/balanced_accuracy.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["BalancedAccuracy"]


@dataclass
class BalancedAccuracy(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/bcr.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
from .tnr import TNR
from .tpr import TPR

__all__ = ["BCR"]


@dataclass
class BCR(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/confusion_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/cv.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/fnr.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["FNR"]


@dataclass
class FNR(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/fpr.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["FPR"]


@dataclass
class FPR(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/hsic.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/npv.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["NPV"]


@dataclass
class NPV(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/ppv.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["PPV"]


@dataclass
class PPV(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/prob_neg.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["ProbNeg"]


@dataclass
class ProbNeg(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/prob_outcome.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

from .metric import BaseMetric, Metric

__all__ = ["ProbOutcome"]


@dataclass
class ProbOutcome(BaseMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/prob_pos.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["ProbPos"]


@dataclass
class ProbPos(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/theil.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

from .metric import BaseMetric

__all__ = ["Theil"]


@dataclass
class Theil(BaseMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/tnr.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["TNR"]


@dataclass
class TNR(CfmMetric):
Expand Down
2 changes: 2 additions & 0 deletions ethicml/metrics/tpr.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from .confusion_matrix import confusion_matrix
from .metric import CfmMetric, Metric

__all__ = ["TPR"]


@dataclass
class TPR(CfmMetric):
Expand Down