From 37cdc5a25b9e5aa81001cefd19a1b06ecab46607 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 30 May 2011 01:40:34 +1000 Subject: [PATCH] Added Percentile calculations --- SleepyHead.depend | 13 ++++----- SleepyHead.layout | 20 +++++++------- SleepyHeadMain.cpp | 7 ++++- libs/sleeplib/machine.cpp | 51 ++++++++++++++++++++++++++++++++++- libs/sleeplib/machine.h | 3 +++ libs/sleeplib/profiles.cpp | 2 +- libs/sleeplib/prs1_loader.cpp | 10 +++++-- version.h | 14 +++++----- 8 files changed, 92 insertions(+), 28 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index 8788f998..c4e9de41 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7835,7 +7835,7 @@ "sleeplib/machine.h" "graphs/graph.h" -1306667662 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h +1306682653 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h @@ -7873,7 +7873,7 @@ -1306667877 /home/mark/projects/git/sleepyhead/version.h +1306683584 /home/mark/projects/git/sleepyhead/version.h 1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7890,7 +7890,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306667876 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306683142 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7919,7 +7919,7 @@ -1306667681 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp +1306683485 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp @@ -7927,6 +7927,7 @@ "binary_file.h" "machine.h" "profiles.h" + 1306414968 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.cpp "machine_loader.h" @@ -7939,7 +7940,7 @@ "preferences.h" -1306414968 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp +1306673434 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp @@ -7951,7 +7952,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1306667633 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp +1306681892 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp diff --git a/SleepyHead.layout b/SleepyHead.layout index 26f08066..b478eff2 100644 --- a/SleepyHead.layout +++ b/SleepyHead.layout @@ -4,11 +4,11 @@ - + - + @@ -26,10 +26,10 @@ - + - + @@ -37,20 +37,20 @@ - - + + - - + + - - + + diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 87f66960..09179be8 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -599,6 +599,9 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) float rei=d->count(CPAP_RERA)/d->hours(); float vsi=d->count(CPAP_VSnore)/d->hours(); float fli=d->count(CPAP_FlowLimit)/d->hours(); + float p90=d->percentile(CPAP_Pressure,0,0.9); + float eap90=d->percentile(CPAP_EAP,0,0.9); + float iap90=d->percentile(CPAP_IAP,0,0.9); wxString submodel=_("Unknown Model"); @@ -637,7 +640,7 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) html=html+wxT("")+_("Avg Pressure")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressureAverage))+wxT("\n"); html=html+wxT("")+_("Min Reached")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMinAchieved))+wxT("\n"); html=html+wxT("")+_("Max Reached")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("\n"); - html=html+wxT("")+_("90% Pressure?")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("\n"); + html=html+wxT("")+_("90% Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),p90)+wxT("\n"); } else if (mode==MODE_BIPAP) { html=html+wxT("")+_("Avg IPAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(BIPAP_IAPAverage))+wxT("\n"); html=html+wxT("")+_("Avg EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(BIPAP_EAPAverage))+wxT("\n"); @@ -645,6 +648,8 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) html=html+wxT("")+_("Max IPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_IAPMax))+wxT("\n"); html=html+wxT("")+_("Min EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(BIPAP_EAPMin))+wxT("\n"); html=html+wxT("")+_("Max EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_EAPMax))+wxT("\n"); + html=html+wxT("")+_("90% IPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),iap90)+wxT("\n"); + html=html+wxT("")+_("90% EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),eap90)+wxT("\n"); } html=html+wxT("")+_("Avg Leak")+wxT("")+wxString::Format(wxT("%.2f"),d->summary_avg(CPAP_LeakAverage))+wxT("\n"); diff --git a/libs/sleeplib/machine.cpp b/libs/sleeplib/machine.cpp index f089fc5e..0f277394 100644 --- a/libs/sleeplib/machine.cpp +++ b/libs/sleeplib/machine.cpp @@ -5,7 +5,7 @@ #include "binary_file.h" #include "machine.h" #include "profiles.h" - +#include extern wxProgressDialog *loader_progress; @@ -457,6 +457,23 @@ wxTimeSpan Day::total_time() } return d_totaltime; } +EventDataType Day::percentile(MachineCode code,int field,double percent) +{ + double val=0; + // Cache this? + int cnt=0; + // Don't assume sessions are in order. + for (auto s=sessions.begin();s!=sessions.end();s++) { + Session & sess=*(*s); + if (sess.events.find(code)!=sess.events.end()) { + val+=sess.percentile(code,field,percent); + cnt++; + } + } + if (cnt==0) return 0; + return EventDataType(val/cnt); + +} const wxDateTime & Day::first(MachineCode code) { @@ -656,6 +673,35 @@ double Session::avg_event_field(MachineCode mc,int field) return sum/cnt; } + +bool sortfunction (double i,double j) { return (i array; + + for (auto e=events[mc].begin(); e!=events[mc].end(); e++) { + Event & ev = *(*e); + array.push_back(ev[0]); + } + std::sort(array.begin(),array.end(),sortfunction); + int size=array.size(); + double i=size*percent; + double t; + double q=modf(i,&t); + int j=t; + if (j>=size-1) return array[j]; + + double a=array[j-1]; + double b=array[j]; + if (a==b) return a; + double c=(b-a); + double d=c*q; + return array[j]+q; +} + double Session::weighted_avg_event_field(MachineCode mc,int field) { if (events.find(mc)==events.end()) return 0; @@ -720,6 +766,9 @@ void Session::AddWaveform(Waveform *w) waveforms[w->code()].push_back(w); //wxLogMessage(w->start().Format(wxT("%Y-%m-%d %H:%M:%S"))+wxT(" ")+w->end().Format(wxT("%Y-%m-%d %H:%M:%S"))+wxString::Format(wxT(" %i %.1f"),w->samples(), w->duration())); + // Could parse the flow data for Breaths per minute info here.. + + } void Session::TrashEvents() // Trash this sessions Events and release memory. diff --git a/libs/sleeplib/machine.h b/libs/sleeplib/machine.h index 3997e67c..c4f1db03 100644 --- a/libs/sleeplib/machine.h +++ b/libs/sleeplib/machine.h @@ -39,6 +39,7 @@ wxInt16 { // General Event Codes CPAP_Obstructive=0, CPAP_Hypopnea, CPAP_ClearAirway, CPAP_RERA, CPAP_VSnore, CPAP_FlowLimit, CPAP_Leak, CPAP_Pressure, CPAP_EAP, CPAP_IAP, CPAP_CSR, CPAP_FlowRate, + CPAP_BreathsPerMinute, // General CPAP Summary Information CPAP_PressureMin=0x80, CPAP_PressureMax, CPAP_RampTime, CPAP_RampStartingPressure, CPAP_Mode, CPAP_PressureReliefType, @@ -95,6 +96,7 @@ public: EventDataType sum(MachineCode code,int field=0); EventDataType count(MachineCode code); EventDataType weighted_avg(MachineCode code,int field=0); + EventDataType percentile(MachineCode mc,int field,double percent); // Note, the following convert to doubles without considering the consequences fully. EventDataType summary_avg(MachineCode code); @@ -305,6 +307,7 @@ public: double sum_event_field(MachineCode mc,int field); double avg_event_field(MachineCode mc,int field); double weighted_avg_event_field(MachineCode mc,int field); + double percentile(MachineCode mc,int field,double percentile); map summary; void SetChanged(bool val) { diff --git a/libs/sleeplib/profiles.cpp b/libs/sleeplib/profiles.cpp index bacbe7ff..22ebcc1e 100644 --- a/libs/sleeplib/profiles.cpp +++ b/libs/sleeplib/profiles.cpp @@ -62,7 +62,7 @@ void Profile::ExtraLoad(TiXmlHandle *root) TiXmlElement *elem; elem=root->FirstChild("Machines").FirstChild().Element(); if (!elem) { - wxLogError(wxT("ExtraLoad: Elem is empty!!!")); + wxLogDebug(wxT("ExtraLoad: Elem is empty!!!")); } for(; elem; elem=elem->NextSiblingElement()) { wxString pKey(elem->Value(),wxConvUTF8); diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp index 4ff844fc..998dcaba 100644 --- a/libs/sleeplib/prs1_loader.cpp +++ b/libs/sleeplib/prs1_loader.cpp @@ -56,7 +56,7 @@ PRS1Loader::~PRS1Loader() } Machine *PRS1Loader::CreateMachine(wxString serial,Profile *profile) { - wxLogMessage(wxT("Create Machine")+serial); + wxLogMessage(wxT("Create Machine ")+serial); if (!profile) { wxLogMessage(wxT("No Profile!")); return NULL; @@ -681,9 +681,11 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename) SampleFormat min,max; bool first=true; + SampleFormat c; + for (long i=0;ic) min=c; if (maxAddWaveform(w); + //wxLogMessage(wxT("Done PRS1 Waveforms ")+filename); return true; } diff --git a/version.h b/version.h index 1f42f7f0..e2dce237 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "29"; + static const char DATE[] = "30"; static const char MONTH[] = "05"; static const char YEAR[] = "2011"; static const char UBUNTU_VERSION_STYLE[] = "11.05"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 1878; - static const long REVISION = 4819; + static const long BUILD = 1951; + static const long REVISION = 5273; //Miscellaneous Version Types - static const long BUILDS_COUNT = 6282; - #define RC_FILEVERSION 0,7,1878,4819 - #define RC_FILEVERSION_STRING "0, 7, 1878, 4819\0" - static const char FULLVERSION_STRING[] = "0.7.1878.4819"; + static const long BUILDS_COUNT = 6389; + #define RC_FILEVERSION 0,7,1951,5273 + #define RC_FILEVERSION_STRING "0, 7, 1951, 5273\0" + static const char FULLVERSION_STRING[] = "0.7.1951.5273"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;