RunasSudo/hpstat
1
Fork 0
Code Issues Pull Requests Releases Activity

turnbull: Allow skipping computation of standard errors

Browse Source
This commit is contained in:
RunasSudo 2023-11-11 22:06:52 +11:00
parent 793e6309cf
commit 434b432cf7
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/turnbull.rs
View File

@ -66,6 +66,7 @@ enum OutputFormat {
#[derive(ValueEnum, Clone)] #[derive(ValueEnum, Clone)]
pub enum SEMethod { pub enum SEMethod {
None,
OIM, OIM,
OIMDropZeros, OIMDropZeros,
LikelihoodRatio, LikelihoodRatio,
@ -107,10 +108,8 @@ pub fn main(args: TurnbullArgs) {
]); ]);
} }
summary.add_row(row![r->format!("{:.3}", result.failure_intervals.last().unwrap().1), r->"0.00000", "", "", ""]); summary.add_row(row![r->format!("{:.3}", result.failure_intervals.last().unwrap().1), r->"0.00000", "", "", ""]);
} else { } else if let Some(survival_prob_ci) = &result.survival_prob_ci {
// No standard errors, just print CIs // No standard errors, just print CIs
let survival_prob_ci = result.survival_prob_ci.as_ref().unwrap();
summary.set_titles(row!["Time", c->"Surv. Prob.", H2c->"(95% CI)"]); summary.set_titles(row!["Time", c->"Surv. Prob.", H2c->"(95% CI)"]);
summary.add_row(row![r->"0.000", r->"1.00000", "", ""]); summary.add_row(row![r->"0.000", r->"1.00000", "", ""]);
for (i, prob) in result.survival_prob.iter().enumerate() { for (i, prob) in result.survival_prob.iter().enumerate() {
@ -122,6 +121,17 @@ pub fn main(args: TurnbullArgs) {
]); ]);
} }
summary.add_row(row![r->format!("{:.3}", result.failure_intervals.last().unwrap().1), r->"0.00000", "", ""]); summary.add_row(row![r->format!("{:.3}", result.failure_intervals.last().unwrap().1), r->"0.00000", "", ""]);
} else {
// No standard errors or CIs
summary.set_titles(row!["Time", c->"Surv. Prob."]);
summary.add_row(row![r->"0.000", r->"1.00000"]);
for (i, prob) in result.survival_prob.iter().enumerate() {
summary.add_row(row![
r->format!("{:.3}", result.failure_intervals[i].1),
r->format!("{:.5}", prob),
]);
}
summary.add_row(row![r->format!("{:.3}", result.failure_intervals.last().unwrap().1), r->"0.00000"]);
} }
summary.printstd(); summary.printstd();
@ -218,6 +228,7 @@ pub fn fit_turnbull(data_times: Matrix2xX<f64>, progress_bar: ProgressBar, max_i
let mut survival_prob_ci = None; let mut survival_prob_ci = None;
match se_method { match se_method {
SEMethod::None => {}
SEMethod::OIM => { SEMethod::OIM => {
survival_prob_se = Some(survival_prob_oim_se(&data, &p, zero_tolerance, false)); survival_prob_se = Some(survival_prob_oim_se(&data, &p, zero_tolerance, false));
} }