[lmi-commits] [5360] Reorder and augment GPT fields; don't round them in monthly trace

[Greg Chicares]

Revision: 5360
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5360
Author:   chicares
Date:     2012-01-14 01:26:24 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
Reorder and augment GPT fields; don't round them in monthly trace

Modified Paths:
--------------
    lmi/trunk/ihs_avdebug.cpp
    lmi/trunk/ihs_irc7702.cpp
    lmi/trunk/ihs_irc7702.hpp

Modified: lmi/trunk/ihs_avdebug.cpp
===================================================================
--- lmi/trunk/ihs_avdebug.cpp   2012-01-13 22:36:38 UTC (rev 5359)
+++ lmi/trunk/ihs_avdebug.cpp   2012-01-14 01:26:24 UTC (rev 5360)
@@ -141,8 +141,10 @@
         ,e7702ACum7pp
         ,e7702AAmountsPaid
         ,e7702AIsMec
+        ,eGLP
+        ,eCumGLP
         ,eGSP
-        ,eGLP
+        ,e7702PremiumsPaid
         // Insert new enumerators above
         ,eLast
         };
@@ -213,7 +215,7 @@
         v[eMaxLoan]             = "Max loan";
         v[eNewLoan]             = "New loan";
         v[eTaxBasis]            = "Tax basis";
-        v[eCumNoLapsePrem]      = "Cum no lapse prem";
+        v[eCumNoLapsePrem]      = "Cumulative no lapse prem";
         v[eNoLapseActive]       = "No lapse active";
         v[eEOMAV]               = "EOM AV";
         v[eHMValue]             = "Honeymoon value";
@@ -232,11 +234,13 @@
         v[e7702AUnnecPm]        = "7702A unnec prem";
         v[e7702ADbAdj]          = "7702A DB adjustment";
         v[e7702A7pp]            = "7702A 7pp";
-        v[e7702ACum7pp]         = "7702A cum 7pp";
+        v[e7702ACum7pp]         = "7702A cumulative 7pp";
         v[e7702AAmountsPaid]    = "7702A amounts paid";
         v[e7702AIsMec]          = "Is MEC";
+        v[eGLP]                 = "GLP";
+        v[eCumGLP]              = "Cumulative GLP";
         v[eGSP]                 = "GSP";
-        v[eGLP]                 = "GLP";
+        v[e7702PremiumsPaid]    = "7702 premiums paid";
 
         return v;
     }
@@ -501,8 +505,10 @@
         }
     SetMonthlyDetail(e7702AIsMec         ,InvariantValues().IsMec          );
 
-    SetMonthlyDetail(eGSP                ,Irc7702_->RoundedGSP            ());
-    SetMonthlyDetail(eGLP                ,Irc7702_->RoundedGLP            ());
+    SetMonthlyDetail(eGLP                ,Irc7702_->glp                   ());
+    SetMonthlyDetail(eCumGLP             ,Irc7702_->cum_glp               ());
+    SetMonthlyDetail(eGSP                ,Irc7702_->gsp                   ());
+    SetMonthlyDetail(e7702PremiumsPaid   ,Irc7702_->premiums_paid         ());
 
     std::copy
         (DebugRecord.begin()

Modified: lmi/trunk/ihs_irc7702.cpp
===================================================================
--- lmi/trunk/ihs_irc7702.cpp   2012-01-13 22:36:38 UTC (rev 5359)
+++ lmi/trunk/ihs_irc7702.cpp   2012-01-14 01:26:24 UTC (rev 5360)
@@ -963,6 +963,34 @@
     return round_max_premium(PresentGSP);
 }
 
+/// Trivial accessor for monthly trace.
+
+double Irc7702::glp() const
+{
+    return PresentGLP;
+}
+
+/// Trivial accessor for monthly trace.
+
+double Irc7702::cum_glp() const
+{
+    return CumGLP;
+}
+
+/// Trivial accessor for monthly trace.
+
+double Irc7702::gsp() const
+{
+    return PresentGSP;
+}
+
+/// Trivial accessor for monthly trace.
+
+double Irc7702::premiums_paid() const
+{
+    return CumPmts;
+}
+
 // TODO ?? This should be a separate, standalone unit test.
 #ifdef TESTING
 

Modified: lmi/trunk/ihs_irc7702.hpp
===================================================================
--- lmi/trunk/ihs_irc7702.hpp   2012-01-13 22:36:38 UTC (rev 5359)
+++ lmi/trunk/ihs_irc7702.hpp   2012-01-14 01:26:24 UTC (rev 5360)
@@ -145,6 +145,10 @@
     double GetLeastBftAmtEver() const;
     double RoundedGLP() const;
     double RoundedGSP() const;
+    double glp          () const;
+    double cum_glp      () const;
+    double gsp          () const;
+    double premiums_paid() const;
 
   private:
     // Interest and DB Option basis