From 10e96281e93b9a19d15c42af49faf04e05e6878d Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 25 Jul 2011 03:58:41 +1000 Subject: [PATCH] Percentile Calculation --- SleepLib/session.cpp | 2 +- daily.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 8926b0d2..5ed30eab 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -142,7 +142,7 @@ double Session::percentile(MachineCode mc,int field,double percent) if (a==b) return a; //double c=(b-a); //double d=c*q; - return array[j]+q; + return a;//array[j]+q; } double Session::weighted_avg_event_field(MachineCode mc,int field) diff --git a/daily.cpp b/daily.cpp index cb4e5cfe..33845628 100644 --- a/daily.cpp +++ b/daily.cpp @@ -495,7 +495,7 @@ void Daily::Load(QDate date) float vsi=cpap->count(CPAP_VSnore)/cpap->hours(); float fli=cpap->count(CPAP_FlowLimit)/cpap->hours(); - // float p90=cpap->percentile(CPAP_Pressure,0,0.9); + float p90=cpap->percentile(CPAP_Pressure,0,0.9); eap90=cpap->percentile(CPAP_EAP,0,0.9); iap90=cpap->percentile(CPAP_IAP,0,0.9); QString submodel=tr("Unknown Model"); @@ -558,7 +558,7 @@ void Daily::Load(QDate date) html+=""+tr("90% EPAP ")+QString().sprintf("%.2f",eap90)+tr("cmH2O")+"\n" ""+tr("90% IPAP ")+QString().sprintf("%.2f",iap90)+tr("cmH2O")+"\n"; } else if (mode==MODE_APAP) { - html+=("")+tr("90% Pressure ")+QString().sprintf("%.2f",cpap->summary_weighted_avg(CPAP_PressurePercentValue))+("\n"); + html+=("")+tr("90% Pressure ")+QString().sprintf("%.2f",p90)+("\n"); //cpap->summary_weighted_avg(CPAP_PressurePercentValue) } else if (mode==MODE_CPAP) { html+=("")+tr("Pressure ")+QString().sprintf("%.2f",cpap->summary_min(CPAP_PressureMin))+("\n"); }