[lmi-commits] [6301] Rearrange database entitites

[Greg Chicares]

Revision: 6301
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6301
Author:   chicares
Date:     2015-09-25 02:46:19 +0000 (Fri, 25 Sep 2015)
Log Message:
-----------
Rearrange database entitites

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

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2015-09-25 02:37:16 UTC (rev 6300)
+++ lmi/trunk/dbdict.cpp        2015-09-25 02:46:19 UTC (rev 6301)
@@ -127,7 +127,6 @@
     ascribe("AllowSimpUw"         , &DBDictionary::AllowSimpUw         );
     ascribe("AllowGuarUw"         , &DBDictionary::AllowGuarUw         );
     ascribe("SmokeOrTobacco"      , &DBDictionary::SmokeOrTobacco      );
-    ascribe("UsePolicyFormAlt"    , &DBDictionary::UsePolicyFormAlt    );
     ascribe("AllowPreferredClass" , &DBDictionary::AllowPreferredClass );
     ascribe("AllowUltraPrefClass" , &DBDictionary::AllowUltraPrefClass );
     ascribe("AllowSubstdTable"    , &DBDictionary::AllowSubstdTable    );
@@ -399,6 +398,7 @@
     ascribe("DefaultProcessOrder" , &DBDictionary::DefaultProcessOrder );
     ascribe("GroupProxyRateTable" , &DBDictionary::GroupProxyRateTable );
     ascribe("PartialMortTable"    , &DBDictionary::PartialMortTable    );
+    ascribe("UsePolicyFormAlt"    , &DBDictionary::UsePolicyFormAlt    );
     ascribe("WeightClass"         , &DBDictionary::WeightClass         );
     ascribe("WeightGender"        , &DBDictionary::WeightGender        );
     ascribe("WeightSmoking"       , &DBDictionary::WeightSmoking       );

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2015-09-25 02:37:16 UTC (rev 6300)
+++ lmi/trunk/dbdict.hpp        2015-09-25 02:46:19 UTC (rev 6301)
@@ -103,7 +103,6 @@
     database_entity AllowSimpUw         ;
     database_entity AllowGuarUw         ;
     database_entity SmokeOrTobacco      ;
-    database_entity UsePolicyFormAlt    ;
     database_entity AllowPreferredClass ;
     database_entity AllowUltraPrefClass ;
     database_entity AllowSubstdTable    ;
@@ -380,6 +379,7 @@
     // make this entity superfluous. 'GroupProxyRateTable' could be
     // treated the same way.
     database_entity PartialMortTable    ;
+    database_entity UsePolicyFormAlt    ;
     database_entity WeightClass         ;
     database_entity WeightGender        ;
     database_entity WeightSmoking       ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2015-09-25 02:37:16 UTC (rev 6300)
+++ lmi/trunk/dbnames.hpp       2015-09-25 02:46:19 UTC (rev 6301)
@@ -130,7 +130,6 @@
         ,DB_AllowSimpUw
         ,DB_AllowGuarUw
         ,DB_SmokeOrTobacco       // DATABASE !! Move to '.policy' (cf. 
product_data::AvName)
-        ,DB_UsePolicyFormAlt
         ,DB_AllowPreferredClass
         ,DB_AllowUltraPrefClass
 
@@ -502,6 +501,7 @@
 
         ,DB_GroupProxyRateTable
         ,DB_PartialMortTable
+        ,DB_UsePolicyFormAlt
 
     ,DB_Topic_Weights
 

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2015-09-25 02:37:16 UTC (rev 6300)
+++ lmi/trunk/dbnames.xpp       2015-09-25 02:46:19 UTC (rev 6301)
@@ -33,7 +33,6 @@
 {DB_AllowSimpUw,DB_Topic_Underwriting,"AllowSimpUw","Allow simplified 
underwriting: 0=no, 1=yes",}, \
 {DB_AllowGuarUw,DB_Topic_Underwriting,"AllowGuarUw","Allow guaranteed 
underwriting: 0=no, 1=yes",}, \
 {DB_SmokeOrTobacco,DB_Topic_Underwriting,"SmokeOrTobacco","Distinguish 
mortality by: 0=smoking, 1=tobacco use",}, \
-{DB_UsePolicyFormAlt,DB_Topic_Underwriting,"UsePolicyFormAlt","Use alternative 
policy-form name: 0=no, 1=yes",}, \
 {DB_AllowPreferredClass,DB_Topic_Underwriting,"AllowPreferredClass","Allow 
preferred class: 0=no, 1=yes",}, \
 {DB_AllowUltraPrefClass,DB_Topic_Underwriting,"AllowUltraPrefClass","Allow 
ultra-preferred class: 0=no, 1=yes",}, \
 {DB_AllowSubstdTable,DB_Topic_Underwriting,"AllowSubstdTable","Allow 
substandard table ratings: 0=no, 1=yes",}, \
@@ -322,6 +321,7 @@
 {DB_DefaultProcessOrder,DB_Topic_Miscellanea,"DefaultProcessOrder","Default 
processing order: 0=life by life, 1=month by month [not yet implemented]",}, \
 {DB_GroupProxyRateTable,DB_Topic_Miscellanea,"GroupProxyRateTable","Group-term 
proxy rate (index in mortality table database)",}, \
 {DB_PartialMortTable,DB_Topic_Miscellanea,"PartialMortTable","Partial 
mortality table (index in mortality table database)",}, \
+{DB_UsePolicyFormAlt,DB_Topic_Miscellanea,"UsePolicyFormAlt","Use alternative 
policy-form name: 0=no, 1=yes",}, \
 {DB_Topic_Weights,DB_FIRST,"Weights","Weights for profit analysis cells [not 
yet implemented]",}, \
 {DB_WeightClass,DB_Topic_Weights,"WeightClass","Weight by underwriting class 
[not yet implemented]",}, \
 {DB_WeightGender,DB_Topic_Weights,"WeightGender","Weight by gender [not yet 
implemented]",}, \