[lmi-commits] [5711] Fix defect introduced 20050212T1259Z

[Greg Chicares]

Revision: 5711
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5711
Author:   chicares
Date:     2013-04-21 09:46:16 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
Fix defect introduced 20050212T1259Z

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ledger_invariant.cpp
    lmi/trunk/ledger_invariant.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-04-21 08:50:12 UTC (rev 5710)
+++ lmi/trunk/ChangeLog 2013-04-21 09:46:16 UTC (rev 5711)
@@ -32178,3 +32178,15 @@
 Use product of all COI multipliers in ledger. Retain the old name for
 the nonce to avoid affecting every regression test.
 
+20130421T0850Z <address@hidden> [542]
+
+  ledger_variant.cpp
+Reformat.
+
+20130421T0946Z <address@hidden> [542]
+
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+Fix defect introduced 20050212T1259Z, from an original file predating
+the lmi epoch: 'PostHoneymoonSpread', being a rate, is not additive.
+

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2013-04-21 08:50:12 UTC (rev 5710)
+++ lmi/trunk/ledger_invariant.cpp      2013-04-21 09:46:16 UTC (rev 5711)
@@ -137,7 +137,6 @@
     ScalableScalars ["InitGSP"               ] = &InitGSP                ;
     ScalableScalars ["InitGLP"               ] = &InitGLP                ;
     ScalableScalars ["InitTgtPrem"           ] = &InitTgtPrem            ;
-    ScalableScalars ["PostHoneymoonSpread"   ] = &PostHoneymoonSpread    ;
     ScalableScalars ["Dumpin"                ] = &Dumpin                 ;
     ScalableScalars ["External1035Amount"    ] = &External1035Amount     ;
     ScalableScalars ["Internal1035Amount"    ] = &Internal1035Amount     ;
@@ -170,6 +169,7 @@
     OtherScalars    ["HasSpouseRider"        ] = &HasSpouseRider         ;
     OtherScalars    ["SpouseIssueAge"        ] = &SpouseIssueAge         ;
     OtherScalars    ["HasHoneymoon"          ] = &HasHoneymoon           ;
+    OtherScalars    ["PostHoneymoonSpread"   ] = &PostHoneymoonSpread    ;
     OtherScalars    ["AllowDbo3"             ] = &AllowDbo3              ;
     OtherScalars    ["InitAnnLoanDueRate"    ] = &InitAnnLoanDueRate     ;
     OtherScalars    ["IsInforce"             ] = &IsInforce              ;
@@ -580,8 +580,8 @@
     SpouseIssueAge          = b->yare_input_.SpouseIssueAge;
 
     HasHoneymoon            = b->yare_input_.HoneymoonEndorsement;
+    PostHoneymoonSpread     = b->yare_input_.PostHoneymoonSpread;
     AllowDbo3               = b->Database_->Query(DB_AllowDbo3);
-    PostHoneymoonSpread     = b->yare_input_.PostHoneymoonSpread;
 
     // The antediluvian branch has a null ProductData_ object.
     if(b->ProductData_)
@@ -1005,8 +1005,9 @@
 // TODO ?? For some ages, we use min; for others, max; how about this one?
 //    SpouseIssueAge     =
 
-    HasHoneymoon = HasHoneymoon || a_Addend.HasHoneymoon ;
-    AllowDbo3    = AllowDbo3    || a_Addend.AllowDbo3    ;
+    HasHoneymoon       = HasHoneymoon || a_Addend.HasHoneymoon ;
+    PostHoneymoonSpread= a_Addend.PostHoneymoonSpread          ;
+    AllowDbo3          = AllowDbo3    || a_Addend.AllowDbo3    ;
 
     NoLapseMinDur      = std::min(a_Addend.NoLapseMinDur, NoLapseMinDur);
     NoLapseMinAge      = std::min(a_Addend.NoLapseMinAge, NoLapseMinAge);

Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp      2013-04-21 08:50:12 UTC (rev 5710)
+++ lmi/trunk/ledger_invariant.hpp      2013-04-21 09:46:16 UTC (rev 5711)
@@ -150,7 +150,6 @@
     double          InitGSP;
     double          InitGLP;
     double          InitTgtPrem;
-    double          PostHoneymoonSpread;
     double          Dumpin;
     double          External1035Amount;
     double          Internal1035Amount;
@@ -184,6 +183,7 @@
     double          HasSpouseRider;
     double          SpouseIssueAge;
     double          HasHoneymoon;
+    double          PostHoneymoonSpread;
     double          AllowDbo3;
     double          IsInforce;
     double          CountryCOIMultiplier;