bella-companion 0.0.42__tar.gz → 0.0.43__tar.gz

{bella_companion-0.0.42 → bella_companion-0.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bella-companion
-Version: 0.0.42
+Version: 0.0.43
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{bella_companion-0.0.42 → bella_companion-0.0.43}/bella_companion/simulations/figures/epi_skyline_results.py

@@ -14,7 +14,7 @@ from bella_companion.simulations.scenarios.epi_skyline import REPRODUCTION_NUMBE
 
 
 def plot_epi_skyline_results():
-    output_dir = Path(os.environ["BELLA_FIGURES_DIR"]) / "epi-skyline-results"
+    output_dir = Path(os.environ["BELLA_FIGURES_DIR"]) / "epi-skyline"
     os.makedirs(output_dir, exist_ok=True)
 
     for i, reproduction_number in enumerate(REPRODUCTION_NUMBERS, start=1):

{bella_companion-0.0.42 → bella_companion-0.0.43}/bella_companion/simulations/figures/explain/shap.py

@@ -1,6 +1,7 @@
 from functools import partial
 from itertools import product
 from pathlib import Path
+from typing import Callable
 
 import matplotlib.pyplot as plt
 import numpy as np
@@ -43,13 +44,18 @@ def plot_shap_features_importance(
     )  # shape: (n_runs, n_features)
     features_importances /= features_importances.sum(axis=1, keepdims=True)
 
-    for i, (feature_name, feature) in enumerate(features.items()):
-        sns.violinplot(
-            y=features_importances[:, i],
-            x=[feature_name] * len(features_importances),
-            cut=0,
-            color="#E74C3C" if feature.is_relevant else "gray",
-        )
+    def _plot_violins(group_check: Callable[[Feature], bool]):
+        for i, (feature_name, feature) in enumerate(features.items()):
+            if group_check(feature):
+                sns.violinplot(
+                    y=features_importances[:, i],
+                    x=[feature_name] * len(features_importances),
+                    cut=0,
+                    color="#E74C3C" if feature.is_relevant else "gray",
+                )
+
+    _plot_violins(lambda f: not f.is_binary)
+    _plot_violins(lambda f: f.is_binary)
     plt.xlabel("Feature")  # pyright: ignore
     plt.ylabel("Importance")  # pyright: ignore
     plt.savefig(output_file)  # pyright: ignore

{bella_companion-0.0.42 → bella_companion-0.0.43}/bella_companion/simulations/figures/fbd_no_traits_results.py

@@ -14,7 +14,7 @@ from bella_companion.simulations.scenarios.fbd_no_traits import RATES
 
 
 def plot_fbd_no_traits_results():
-    output_dir = Path(os.environ["BELLA_FIGURES_DIR"]) / "fbd-no-traits-predictions"
+    output_dir = Path(os.environ["BELLA_FIGURES_DIR"]) / "fbd-no-traits"
     os.makedirs(output_dir, exist_ok=True)
 
     for i, rates in enumerate(RATES, start=1):

{bella_companion-0.0.42 → bella_companion-0.0.43}/bella_companion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bella-companion
-Version: 0.0.42
+Version: 0.0.43
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{bella_companion-0.0.42 → bella_companion-0.0.43}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bella-companion"
-version = "0.0.42"
+version = "0.0.43"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"

{bella_companion-0.0.42 → bella_companion-0.0.43}/bella_companion/simulations/scenarios/fbd_2traits.py

@@ -89,9 +89,9 @@ SCENARIO = Scenario(
     features={
         f"{rate}Rate": {
             "timePredictor": Feature(is_binary=False, is_relevant=True),
-            "randomPredictor": Feature(is_binary=False, is_relevant=False),
             "trait1Predictor": Feature(is_binary=True, is_relevant=True),
             "trait2Predictor": Feature(is_binary=True, is_relevant=False),
+            "randomPredictor": Feature(is_binary=False, is_relevant=False),
         }
         for rate in RATES
     },