lifelines 0.29.0__py3-none-any.whl → 0.30.0__py3-none-any.whl

lifelines/fitters/coxph_fitter.py

@@ -2991,7 +2991,11 @@ class ParametricSplinePHFitter(ParametricCoxModelFitter, SplineFitterMixin):
 
     @staticmethod
     def _strata_labeler(stratum, i):
-        return "s%s_phi%d_" % (stratum, i)
+        try:
+            return "s%s_phi%d_" % (tuple(str(s) for s in stratum), i)
+        except:
+            # singleton
+            return "s%s_phi%d_" % (stratum, i)
 
     @property
     def _fitted_parameter_names(self):
@@ -3112,7 +3116,11 @@ class ParametricPiecewiseBaselinePHFitter(ParametricCoxModelFitter, Proportional
 
     @staticmethod
     def _strata_labeler(stratum, i):
-        return "s%s_lambda%d_" % (stratum, i)
+        try:
+            return "s%s_lambda%d_" % (tuple(str(s) for s in stratum), i)
+        except:
+            # singleton
+            return "s%s_lambda%d_" % (stratum, i)
 
     @property
     def _fitted_parameter_names(self):

lifelines/statistics.py

@@ -111,14 +111,14 @@ class StatisticalResult:
 
         """
         if style is not None:
-            self._print_specific_style(style)
+            self._print_specific_style(style, decimals=decimals, **kwargs)
         else:
             try:
                 from IPython.display import display
 
                 display(self)
             except ImportError:
-                self._ascii_print()
+                self._ascii_print(decimals=decimals, **kwargs)
 
     def _html_print(self, decimals=2, **kwargs):
         print(self.to_html(decimals, **kwargs))
@@ -835,7 +835,7 @@ def multivariate_logrank_test(
     assert abs(Z_j.sum()) < 10e-8, "Sum is not zero."  # this should move to a test eventually.
 
     # compute covariance matrix
-    factor = (((n_i - d_i) / (n_i - 1)).replace([np.inf, np.nan], 1)) * d_i / n_i ** 2
+    factor = (((n_i - d_i) / (n_i - 1)).replace([np.inf, np.nan], 1)) * d_i / n_i**2
     n_ij["_"] = n_i.values
     V_ = (n_ij.mul(w_i, axis=0)).mul(np.sqrt(factor), axis="index").fillna(0)  # weighted V_
     V = -np.dot(V_.T, V_)
@@ -923,7 +923,7 @@ def proportional_hazard_test(
     def compute_statistic(times, resids, n_deaths):
         demeaned_times = times - times.mean()
         T = (demeaned_times.values[:, None] * resids.values).sum(0) ** 2 / (
-            n_deaths * (fitted_cox_model.standard_errors_ ** 2) * (demeaned_times ** 2).sum()
+            n_deaths * (fitted_cox_model.standard_errors_**2) * (demeaned_times**2).sum()
         )
         return T
 

lifelines/version.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = "0.29.0"
+__version__ = "0.30.0"

{lifelines-0.29.0.dist-info → lifelines-0.30.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lifelines
-Version: 0.29.0
+Version: 0.30.0
 Summary: Survival analysis in Python, including Kaplan Meier, Nelson Aalen and regression
 Home-page: https://github.com/CamDavidsonPilon/lifelines
 Author: Cameron Davidson-Pilon
@@ -16,13 +16,13 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy <2.0,>=1.14.0
-Requires-Dist: scipy >=1.7.0
-Requires-Dist: pandas >=2.1
-Requires-Dist: matplotlib >=3.0
-Requires-Dist: autograd >=1.5
-Requires-Dist: autograd-gamma >=0.3
-Requires-Dist: formulaic >=0.2.2
+Requires-Dist: numpy>=1.14.0
+Requires-Dist: scipy>=1.7.0
+Requires-Dist: pandas>=2.1
+Requires-Dist: matplotlib>=3.0
+Requires-Dist: autograd>=1.5
+Requires-Dist: autograd-gamma>=0.3
+Requires-Dist: formulaic>=0.2.2
 
 ![](http://i.imgur.com/EOowdSD.png)
 

{lifelines-0.29.0.dist-info → lifelines-0.30.0.dist-info}/RECORD

@@ -3,8 +3,8 @@ lifelines/calibration.py,sha256=Luii7bkJ2YB0jpuOYYhI22aUyEc1gLsS10Pno6Sqo98,4113
 lifelines/exceptions.py,sha256=8T1vQuI6Fnf_5OfiJahksn5Soe-SmU9Y2IA7HYen460,577
 lifelines/generate_datasets.py,sha256=nwGVpkcVRKH70N8z0Z-y7GgetX8suZZ1FFmdjOB8tBs,10188
 lifelines/plotting.py,sha256=sQmwpSziHzVQoWoe_gll4LInrjg-E4FpeWMp07wurNo,35069
-lifelines/statistics.py,sha256=cOszUYz87elnbTAt6V3fTrHwPjB9HFI1hxjLvKypS6k,35129
-lifelines/version.py,sha256=pYOd-rP1moJefUJJ6DbkYBuzORUtOVDOBiCBT13-usg,88
+lifelines/statistics.py,sha256=dDLPz2FNZEI1PNkL9pfAfQToXSvrDgXdOxQsoluTw5o,35179
+lifelines/version.py,sha256=fKPI8YV9Pdykklk91EAQOagw8PwkZHylDK82XMhvDjI,88
 lifelines/datasets/CuZn-LeftCensoredDataset.csv,sha256=PxTdZcJPPbhtaadpHjhMFVcUxmSn84BuDarujZIJpm4,1996
 lifelines/datasets/__init__.py,sha256=wiKbbNj-SSrgk_jysTdeQo1ceCmHXKje8WIzwBJAH_E,19977
 lifelines/datasets/anderson.csv,sha256=nTAtTK8mf0ymU88nKvO2Fj0WL9SE9o4S0GVujmX8Cl4,580
@@ -40,7 +40,7 @@ lifelines/fitters/aalen_additive_fitter.py,sha256=xca1uoNbuPS2YoGQ73GYa5JLZTLCt9
 lifelines/fitters/aalen_johansen_fitter.py,sha256=w_2MV7Bbtr0swJ0VdySqirhlGsjbYyqduRx9iLKd6XA,14172
 lifelines/fitters/breslow_fleming_harrington_fitter.py,sha256=_86qU3wMHEyuCKLjhHLERP_ymNnlSvi7chWgi8Kygxg,4293
 lifelines/fitters/cox_time_varying_fitter.py,sha256=cZo9opn4OdFajrj6aBxJDhgWvFIUHdsq7jpgMQ0HchU,34670
-lifelines/fitters/coxph_fitter.py,sha256=zbmwmO1EyHy-19ijuMkF_RCb7dG_VB7DBH7qArHar6w,136920
+lifelines/fitters/coxph_fitter.py,sha256=s4mWI1rj_kpsq2_kBa0Shg_FphBeIeJCEdW86aSFCls,137177
 lifelines/fitters/crc_spline_fitter.py,sha256=FUaiz4O-Hdke7T5dV8RCl-27oWxrMJLBSXxnRN4QkGQ,3126
 lifelines/fitters/exponential_fitter.py,sha256=Fbb1rtBOrHb_YxFYidzqXcFw7aWsqet_2vqi7s8WJ4U,2857
 lifelines/fitters/generalized_gamma_fitter.py,sha256=OiXO9onvYtI2gNvUoxF4mjEjbj7IRZl5R4UZ_RzrSjo,6482
@@ -65,8 +65,8 @@ lifelines/utils/concordance.py,sha256=hWXrmg1BiK2Hqu9CRzlvkPlnlmZqZcAxH7L1PjaqdC
 lifelines/utils/lowess.py,sha256=MMydVcnbxqIgsiNcIgVUFtlFycD7v3ezwEGpituvBHs,2541
 lifelines/utils/printer.py,sha256=-nXxu02gs0kaKfoQQ65sH-I45tGmgoFeOOIUSEc53iE,5861
 lifelines/utils/safe_exp.py,sha256=HCCAkwQTx6G2qRC03v9Q_GWqVj8at1Eac1JVrMgS9hg,4350
-lifelines-0.29.0.dist-info/LICENSE,sha256=AasDeD139SnTdfXbKgN4BMyMgBlRy9YFs60tNrB4wf0,1079
-lifelines-0.29.0.dist-info/METADATA,sha256=JOhlJ11AqPSdC2P1z8KNg_Sh4mhCj9f7ymMBz85cZi8,3187
-lifelines-0.29.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-lifelines-0.29.0.dist-info/top_level.txt,sha256=3i57Z4mtpc6jWrsW0n-_o9Y7CpzytMTeLMPJBHYAo0o,10
-lifelines-0.29.0.dist-info/RECORD,,
+lifelines-0.30.0.dist-info/LICENSE,sha256=AasDeD139SnTdfXbKgN4BMyMgBlRy9YFs60tNrB4wf0,1079
+lifelines-0.30.0.dist-info/METADATA,sha256=KvpZHV7x8L87MWq3rkiDWekouWFvOp0dzUoPKHUfxk4,3175
+lifelines-0.30.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+lifelines-0.30.0.dist-info/top_level.txt,sha256=3i57Z4mtpc6jWrsW0n-_o9Y7CpzytMTeLMPJBHYAo0o,10
+lifelines-0.30.0.dist-info/RECORD,,

{lifelines-0.29.0.dist-info → lifelines-0.30.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any