From e44cd3f6961c5b157875d863ced77f1ff85f774b Mon Sep 17 00:00:00 2001 From: grauser Date: Fri, 23 Oct 2015 23:39:49 +0200 Subject: [PATCH] PMCData: Add expected data --- src/PMCData.cpp | 83 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 6 deletions(-) diff --git a/src/PMCData.cpp b/src/PMCData.cpp index d9ce91877..220912200 100644 --- a/src/PMCData.cpp +++ b/src/PMCData.cpp @@ -258,7 +258,7 @@ void PMCData::refresh() if (!std::isinf(value) && !std::isnan(value)) { stress_[offset] += value; - qDebug()<<"stress_["<fileName; + //qDebug()<<"planned_stress_["<fileName; } } } @@ -298,6 +298,11 @@ void PMCData::refresh() double planned_rollingStress=0; + double expected_lastLTS=0.0f; + double expected_lastSTS=0.0f; + + double expected_rollingStress=0; + for(int day=0; day < days_; day++) { // not seeded @@ -354,10 +359,6 @@ void PMCData::refresh() planned_sts_[day] *= -1; } - qDebug()<<"planned_stress_["<=0 || expected_sts_[day]>=0) { + // LTS + expected_lts_[day] = (planned_stress_[day] * (1.0 - lte)) + (lastLts * lte); + + // STS + expected_sts_[day] = (planned_stress_[day] * (1.0 - ste)) + (lastSts * ste); + + } else if (expected_lts_[day]< 0 || expected_sts_[day]<0) { + expected_lts_[day] *= -1; + expected_sts_[day] *= -1; + } + + // rolling stress for STS days + if (day && day <= stsDays_) { + // just starting out + expected_rollingStress += expected_lts_[day] - lastLts; + expected_rr_[day] = expected_rollingStress; + } else if (day) { + expected_rollingStress += expected_lts_[day] - lastLts; + expected_rollingStress -= ltsAtStsDays2 - ltsAtStsDays1; + expected_rr_[day] = expected_rollingStress; + } + + // SB (stress balance) long term - short term + // We allow it to be shown today or tomorrow where + // most (sane/thinking) folks usually show SB on the following day + expected_sb_[day+(sbToday ? 0 : 1)] = expected_lts_[day] - expected_sts_[day]; + } else { + expected_lts_[day] = 0; + expected_sts_[day] = 0; + expected_sb_[day] = 0; + expected_rr_[day] = 0; + + } + } //qDebug()<<"refresh PMC in="<