archeo 2.0.0.dev5__tar.gz → 2.0.0.dev6__tar.gz

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: archeo
-Version: 2.0.0.dev5
+Version: 2.0.0.dev6
 Summary: Bayesian framework for inferring natal kick, ancestral masses and spins of black holes.
 Author-email: wyhwong <wyhwong@link.cuhk.edu.hk>
 License-Expression: MIT

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/archeo/bayesian/ancestral_posterior.py

@@ -1,6 +1,7 @@
 import numpy as np
 import pandas as pd
 
+from archeo.constants.bayesian import DEFAULT_BINSIZE_MASS, DEFAULT_BINSIZE_SPIN
 from archeo.utils.parallel import get_n_workers, multiprocess_run, multithread_run
 
 
@@ -8,8 +9,8 @@ def _retrieve_sample(
     df_binaries: pd.DataFrame,
     mass_measure: float,
     spin_measure: float,
-    binsize_mass: float = 2.0,
-    binsize_spin: float = 0.1,
+    binsize_mass: float = DEFAULT_BINSIZE_MASS,
+    binsize_spin: float = DEFAULT_BINSIZE_SPIN,
 ) -> pd.DataFrame:
     """Retrieve the samples from data frame of binaries"""
 
@@ -36,8 +37,8 @@ def infer_ancestral_posterior_distribution(
     df_binaries: pd.DataFrame,
     mass_posterior_samples: list[float],
     spin_posterior_samples: list[float],
-    binsize_mass: float = 2.0,
-    binsize_spin: float = 0.1,
+    binsize_mass: float = DEFAULT_BINSIZE_MASS,
+    binsize_spin: float = DEFAULT_BINSIZE_SPIN,
     random_state: int = 42,
     n_workers: int = 1,
 ) -> pd.DataFrame:

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/archeo/bayesian/importance_sampling/__init__.py

@@ -1,2 +1,3 @@
 from archeo.bayesian.importance_sampling.bayes_factor_curve import BayesFactorCurve, CandidatePrior
 from archeo.bayesian.importance_sampling.resampler.interface import ImportanceSamplingData
+from archeo.data_structures.bayesian.bayes_factor import BayesFactorCurveMetadata

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/archeo/bayesian/importance_sampling/bayes_factor_curve.py

@@ -38,7 +38,7 @@ class CandidatePrior(BaseModel):
         df_bh1_prior = self.df_bh1.loc[self.df_bh1["v_esc"] <= v_esc]
         df_bh2_prior = self.df_bh2.loc[self.df_bh2["v_esc"] <= v_esc]
 
-        if df_bh1_prior.empty and df_bh2_prior.empty:
+        if df_bh1_prior.empty or df_bh2_prior.empty:
             return pd.DataFrame(columns=self.df_bh1.columns.union(self.df_bh2.columns))
 
         n_samples = max(len(df_bh1_prior), len(df_bh2_prior), n_min)
@@ -57,14 +57,10 @@ class CandidatePrior(BaseModel):
         v_esc_max = max(self.df_bh1["v_esc"].max(), self.df_bh2["v_esc"].max())
 
         if log_scale:
-            v_escs = np.logspace(np.log10(v_esc_min), np.log10(v_esc_max), n_pts)
+            v_escs = np.logspace(max(np.log10(v_esc_min), np.log10(0.1)), np.log10(v_esc_max), n_pts)
         else:
             v_escs = np.linspace(v_esc_min, v_esc_max, n_pts)
 
-        # Add zero in the beginning of the list if it's not already included
-        if v_escs[0] > 0:
-            v_escs = np.insert(v_escs, 0, 0.0)
-
         # Add 5000 km/s in the end of the list if it's not already included
         if v_escs[-1] < 5000:
             v_escs = np.append(v_escs, 5000.0)
@@ -78,7 +74,6 @@ class BayesFactorCurve(BaseModel, frozen=True):
     n_bootstrapping: int = 50
     n_pts: int = 10
     log_scale: bool = False
-    assume_parameter_independence: bool = False
     metadata: BayesFactorCurveMetadata = BayesFactorCurveMetadata()
 
     def _sample_bayes_factor(
@@ -95,7 +90,7 @@ class BayesFactorCurve(BaseModel, frozen=True):
             new_prior_samples=candidate_prior.get_conditional_prior(v_esc),
             binsize_spin=self.metadata.binsize_spin,
             binsize_mass=self.metadata.binsize_mass,
-            assume_parameter_independence=self.assume_parameter_independence,
+            assume_parameter_independence=self.metadata.assume_parameter_independence,
         ).sample_bayes_factor(n=self.n_bootstrapping, is_parallel=True)
 
     @pre_release

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/archeo/bayesian/importance_sampling/resampler/base.py

@@ -2,6 +2,7 @@ import numpy as np
 import pandas as pd
 from pydantic import BaseModel, ConfigDict
 
+from archeo.constants.bayesian import DEFAULT_BINSIZE_MASS, DEFAULT_BINSIZE_SPIN
 from archeo.data_structures.math import Domain
 from archeo.utils.logger import get_logger
 
@@ -17,8 +18,8 @@ class ImportanceSamplingDataBase(BaseModel, frozen=True):
     posterior_samples: pd.DataFrame
     prior_samples: pd.DataFrame
     new_prior_samples: pd.DataFrame
-    binsize_spin: float = 0.05
-    binsize_mass: float = 1.0
+    binsize_spin: float = DEFAULT_BINSIZE_SPIN
+    binsize_mass: float = DEFAULT_BINSIZE_MASS
     ztol: float = 1e-8
 
     @property

archeo-2.0.0.dev6/archeo/constants/bayesian.py

@@ -0,0 +1,3 @@
+DEFAULT_BINSIZE_MASS = 2.0
+DEFAULT_BINSIZE_SPIN = 0.1
+ASSUME_PARAMETER_INDEPENDENCE = False

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/archeo/data_structures/bayesian/bayes_factor.py

@@ -3,6 +3,8 @@ from typing import TypeAlias
 import numpy as np
 from pydantic import BaseModel, NonNegativeFloat
 
+from archeo.constants.bayesian import ASSUME_PARAMETER_INDEPENDENCE, DEFAULT_BINSIZE_MASS, DEFAULT_BINSIZE_SPIN
+
 
 class BayesFactor(BaseModel, frozen=True):
     """Data class for Bayes factor with bootstrapping samples."""
@@ -33,5 +35,6 @@ class BayesFactorCurveMetadata(BaseModel, frozen=True):
 
     reference_candidate_name: str = "original"
     reference_bayes_factor: NonNegativeFloat = 1.0
-    binsize_spin: float = 0.05
-    binsize_mass: float = 1.0
+    binsize_spin: float = DEFAULT_BINSIZE_SPIN
+    binsize_mass: float = DEFAULT_BINSIZE_MASS
+    assume_parameter_independence: bool = ASSUME_PARAMETER_INDEPENDENCE

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/archeo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: archeo
-Version: 2.0.0.dev5
+Version: 2.0.0.dev6
 Summary: Bayesian framework for inferring natal kick, ancestral masses and spins of black holes.
 Author-email: wyhwong <wyhwong@link.cuhk.edu.hk>
 License-Expression: MIT

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/archeo.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ archeo/bayesian/importance_sampling/resampler/base.py
 archeo/bayesian/importance_sampling/resampler/generic.py
 archeo/bayesian/importance_sampling/resampler/interface.py
 archeo/constants/__init__.py
+archeo/constants/bayesian.py
 archeo/constants/enum.py
 archeo/constants/physics.py
 archeo/data_structures/__init__.py

{archeo-2.0.0.dev5 → archeo-2.0.0.dev6}/pyproject.toml

@@ -16,7 +16,7 @@ classifiers = [
     "Operating System :: OS Independent"
 ]
 keywords = ["black-holes", "gravitational-waves", "black-hole-archeology"]
-version = "2.0.0.dev5"
+version = "2.0.0.dev6"
 readme = "README.md"
 requires-python = ">=3.11,<3.14"
 dependencies = [