[lmi-commits] [5279] Rename certain member variables

[Greg Chicares]

Revision: 5279
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5279
Author:   chicares
Date:     2011-09-12 20:09:14 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
Rename certain member variables

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

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2011-09-12 19:33:19 UTC (rev 5278)
+++ lmi/trunk/basic_values.hpp  2011-09-12 20:09:14 UTC (rev 5279)
@@ -308,8 +308,8 @@
     mcenum_dbopt_7702            Equiv7702DBO3;
     double                       MaxNAAR;
     int                          EndtAge;
-    double                       MinRenlBaseFace;
-    double                       MinRenlFace;
+    double                       MinRenlSpecAmt;
+    double                       MinRenlBaseSpecAmt;
     bool                         NoLapseOpt1Only;
     bool                         NoLapseUnratedOnly;
     bool                         OptChgCanIncrSA;

Modified: lmi/trunk/ihs_avmly.cpp
===================================================================
--- lmi/trunk/ihs_avmly.cpp     2011-09-12 19:33:19 UTC (rev 5278)
+++ lmi/trunk/ihs_avmly.cpp     2011-09-12 20:09:14 UTC (rev 5279)
@@ -770,7 +770,7 @@
             if(TermRiderActive)
                 {
                 TermSpecAmt =
-                    std::max(TermSpecAmt + ActualSpecAmt, MinRenlFace)
+                      std::max(TermSpecAmt + ActualSpecAmt, MinRenlSpecAmt)
                     - ActualSpecAmt
                     ;
                 }
@@ -784,11 +784,11 @@
 
     if(TermRiderActive)
         {
-        MinSpecAmt = MinRenlBaseFace;
+        MinSpecAmt = MinRenlBaseSpecAmt;
         }
     else
         {
-        MinSpecAmt = MinRenlFace;
+        MinSpecAmt = MinRenlSpecAmt;
         }
 
     // If the minimum isn't met, then force it.

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2011-09-12 19:33:19 UTC (rev 5278)
+++ lmi/trunk/ihs_basicval.cpp  2011-09-12 20:09:14 UTC (rev 5279)
@@ -671,8 +671,8 @@
 //============================================================================
 void BasicValues::SetPermanentInvariants()
 {
-    MinRenlBaseFace     = Database_->Query(DB_MinRenlBaseSpecAmt   );
-    MinRenlFace         = Database_->Query(DB_MinRenlSpecAmt       );
+    MinRenlSpecAmt      = Database_->Query(DB_MinRenlSpecAmt       );
+    MinRenlBaseSpecAmt  = Database_->Query(DB_MinRenlBaseSpecAmt   );
     NoLapseOpt1Only     = Database_->Query(DB_NoLapseDbo1Only      );
     NoLapseUnratedOnly  = Database_->Query(DB_NoLapseUnratedOnly   );
     OptChgCanIncrSA     = Database_->Query(DB_DboChgCanIncrSpecAmt );