[lmi-commits] [5654] Rename an entity to improve concinnity

[Greg Chicares]

Revision: 5654
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5654
Author:   chicares
Date:     2013-01-09 23:17:44 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
Rename an entity to improve concinnity

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/dbdict.cpp
    lmi/trunk/dbdict.hpp
    lmi/trunk/dbnames.hpp
    lmi/trunk/dbnames.xpp
    lmi/trunk/ihs_basicval.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-01-09 22:33:47 UTC (rev 5653)
+++ lmi/trunk/ChangeLog 2013-01-09 23:17:44 UTC (rev 5654)
@@ -31805,3 +31805,20 @@
   dbnames.xpp
 Add numerous database entities for 7702 and 7702A.
 
+20130109T2233Z <address@hidden> [544]
+
+  ihs_avmly.cpp
+  oecumenic_enumerations.hpp
+Correct a misnomer noted 20130104T1731Z.
+
+20130109T2317Z <address@hidden> [544]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+  ihs_basicval.cpp
+Rename an entity to improve concinnity. This makes it more obvious
+that DBDictionary::InitDB() dangerously initializes the WP limit to
+zero.
+

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2013-01-09 22:33:47 UTC (rev 5653)
+++ lmi/trunk/dbdict.cpp        2013-01-09 23:17:44 UTC (rev 5654)
@@ -299,7 +299,7 @@
     ascribe("WpTable"             , &DBDictionary::WpTable             );
     ascribe("WpMinIssAge"         , &DBDictionary::WpMinIssAge         );
     ascribe("WpMaxIssAge"         , &DBDictionary::WpMaxIssAge         );
-    ascribe("WpMax"               , &DBDictionary::WpMax               );
+    ascribe("WpLimit"             , &DBDictionary::WpLimit             );
     ascribe("WpCoiRate"           , &DBDictionary::WpCoiRate           );
     ascribe("WpPremRate"          , &DBDictionary::WpPremRate          );
     ascribe("WpChargeMethod"      , &DBDictionary::WpChargeMethod      );
@@ -793,9 +793,6 @@
     Add(database_entity(DB_AllowWp             , true));
     Add(database_entity(DB_WpMinIssAge         , 18));
     Add(database_entity(DB_WpMaxIssAge         , 64));
-    // DB_WpMax is irrelevant because DB_WpChargeMethod is
-    // oe_waiver_times_deductions, to which no maximum applies.
-    Add(database_entity(DB_WpMax               , 0.0));
     Add(database_entity(DB_WpCoiRate           , 0.0));
     Add(database_entity(DB_WpPremRate          , 0.0));
     // SOA qx_ins table 708 is 70-75 US ADB experience.

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2013-01-09 22:33:47 UTC (rev 5653)
+++ lmi/trunk/dbdict.hpp        2013-01-09 23:17:44 UTC (rev 5654)
@@ -274,7 +274,7 @@
     database_entity WpTable             ;
     database_entity WpMinIssAge         ;
     database_entity WpMaxIssAge         ;
-    database_entity WpMax               ;
+    database_entity WpLimit             ;
     database_entity WpCoiRate           ;
     database_entity WpPremRate          ;
     database_entity WpChargeMethod      ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2013-01-09 22:33:47 UTC (rev 5653)
+++ lmi/trunk/dbnames.hpp       2013-01-09 23:17:44 UTC (rev 5654)
@@ -363,7 +363,7 @@
         ,DB_WpTable
         ,DB_WpMinIssAge
         ,DB_WpMaxIssAge
-        ,DB_WpMax
+        ,DB_WpLimit
         ,DB_WpCoiRate
         ,DB_WpPremRate
         ,DB_WpChargeMethod

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2013-01-09 22:33:47 UTC (rev 5653)
+++ lmi/trunk/dbnames.xpp       2013-01-09 23:17:44 UTC (rev 5654)
@@ -214,7 +214,7 @@
 {DB_WpTable,DB_Topic_Riders,"WpTable","Waiver benefit charge (index in 
mortality table database)",}, \
 {DB_WpMinIssAge,DB_Topic_Riders,"WpMinIssAge","Waiver benefit minimum issue 
age",}, \
 {DB_WpMaxIssAge,DB_Topic_Riders,"WpMaxIssAge","Waiver benefit maximum issue 
age",}, \
-{DB_WpMax,DB_Topic_Riders,"WpMax","Maximum specified amount to which waiver 
benefit can apply",}, \
+{DB_WpLimit,DB_Topic_Riders,"WpLimit","Maximum specified amount to which 
waiver benefit can apply",}, \
 {DB_WpCoiRate,DB_Topic_Riders,"WpCoiRate","[not yet implemented--use external 
table instead]",}, \
 {DB_WpPremRate,DB_Topic_Riders,"WpPremRate","[not yet implemented--use 
external table instead]",}, \
 {DB_WpChargeMethod,DB_Topic_Riders,"WpChargeMethod","Waiver benefit charge is 
multiple of: 0=monthly deductions, 1=NAAR",}, \

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2013-01-09 22:33:47 UTC (rev 5653)
+++ lmi/trunk/ihs_basicval.cpp  2013-01-09 23:17:44 UTC (rev 5654)
@@ -740,7 +740,7 @@
     NoLapseMinDur       = static_cast<int>(Database_->Query(DB_NoLapseMinDur));
     NoLapseMinAge       = static_cast<int>(Database_->Query(DB_NoLapseMinAge));
     AdbLimit            = Database_->Query(DB_AdbLimit             );
-    WpLimit             = Database_->Query(DB_WpMax                );
+    WpLimit             = Database_->Query(DB_WpLimit              );
     SpecAmtLoadLimit    = Database_->Query(DB_SpecAmtLoadLimit     );
     MinWD               = Database_->Query(DB_MinWd                );
     WDFee               = Database_->Query(DB_WdFee                );