pheval 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

pheval/analyse/rank_stats.py

@@ -124,24 +124,11 @@ class Ranks:
         return np.mean(precision_at_k)
 
     @classmethod
-    def mean_average_precision_at_k(cls, df: pl.LazyFrame, k: int) -> pl.LazyFrame:
-        """
-        Compute Mean Average Precision at K (MAP@K) by averaging AP@K scores.
-        Args:
-            df (pl.LazyFrame): The dataframe calculate MAP@K for each query.
-            k (int): The upper rank limit.
-        Returns:
-            pl.LazyFrame: The dataframe with MAP@K for each query.
-        """
+    def mean_average_precision_at_k(cls, df: pl.LazyFrame, k: int) -> float:
         ap_at_k_df = cls._average_precision_at_k(df, k)
-        return (
-            ap_at_k_df.select(
-                pl.col(f"ap@{k}").sum() / df.select(Ranks.NUMBER_OF_SAMPLES).collect()
-            )
-            .fill_null(0.0)
-            .collect()
-            .item()
-        )
+        ap_sum = ap_at_k_df.select(pl.col(f"ap@{k}").sum()).collect().item()
+        num_samples = df.select(Ranks.NUMBER_OF_SAMPLES).collect().item()
+        return ap_sum / num_samples
 
     @classmethod
     def _calculate_ndcg_at_k(cls, ranks: List[int], k: int) -> float:
@@ -165,29 +152,18 @@ class Ranks:
         )
 
     @classmethod
-    def mean_normalised_discounted_cumulative_gain(cls, df: pl.LazyFrame, k: int) -> pl.Float64:
-        """
-        Compute mean normalised discounted cumulative gain.
-        Args:
-            df (pl.LazyFrame): The dataframe to calculate mean normalised cumulative gain.
-            k (int): The upper rank limit.
-        Returns:
-            pl.LazyFrame: The dataframe with mean normalised cumulative gain.
-        """
+    def mean_normalised_discounted_cumulative_gain(cls, df: pl.LazyFrame, k: int) -> float:
         filtered_df = cls._filter_results(df, k)
-        return (
-            filtered_df.with_columns(
-                pl.struct("ranks")
-                .map_elements(
-                    lambda row: cls._calculate_ndcg_at_k(row["ranks"], k), return_dtype=pl.Float64
-                )
-                .alias(f"NDCG@{k}")
+        ndcg_df = filtered_df.with_columns(
+            pl.struct("ranks")
+            .map_elements(
+                lambda row: cls._calculate_ndcg_at_k(row["ranks"], k), return_dtype=pl.Float64
             )
-            .select(pl.col(f"NDCG@{k}").sum() / df.select(Ranks.NUMBER_OF_SAMPLES).collect())
-            .fill_null(0.0)
-            .collect()
-            .item()
+            .alias(f"NDCG@{k}")
         )
+        ndcg_sum = ndcg_df.select(pl.col(f"NDCG@{k}").sum()).collect().item()
+        num_samples = df.select(Ranks.NUMBER_OF_SAMPLES).collect().item()
+        return ndcg_sum / num_samples
 
 
 def compute_rank_stats(run_identifier: str, result_scan: pl.LazyFrame) -> pl.LazyFrame:

{pheval-0.5.4.dist-info → pheval-0.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pheval
-Version: 0.5.4
+Version: 0.5.6
 Summary: 
 Author: Yasemin Bridges
 Author-email: y.bridges@qmul.ac.uk

{pheval-0.5.4.dist-info → pheval-0.5.6.dist-info}/RECORD

@@ -7,7 +7,7 @@ pheval/analyse/binary_classification_curves.py,sha256=Crb45rJWc5rxDdx82sgoHRvYHE
 pheval/analyse/binary_classification_stats.py,sha256=sOuEp6IxZ6SVp-KC6MJkZNTkZucZTNK25xApP5tU6Mk,6944
 pheval/analyse/generate_plots.py,sha256=g98DxhTw1dPRfRRYoKBmt51XfIa2KzlL_Z7weFSoBUg,14550
 pheval/analyse/generate_rank_comparisons.py,sha256=KcQJ9rm1nvvTcqLNuxAkXRXuV18vEsiP0giQ-ryHyYc,1684
-pheval/analyse/rank_stats.py,sha256=qHrqlIsZVSV2ASc5cZ6TsmKaMq3bZtCzS1ZURjL8mks,9211
+pheval/analyse/rank_stats.py,sha256=JLgbaumayUzVzpRh0IXlY7454HWShVJQVImifC0U4GA,8489
 pheval/analyse/run_data_parser.py,sha256=Lr0ao_Mlp8EYLaM4XmiEjo7P7jt_rCBR2y2hb_D3c70,3366
 pheval/cli.py,sha256=rpvTTCKAvH75XkZUh0xaKv7Ftl9zIt2RncsMGIlrq9U,1556
 pheval/cli_pheval.py,sha256=iVvPby44EvVHkZsOFNQ_DovhYdwIkKir1Kf8uVJ_GCw,2872
@@ -46,8 +46,8 @@ pheval/utils/logger.py,sha256=5DZl5uMltUDQorhkvg_B7_ZhFwApAmEkWneFIOKfRGQ,1566
 pheval/utils/phenopacket_utils.py,sha256=XGnFLarvXezFR0W5frzyGTwEbhcA3zuGJPg1r5YBscg,27326
 pheval/utils/semsim_utils.py,sha256=s7ZCR2VfPYnOh7ApX6rv66eGoVSm9QJaVYOWBEhlXpo,6151
 pheval/utils/utils.py,sha256=9V6vCT8l1g4O2-ZATYqsVyd7AYZdWGd-Ksy7_oIC3eE,2343
-pheval-0.5.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pheval-0.5.4.dist-info/METADATA,sha256=ICKZja5aFzysmPtQHVLfMb6D5J43nRsPPUeYNLDcoKI,6494
-pheval-0.5.4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pheval-0.5.4.dist-info/entry_points.txt,sha256=o9gSwDkvT4-lqKy4mlsftd1nzP9WUOXQCfnbqycURd0,81
-pheval-0.5.4.dist-info/RECORD,,
+pheval-0.5.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pheval-0.5.6.dist-info/METADATA,sha256=HF7334A4_vsT4xMmQNLel8C_GmnlRooXl8RzZZQCj24,6494
+pheval-0.5.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pheval-0.5.6.dist-info/entry_points.txt,sha256=o9gSwDkvT4-lqKy4mlsftd1nzP9WUOXQCfnbqycURd0,81
+pheval-0.5.6.dist-info/RECORD,,

{pheval-0.5.4.dist-info → pheval-0.5.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any