[lmi-commits] [lmi] master 3847d0f: De-implement producer compensation

[Greg Chicares]

branch: master
commit 3847d0f2529f7c1d4602e0cb5788a0194c9fa1b2
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    De-implement producer compensation
    
    These two entities:
      DB_AllowExtraAssetComp
      DB_AllowExtraPremComp
    remain implemented, because they're actually loads (which are, at least
    notionally, passed through to the producer), whereas the unimplemented
    compensation entities have no effect on account value.
---
 basic_values.hpp | 5 -----
 dbdict.cpp       | 4 ----
 dbnames.xpp      | 8 ++++----
 ihs_basicval.cpp | 5 -----
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/basic_values.hpp b/basic_values.hpp
index 210a08b..8d7572c 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -348,11 +348,6 @@ class LMI_SO BasicValues
     bool                    NoLapseAlwaysActive;
     std::vector<double>     DBDiscountRate;
 
-    bool                    CalculateComp;
-    std::vector<double>     AssetComp;
-    std::vector<double>     CompTarget;
-    std::vector<double>     CompExcess;
-
     bool                    UseUnusualCOIBanding;
 
     // TODO ?? These two data members make the code clearer and
diff --git a/dbdict.cpp b/dbdict.cpp
index 5c33bb9..e4f0ad2 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -808,10 +808,6 @@ void DBDictionary::write_database_files()
     z.Add({DB_AdbMinIssAge        , 15});
     z.Add({DB_AdbMaxIssAge        , 70});
     z.Add({DB_AdbLimit            , 1000000.0});
-    z.Add({DB_CalculateComp       , false});
-    z.Add({DB_CompTarget          , 0.0});
-    z.Add({DB_CompExcess          , 0.0});
-    z.Add({DB_CompChargeback      , 0.0});
     z.Add({DB_LedgerType          , mce_ill_reg});
     z.Add({DB_AllowExpRating      , false});
 
diff --git a/dbnames.xpp b/dbnames.xpp
index dbe7b22..168a3a0 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -321,10 +321,10 @@
 {DB_ErPremAcct,DB_Topic_Allocations,"ErPremAcct","Preferred account for 
employer premiums if input overridden: 0=general account, 1=separate 
account",}, \
 {DB_Topic_Compensation,DB_FIRST,"Compensation","Commissions, asset-based 
compensation, and chargebacks",}, \
 {DB_CalculateComp,DB_Topic_Compensation,"CalculateComp","Calculate 
compensation [not implemented]",}, \
-{DB_CompTarget,DB_Topic_Compensation,"CompTarget","Producer-only compensation 
on premium up to target",}, \
-{DB_CompExcess,DB_Topic_Compensation,"CompExcess","Producer-only compensation 
on premium in excess of target",}, \
-{DB_CompChargeback,DB_Topic_Compensation,"CompChargeback","Compensation 
chargeback for early termination",}, \
-{DB_AssetComp,DB_Topic_Compensation,"AssetComp","Producer-only compensation on 
separate-account assets--not tiered by assets",}, \
+{DB_CompTarget,DB_Topic_Compensation,"CompTarget","Producer-only compensation 
on premium up to target [not yet implemented]",}, \
+{DB_CompExcess,DB_Topic_Compensation,"CompExcess","Producer-only compensation 
on premium in excess of target [not yet implemented]",}, \
+{DB_CompChargeback,DB_Topic_Compensation,"CompChargeback","Compensation 
chargeback for early termination [not yet implemented]",}, \
+{DB_AssetComp,DB_Topic_Compensation,"AssetComp","Producer-only compensation on 
separate-account assets--not tiered by assets [not yet implemented]",}, \
 {DB_AllowExtraAssetComp,DB_Topic_Compensation,"AllowExtraAssetComp","Allow 
input extra asset-based compensation: 0=no, 1=yes",}, \
 {DB_AllowExtraPremComp,DB_Topic_Compensation,"AllowExtraPremComp","Allow input 
extra premium-based compensation: 0=no, 1=yes",}, \
 {DB_Topic_ExperienceRating,DB_FIRST,"Experience rating","Experience-rating 
parameters",}, \
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 2f44e1a..0db9d67 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -673,11 +673,6 @@ void BasicValues::SetPermanentInvariants()
     assign(DBDiscountRate, 1.0 + DBDiscountRate);
     assign(DBDiscountRate, 1.0 / DBDiscountRate);
 
-    database().query_into(DB_CalculateComp        , CalculateComp);
-    database().query_into(DB_AssetComp            , AssetComp);
-    database().query_into(DB_CompTarget           , CompTarget);
-    database().query_into(DB_CompExcess           , CompExcess);
-
     database().query_into(DB_DynamicMandE         , MandEIsDynamic);
     database().query_into(DB_DynamicSepAcctLoad   , SepAcctLoadIsDynamic);