valor-lite 0.33.11__tar.gz → 0.33.12__tar.gz

{valor_lite-0.33.11/valor_lite.egg-info → valor_lite-0.33.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: valor-lite
-Version: 0.33.11
+Version: 0.33.12
 Summary: Compute valor metrics locally.
 License: MIT License
         

{valor_lite-0.33.11 → valor_lite-0.33.12}/tests/classification/test_accuracy.py

@@ -53,18 +53,12 @@ def test_accuracy_computation():
     )
 
     # score threshold, label, count metric
-    assert accuracy.shape == (2, 4)
+    assert accuracy.shape == (2,)
 
     # score >= 0.25
-    assert accuracy[0][0] == 2 / 3
-    assert accuracy[0][1] == 1.0
-    assert accuracy[0][2] == 2 / 3
-    assert accuracy[0][3] == 1.0
+    assert accuracy[0] == 2 / 3
     # score >= 0.75
-    assert accuracy[1][0] == 2 / 3
-    assert accuracy[1][1] == 1.0
-    assert accuracy[1][2] == 2 / 3
-    assert accuracy[1][3] == 2 / 3
+    assert accuracy[1] == 1 / 3
 
 
 def test_accuracy_basic(basic_classifications: list[Classification]):
@@ -87,20 +81,10 @@ def test_accuracy_basic(basic_classifications: list[Classification]):
     expected_metrics = [
         {
             "type": "Accuracy",
-            "value": [2 / 3, 2 / 3],
+            "value": [2 / 3, 1 / 3],
             "parameters": {
                 "score_thresholds": [0.25, 0.75],
                 "hardmax": True,
-                "label": "0",
-            },
-        },
-        {
-            "type": "Accuracy",
-            "value": [1.0, 2 / 3],
-            "parameters": {
-                "score_thresholds": [0.25, 0.75],
-                "hardmax": True,
-                "label": "3",
             },
         },
     ]
@@ -124,29 +108,10 @@ def test_accuracy_with_animal_example(
     expected_metrics = [
         {
             "type": "Accuracy",
-            "value": [2.0 / 3.0],
-            "parameters": {
-                "score_thresholds": [0.5],
-                "hardmax": True,
-                "label": "bird",
-            },
-        },
-        {
-            "type": "Accuracy",
-            "value": [0.5],
+            "value": [2.0 / 6.0],
             "parameters": {
                 "score_thresholds": [0.5],
                 "hardmax": True,
-                "label": "dog",
-            },
-        },
-        {
-            "type": "Accuracy",
-            "value": [2 / 3],
-            "parameters": {
-                "score_thresholds": [0.5],
-                "hardmax": True,
-                "label": "cat",
             },
         },
     ]
@@ -170,38 +135,10 @@ def test_accuracy_color_example(
     expected_metrics = [
         {
             "type": "Accuracy",
-            "value": [2 / 3],
-            "parameters": {
-                "score_thresholds": [0.5],
-                "hardmax": True,
-                "label": "white",
-            },
-        },
-        {
-            "type": "Accuracy",
-            "value": [2 / 3],
+            "value": [2 / 6],
             "parameters": {
                 "score_thresholds": [0.5],
                 "hardmax": True,
-                "label": "red",
-            },
-        },
-        {
-            "type": "Accuracy",
-            "value": [2 / 3],
-            "parameters": {
-                "score_thresholds": [0.5],
-                "hardmax": True,
-                "label": "blue",
-            },
-        },
-        {
-            "type": "Accuracy",
-            "value": [5 / 6],
-            "parameters": {
-                "score_thresholds": [0.5],
-                "hardmax": True,
-                "label": "black",
             },
         },
     ]
@@ -237,7 +174,6 @@ def test_accuracy_with_image_example(
             "parameters": {
                 "score_thresholds": [0.0],
                 "hardmax": True,
-                "label": "v4",
             },
         },
     ]
@@ -269,29 +205,10 @@ def test_accuracy_with_tabular_example(
     expected_metrics = [
         {
             "type": "Accuracy",
-            "value": [0.7],
-            "parameters": {
-                "score_thresholds": [0.0],
-                "hardmax": True,
-                "label": "0",
-            },
-        },
-        {
-            "type": "Accuracy",
-            "value": [0.5],
-            "parameters": {
-                "score_thresholds": [0.0],
-                "hardmax": True,
-                "label": "1",
-            },
-        },
-        {
-            "type": "Accuracy",
-            "value": [0.8],
+            "value": [5 / 10],
             "parameters": {
                 "score_thresholds": [0.0],
                 "hardmax": True,
-                "label": "2",
             },
         },
     ]

{valor_lite-0.33.11 → valor_lite-0.33.12}/valor_lite/classification/computation.py

@@ -182,9 +182,9 @@ def compute_metrics(
         out=precision,
     )
 
-    accuracy = np.zeros_like(recall)
+    accuracy = np.zeros(n_scores, dtype=np.float64)
     np.divide(
-        (counts[:, :, 0] + counts[:, :, 3]),
+        counts[:, :, 0].sum(axis=1),
         float(n_datums),
         out=accuracy,
     )

{valor_lite-0.33.11 → valor_lite-0.33.12}/valor_lite/classification/manager.py

@@ -367,6 +367,14 @@ class Evaluator:
             )
         ]
 
+        metrics[MetricType.Accuracy] = [
+            Accuracy(
+                value=accuracy.astype(float).tolist(),
+                score_thresholds=score_thresholds,
+                hardmax=hardmax,
+            )
+        ]
+
         for label_idx, label in self.index_to_label.items():
 
             kwargs = {
@@ -401,12 +409,6 @@ class Evaluator:
                     **kwargs,
                 )
             )
-            metrics[MetricType.Accuracy].append(
-                Accuracy(
-                    value=accuracy[:, label_idx].astype(float).tolist(),
-                    **kwargs,
-                )
-            )
             metrics[MetricType.F1].append(
                 F1(
                     value=f1_score[:, label_idx].astype(float).tolist(),

{valor_lite-0.33.11 → valor_lite-0.33.12}/valor_lite/classification/metric.py

@@ -158,24 +158,23 @@ class Recall(_ThresholdValue):
     pass
 
 
-class Accuracy(_ThresholdValue):
+class F1(_ThresholdValue):
     """
-    Accuracy metric for a specific class label.
+    F1 score for a specific class label.
 
-    This class calculates the accuracy at various score thresholds for a binary
-    classification task. Accuracy is defined as the ratio of the sum of true positives and
-    true negatives over all predictions.
+    This class calculates the F1 score at various score thresholds for a binary
+    classification task.
 
     Attributes
     ----------
     value : list[float]
-        Accuracy values computed at each score threshold.
+        F1 scores computed at each score threshold.
     score_thresholds : list[float]
-        Score thresholds at which the accuracy values are computed.
+        Score thresholds at which the F1 scores are computed.
     hardmax : bool
         Indicates whether hardmax thresholding was used.
     label : str
-        The class label for which the accuracy is computed.
+        The class label for which the F1 score is computed.
 
     Methods
     -------
@@ -188,23 +187,21 @@ class Accuracy(_ThresholdValue):
     pass
 
 
-class F1(_ThresholdValue):
+@dataclass
+class Accuracy:
     """
-    F1 score for a specific class label.
+    Multiclass accuracy metric.
 
-    This class calculates the F1 score at various score thresholds for a binary
-    classification task.
+    This class calculates the accuracy at various score thresholds.
 
     Attributes
     ----------
     value : list[float]
-        F1 scores computed at each score threshold.
+        Accuracy values computed at each score threshold.
     score_thresholds : list[float]
-        Score thresholds at which the F1 scores are computed.
+        Score thresholds at which the accuracy values are computed.
     hardmax : bool
         Indicates whether hardmax thresholding was used.
-    label : str
-        The class label for which the F1 score is computed.
 
     Methods
     -------
@@ -214,7 +211,22 @@ class F1(_ThresholdValue):
         Converts the instance to a dictionary representation.
     """
 
-    pass
+    value: list[float]
+    score_thresholds: list[float]
+    hardmax: bool
+
+    def to_metric(self) -> Metric:
+        return Metric(
+            type=type(self).__name__,
+            value=self.value,
+            parameters={
+                "score_thresholds": self.score_thresholds,
+                "hardmax": self.hardmax,
+            },
+        )
+
+    def to_dict(self) -> dict:
+        return self.to_metric().to_dict()
 
 
 @dataclass

{valor_lite-0.33.11 → valor_lite-0.33.12/valor_lite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: valor-lite
-Version: 0.33.11
+Version: 0.33.12
 Summary: Compute valor metrics locally.
 License: MIT License