[lmi-commits] [5281] Restrict a data member to the antediluvian fork

[Greg Chicares]

Revision: 5281
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5281
Author:   chicares
Date:     2011-09-13 10:16:26 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
Restrict a data member to the antediluvian fork

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/basic_values.hpp
    lmi/trunk/ihs_avmly.cpp
    lmi/trunk/ihs_basicval.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-09-12 20:28:28 UTC (rev 5280)
+++ lmi/trunk/ChangeLog 2011-09-13 10:16:26 UTC (rev 5281)
@@ -28467,3 +28467,12 @@
   ihs_basicval.cpp
 Cache values of certain database entities added 20110912T1917Z.
 
+20110913T1016Z <address@hidden> [614]
+
+  basic_values.hpp
+  ihs_avmly.cpp
+  ihs_basicval.cpp
+Restrict a data member to the antediluvian fork. In production,
+confusingly, 'MinSpecAmt' was initialized with a value that was
+overridden before each use.
+

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2011-09-12 20:28:28 UTC (rev 5280)
+++ lmi/trunk/basic_values.hpp  2011-09-13 10:16:26 UTC (rev 5281)
@@ -308,6 +308,7 @@
     mcenum_dbopt_7702            Equiv7702DBO3;
     double                       MaxNAAR;
     int                          EndtAge;
+    double                       MinSpecAmt; // Antediluvian.
     double                       MinIssSpecAmt;
     double                       MinIssBaseSpecAmt;
     double                       MinRenlSpecAmt;
@@ -337,7 +338,6 @@
     bool                         SurrChgOnDecr;
     std::vector<double>          FreeWDProportion;
 
-    double                  MinSpecAmt;
     double                  AdbLimit;
     double                  WpLimit;
     double                  SpecAmtLoadLimit;

Modified: lmi/trunk/ihs_avmly.cpp
===================================================================
--- lmi/trunk/ihs_avmly.cpp     2011-09-12 20:28:28 UTC (rev 5280)
+++ lmi/trunk/ihs_avmly.cpp     2011-09-13 10:16:26 UTC (rev 5281)
@@ -760,13 +760,7 @@
             // correctly. More care must be given to rounding and to
             // minimums, and the order of adjustment (and term-rider
             // removal) in Input::make_term_rider_consistent() as well
-            // as here. DATABASE !! Are these parameters:
-            //   DB_MinSpecAmt
-            //   DB_MinIssSpecAmt
-            //   DB_MinRenlSpecAmt
-            //   DB_MinRenlBaseSpecAmt
-            // sufficient, or might there also be a minimum total
-            // specified amount for base and term combined?
+            // as here.
             if(TermRiderActive)
                 {
                 TermSpecAmt =
@@ -782,17 +776,18 @@
         ActualSpecAmt += delta;
         }
 
+    double min_spec_amt = 0.0;
     if(TermRiderActive)
         {
-        MinSpecAmt = MinRenlBaseSpecAmt;
+        min_spec_amt = MinRenlBaseSpecAmt;
         }
     else
         {
-        MinSpecAmt = MinRenlSpecAmt;
+        min_spec_amt = MinRenlSpecAmt;
         }
 
     // If the minimum isn't met, then force it.
-    ActualSpecAmt = std::max(ActualSpecAmt, MinSpecAmt);
+    ActualSpecAmt = std::max(ActualSpecAmt, min_spec_amt);
     ActualSpecAmt = round_specamt()(ActualSpecAmt);
     AddSurrChgLayer(Year, std::max(0.0, ActualSpecAmt - prior_specamt));
 

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2011-09-12 20:28:28 UTC (rev 5280)
+++ lmi/trunk/ihs_basicval.cpp  2011-09-13 10:16:26 UTC (rev 5281)
@@ -694,7 +694,6 @@
     MaxLoanAVMult       = Database_->Query(DB_MaxLoanAcctValMult   );
     NoLapseMinDur       = static_cast<int>(Database_->Query(DB_NoLapseMinDur));
     NoLapseMinAge       = static_cast<int>(Database_->Query(DB_NoLapseMinAge));
-    MinSpecAmt          = Database_->Query(DB_MinSpecAmt           );
     AdbLimit            = Database_->Query(DB_AdbLimit             );
     WpLimit             = Database_->Query(DB_WpMax                );
     SpecAmtLoadLimit    = Database_->Query(DB_SpecAmtLoadLimit     );