mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Reimplement calcLeaks to be correct for discontinuous data.
This commit is contained in:
sawinglogz
parent
b2f86a720c
commit
a4296b5e93
@ -1161,102 +1161,120 @@ int calcAHIGraph(Session *session)
|
|||||||
|
|
||||||
return cnt;
|
return cnt;
|
||||||
}
|
}
|
||||||
struct TimeValue {
|
|
||||||
TimeValue() {
|
|
||||||
time = 0;
|
class LeakCalculator
|
||||||
value = 0;
|
{
|
||||||
}
|
public:
|
||||||
TimeValue(qint64 t, EventStoreType v) {
|
virtual ~LeakCalculator() {}
|
||||||
time = t;
|
virtual EventDataType calcLeakAt(EventDataType pressure) = 0;
|
||||||
value = v;
|
|
||||||
}
|
|
||||||
TimeValue(const TimeValue ©) {
|
|
||||||
time = copy.time;
|
|
||||||
value = copy.value;
|
|
||||||
}
|
|
||||||
qint64 time;
|
|
||||||
EventStoreType value;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct zMaskProfile {
|
class LinearInterpolateLeak : public LeakCalculator
|
||||||
public:
|
{
|
||||||
zMaskProfile() {};
|
public:
|
||||||
~zMaskProfile() {};
|
LinearInterpolateLeak(EventDataType minPressure, EventDataType leakAtMinPressure,
|
||||||
|
EventDataType maxPressure, EventDataType leakAtMaxPressure)
|
||||||
void scanPressure(Session *session);
|
: m_minPressure(minPressure), m_leakAtMinPressure(leakAtMinPressure),
|
||||||
|
m_maxPressure(maxPressure), m_leakAtMaxPressure(leakAtMaxPressure)
|
||||||
QVector<TimeValue> Pressure;
|
{
|
||||||
|
m_leakSlope = (m_leakAtMaxPressure - m_leakAtMinPressure) / (m_maxPressure - m_minPressure);
|
||||||
EventDataType calcLeak(EventStoreType pressure);
|
}
|
||||||
|
virtual ~LinearInterpolateLeak() {}
|
||||||
|
virtual EventDataType calcLeakAt(EventDataType pressure)
|
||||||
|
{
|
||||||
|
float dx = pressure - m_minPressure;
|
||||||
|
float leak = dx * m_leakSlope + m_leakAtMinPressure;
|
||||||
|
return leak;
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void scanPressureList(Session *session, ChannelID code);
|
EventDataType m_minPressure, m_leakAtMinPressure;
|
||||||
|
EventDataType m_maxPressure, m_leakAtMaxPressure;
|
||||||
|
float m_leakSlope;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class ProfileLeakCalculator : public LinearInterpolateLeak
|
||||||
bool operator<(const TimeValue &p1, const TimeValue &p2)
|
|
||||||
{
|
{
|
||||||
return p1.time < p2.time;
|
public:
|
||||||
}
|
ProfileLeakCalculator(Profile* profile)
|
||||||
|
: LinearInterpolateLeak(4.0, profile->cpap->custom4cmH2OLeaks(),
|
||||||
|
20.0, profile->cpap->custom20cmH2OLeaks())
|
||||||
|
{}
|
||||||
|
virtual ~ProfileLeakCalculator() {}
|
||||||
|
};
|
||||||
|
|
||||||
void zMaskProfile::scanPressureList(Session *session, ChannelID code)
|
// Provides an accessor for the value at a point in time for discontinuous (channel) data.
|
||||||
|
// This is designed to be efficient for the common case of repeated searches over increasing timestamps.
|
||||||
|
class TimeSeries
|
||||||
{
|
{
|
||||||
auto it = session->eventlist.find(code);
|
public:
|
||||||
if (it == session->eventlist.end()) return;
|
TimeSeries(QVector<EventList *> events)
|
||||||
|
: m_events(events)
|
||||||
int prescnt = session->count(code);
|
{
|
||||||
Pressure.reserve(Pressure.size() + prescnt);
|
m_curEventList = nullptr;
|
||||||
|
m_curEvent = 0;
|
||||||
auto & EVL = it.value();
|
m_lastTime = 0;
|
||||||
|
|
||||||
for (const auto & el : EVL) {
|
|
||||||
qint64 start = el->first();
|
|
||||||
int count = el->count();
|
|
||||||
EventStoreType *dptr = el->rawData();
|
|
||||||
EventStoreType *eptr = dptr + count;
|
|
||||||
quint32 *tptr = el->rawTime();
|
|
||||||
qint64 time;
|
|
||||||
EventStoreType pressure;
|
|
||||||
|
|
||||||
for (; dptr < eptr; dptr++) {
|
|
||||||
time = start + *tptr++;
|
|
||||||
pressure = *dptr;
|
|
||||||
Pressure.push_back(TimeValue(time, pressure));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
EventDataType valueAt(qint64 time, bool* outValid)
|
||||||
void zMaskProfile::scanPressure(Session *session)
|
{
|
||||||
{
|
EventDataType result = 0;
|
||||||
Pressure.clear();
|
bool found = findEventListContaining(time);
|
||||||
|
if (found) {
|
||||||
|
m_lastTime = time;
|
||||||
|
result = findValueAtOrBefore(time);
|
||||||
|
}
|
||||||
|
*outValid = found;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
protected:
|
||||||
|
bool findEventListContaining(qint64 time)
|
||||||
|
{
|
||||||
|
// Fast return if we're already there.
|
||||||
|
if (m_curEventList) {
|
||||||
|
if (m_curEventList->first() <= time && time <= m_curEventList->last()) {
|
||||||
|
if (time < m_lastTime) {
|
||||||
|
// Reset the offset for correctness in case someone searches backwards.
|
||||||
|
m_curEvent = 0;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Search the event lists to see if any match.
|
||||||
|
bool found = false;
|
||||||
|
for (auto & eventlist : m_events) {
|
||||||
|
if (eventlist->first() <= time && time <= eventlist->last()) {
|
||||||
|
found = true;
|
||||||
|
m_curEventList = eventlist;
|
||||||
|
m_curEvent = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
EventDataType findValueAtOrBefore(qint64 time)
|
||||||
|
{
|
||||||
|
// curTime is always <= time, due to eventlist first/last search and m_curEvent reset.
|
||||||
|
qint64 curTime = m_curEventList->time(m_curEvent);
|
||||||
|
for (quint32 i = m_curEvent + 1; i < m_curEventList->count(); i++) {
|
||||||
|
qint64 nextTime = m_curEventList->time(i);
|
||||||
|
if (nextTime > time) {
|
||||||
|
// stick with the current value
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// else nextTime <= time, advance
|
||||||
|
m_curEvent = i;
|
||||||
|
curTime = nextTime;
|
||||||
|
}
|
||||||
|
EventDataType result = m_curEventList->data(m_curEvent);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
QVector<EventList *> m_events;
|
||||||
|
EventList* m_curEventList;
|
||||||
|
int m_curEvent;
|
||||||
|
qint64 m_lastTime;
|
||||||
|
};
|
||||||
|
|
||||||
// TODO: account for CPAP_PressureSet and CPAP_IPAPSet used by PRS1.
|
|
||||||
scanPressureList(session, CPAP_Pressure);
|
|
||||||
scanPressureList(session, CPAP_IPAP);
|
|
||||||
|
|
||||||
// Sort by time
|
|
||||||
std::sort(Pressure.begin(), Pressure.end());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns what the nominal leak SHOULD be at the given pressure
|
|
||||||
EventDataType zMaskProfile::calcLeak(EventStoreType pressure)
|
|
||||||
{
|
|
||||||
float leak; // = 0.0;
|
|
||||||
|
|
||||||
float lpm4 = p_profile->cpap->custom4cmH2OLeaks();
|
|
||||||
float lpm20 = p_profile->cpap->custom20cmH2OLeaks();
|
|
||||||
|
|
||||||
float lpm = lpm20 - lpm4;
|
|
||||||
float ppm = lpm / 16.0;
|
|
||||||
|
|
||||||
float p = (pressure/10.0f) - 4.0;
|
|
||||||
|
|
||||||
leak = p * ppm + lpm4;
|
|
||||||
|
|
||||||
return leak;
|
|
||||||
}
|
|
||||||
|
|
||||||
QMutex zMaskmutex;
|
|
||||||
zMaskProfile mmaskProfile;
|
|
||||||
|
|
||||||
int calcLeaks(Session *session)
|
int calcLeaks(Session *session)
|
||||||
{
|
{
|
||||||
@ -1268,80 +1286,48 @@ int calcLeaks(Session *session)
|
|||||||
|
|
||||||
if (!session->eventlist.contains(CPAP_LeakTotal)) { return 0; } // can't calculate without this..
|
if (!session->eventlist.contains(CPAP_LeakTotal)) { return 0; } // can't calculate without this..
|
||||||
|
|
||||||
zMaskmutex.lock();
|
// Choose the formula for calculating mask leakage as a function of pressure.
|
||||||
zMaskProfile *maskProfile = &mmaskProfile;
|
LeakCalculator* calc = new ProfileLeakCalculator(p_profile);
|
||||||
|
|
||||||
|
// Prefer IPAPSet/PressureSet for machines (PRS1) that use these, since they use Pressure to report averages.
|
||||||
|
ChannelID pressure_channel = CPAP_Pressure; // default
|
||||||
|
for (auto & ch : { CPAP_IPAPSet, CPAP_IPAP, CPAP_PressureSet }) {
|
||||||
|
if (session->eventlist.contains(ch)) {
|
||||||
|
pressure_channel = ch;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
TimeSeries pressureEvents(session->eventlist[pressure_channel]);
|
||||||
|
|
||||||
maskProfile->scanPressure(session);
|
int totalEvents = 0;
|
||||||
|
|
||||||
// TODO: a single leak eventlist incorrectly handles discontinuous data
|
auto & totalLeaks = session->eventlist[CPAP_LeakTotal];
|
||||||
EventList *leak = session->AddEventList(CPAP_Leak, EVL_Event, 1);
|
for (auto & eventList : totalLeaks) {
|
||||||
|
EventList *leak = session->AddEventList(CPAP_Leak, EVL_Event, 1);
|
||||||
auto & EVL = session->eventlist[CPAP_LeakTotal];
|
|
||||||
|
|
||||||
TimeValue *p2, *pstr, *pend;
|
|
||||||
|
|
||||||
// can this go out of the loop?
|
|
||||||
int mppressize = maskProfile->Pressure.size();
|
|
||||||
pstr = maskProfile->Pressure.data();
|
|
||||||
pend = maskProfile->Pressure.data()+(mppressize-1);
|
|
||||||
|
|
||||||
// For each sessions Total Leaks list
|
|
||||||
EventDataType gain, tmp, val;
|
|
||||||
int count;
|
|
||||||
EventStoreType *dptr, *eptr, pressure;
|
|
||||||
quint32 * tptr;
|
|
||||||
qint64 start, ti;
|
|
||||||
bool found;
|
|
||||||
|
|
||||||
for (auto & el : EVL) {
|
|
||||||
gain = el->gain();
|
|
||||||
count = el->count();
|
|
||||||
dptr = el->rawData();
|
|
||||||
eptr = dptr + count;
|
|
||||||
tptr = el->rawTime();
|
|
||||||
start = el->first();
|
|
||||||
|
|
||||||
// Scan through this Total Leak list's data
|
// Scan through this Total Leak list's data
|
||||||
for (; dptr < eptr; ++dptr) {
|
for (quint32 i = 0; i < eventList->count(); i++) {
|
||||||
tmp = EventDataType(*dptr) * gain;
|
bool valid;
|
||||||
ti = start + *tptr++;
|
qint64 time = eventList->time(i);
|
||||||
|
EventDataType pressure = pressureEvents.valueAt(time, &valid);
|
||||||
found = false;
|
if (valid) {
|
||||||
|
|
||||||
// Find the current pressure at this moment in time
|
|
||||||
pressure = pstr->value;
|
|
||||||
|
|
||||||
// TODO: This is O(n**2)! Refactor into a TimeSeries class that searches by timestamp but also tracks the last request
|
|
||||||
// so that it can search in O(n) for monotonically increasing timestamps, which is the common case.
|
|
||||||
for (TimeValue *p1 = pstr; p1 != pend; ++p1) {
|
|
||||||
p2 = p1+1;
|
|
||||||
if ((p2->time > ti) && (p1->time <= ti)) {
|
|
||||||
pressure = p1->value;
|
|
||||||
found = true;
|
|
||||||
break;
|
|
||||||
} else if (p2->time == ti) {
|
|
||||||
pressure = p2->value;
|
|
||||||
found = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (found) {
|
|
||||||
// lookup and subtract the calculated leak baseline for this pressure
|
// lookup and subtract the calculated leak baseline for this pressure
|
||||||
val = tmp - maskProfile->calcLeak(pressure);
|
EventDataType totalLeak = eventList->data(i);
|
||||||
|
EventDataType maskLeak = calc->calcLeakAt(pressure);
|
||||||
|
EventDataType val = totalLeak - maskLeak;
|
||||||
if (val < 0) {
|
if (val < 0) {
|
||||||
val = 0;
|
val = 0;
|
||||||
}
|
}
|
||||||
|
leak->AddEvent(time, val);
|
||||||
leak->AddEvent(ti, val);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
totalEvents += leak->count();
|
||||||
}
|
}
|
||||||
|
|
||||||
zMaskmutex.unlock();
|
delete calc;
|
||||||
|
|
||||||
return leak->count();
|
return totalEvents;
|
||||||
}
|
}
|
||||||
|
|
||||||
void flagLargeLeaks(Session *session)
|
void flagLargeLeaks(Session *session)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user