[lmi-commits] [5586] Remove obsolete code involving ready-to-expunge member variables

[Greg Chicares]

Revision: 5586
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5586
Author:   chicares
Date:     2012-10-27 11:53:45 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Remove obsolete code involving ready-to-expunge member variables

Modified Paths:
--------------
    lmi/trunk/input.cpp
    lmi/trunk/input_harmonization.cpp
    lmi/trunk/yare_input.hpp

Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2012-10-27 10:09:14 UTC (rev 5585)
+++ lmi/trunk/input.cpp 2012-10-27 11:53:45 UTC (rev 5586)
@@ -225,31 +225,8 @@
     ,SolveToWhich                     ("Retirement")
 //    ,UseDOB                           ("")
 //    ,EffectiveDateToday               ("")
-//    ,DeathBenefitOptionFromRetirement ("")
-//    ,DeathBenefitOptionFromIssue      ("")
-    ,SpecifiedAmountFromRetirement    ("1000000")
-    ,SpecifiedAmountFromIssue         ("1000000")
 //    ,SpecifiedAmountStrategyFromIssue ("")
-//    ,IndividualPaymentMode            ("")
-    ,IndividualPaymentToAlternative   ("Maturity")
-    ,IndividualPaymentToAge           ("95")
-    ,IndividualPaymentToDuration      ("50")
-//    ,IndividualPaymentAmount          ("")
 //    ,IndividualPaymentStrategy        ("")
-//    ,LoanAmount                       ("")
-    ,LoanFromAge                      ("45")
-    ,LoanFromAlternative              ("Retirement")
-    ,LoanFromDuration                 ("20")
-    ,LoanToAge                        ("95")
-    ,LoanToAlternative                ("Maturity")
-    ,LoanToDuration                   ("50")
-//    ,WithdrawalAmount                 ("")
-    ,WithdrawalFromAge                ("45")
-    ,WithdrawalFromAlternative        ("Retirement")
-    ,WithdrawalFromDuration           ("20")
-    ,WithdrawalToAge                  ("95")
-    ,WithdrawalToAlternative          ("Maturity")
-    ,WithdrawalToDuration             ("50")
 {
     AscribeMembers();
     DoAdaptExternalities(); // Initialize database, e.g.

Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp   2012-10-27 10:09:14 UTC (rev 5585)
+++ lmi/trunk/input_harmonization.cpp   2012-10-27 11:53:45 UTC (rev 5586)
@@ -477,8 +477,6 @@
     SpecifiedAmountStrategyFromIssue.allow(mce_sa_corridor    , 
!inhibit_premium_based_strategies);
     SpecifiedAmountStrategyFromIssue.enable(!specamt_solve && 
!specamt_from_term_proportion && mce_sa_input_scalar == 
SpecifiedAmountStrategyFromIssue);
 
-    SpecifiedAmountFromIssue.enable(!specamt_solve && 
!specamt_from_term_proportion && mce_sa_input_scalar == 
SpecifiedAmountStrategyFromIssue);
-
     bool inhibit_sequence = specamt_solve || specamt_from_term_proportion;
     SpecifiedAmount.enable(!inhibit_sequence);
 
@@ -552,12 +550,6 @@
         || mce_solve_ee_prem == SolveType
         ;
 
-    IndividualPaymentToAlternative.allow(mce_to_retirement, 
!inhibit_prem_simple && !prem_solve);
-    IndividualPaymentToAlternative.allow(mce_to_year      , 
!inhibit_prem_simple && !prem_solve);
-    IndividualPaymentToAlternative.allow(mce_to_age       , 
!inhibit_prem_simple && !prem_solve);
-    IndividualPaymentToAlternative.allow(mce_to_maturity  , 
!inhibit_prem_simple && !prem_solve);
-    IndividualPaymentToAlternative.enable(!prem_solve);
-
     IndividualPaymentStrategy.allow(mce_pmt_input_scalar, !inhibit_prem_simple 
&& !prem_solve);
     IndividualPaymentStrategy.allow(mce_pmt_minimum     , !inhibit_prem_simple 
&& !prem_solve || specamt_indeterminate);
     IndividualPaymentStrategy.allow(mce_pmt_target      , !inhibit_prem_simple 
&& !prem_solve || specamt_indeterminate);
@@ -568,10 +560,6 @@
     IndividualPaymentStrategy.allow(mce_pmt_table       , !inhibit_prem_simple 
&& !prem_solve || specamt_indeterminate);
     IndividualPaymentStrategy.enable(!inhibit_prem_simple && !prem_solve);
 
-    IndividualPaymentAmount    .enable(mce_pmt_input_scalar == 
IndividualPaymentStrategy);
-    IndividualPaymentToAge     .enable(mce_to_age  == 
IndividualPaymentToAlternative);
-    IndividualPaymentToDuration.enable(mce_to_year == 
IndividualPaymentToAlternative);
-
 //    InsuredPremiumTableNumber.enable(mce_pmt_table == 
IndividualPaymentStrategy); // // INPUT !! Obsolete scalar alternative control.
 // In the legacy system, that control, 'InsuredPremiumTableFactor',
 // and their 'Corporation'- congeners were enabled iff a
@@ -673,38 +661,16 @@
     bool wd_solve = (mce_solve_wd == SolveType);
     bool wd_forbidden = !wd_allowed;
 
-    Withdrawal.enable(!wd_forbidden && !wd_solve);
-
     bool wd_inhibit = wd_solve || wd_forbidden;
-// TODO ?? WX PORT !! Figure out how to do this properly:
-    bool wd_inhibit_simple = wd_inhibit; // || !is_wd_simply_representable;
 
-    WithdrawalFromAlternative.allow(mce_from_issue     , !wd_inhibit_simple);
-    WithdrawalFromAlternative.allow(mce_from_year      , !wd_inhibit_simple);
-    WithdrawalFromAlternative.allow(mce_from_age       , !wd_inhibit_simple);
-    WithdrawalFromAlternative.allow(mce_from_retirement, !wd_inhibit_simple);
-    WithdrawalFromAlternative.enable(!wd_inhibit_simple);
+    Withdrawal.enable(!wd_inhibit);
 
-    WithdrawalToAlternative  .allow(mce_to_retirement  , !wd_inhibit_simple);
-    WithdrawalToAlternative  .allow(mce_to_year        , !wd_inhibit_simple);
-    WithdrawalToAlternative  .allow(mce_to_age         , !wd_inhibit_simple);
-    WithdrawalToAlternative  .allow(mce_to_maturity    , !wd_inhibit_simple);
-    WithdrawalToAlternative  .enable(!wd_inhibit_simple);
-
-    WithdrawalAmount         .enable(!wd_inhibit_simple);
-    WithdrawalFromAge        .enable(!wd_inhibit_simple && mce_from_age  == 
WithdrawalFromAlternative);
-    WithdrawalFromDuration   .enable(!wd_inhibit_simple && mce_from_year == 
WithdrawalFromAlternative);
-    WithdrawalToAge          .enable(!wd_inhibit_simple && mce_to_age    == 
WithdrawalToAlternative);
-    WithdrawalToDuration     .enable(!wd_inhibit_simple && mce_to_year   == 
WithdrawalToAlternative);
-
     bool loan_solve = mce_solve_loan == SolveType;
     bool loan_forbidden = !loan_allowed;
 
     WithdrawToBasisThenLoan.enable(!wd_forbidden && !loan_forbidden);
 
     bool loan_inhibit = loan_solve || loan_forbidden;
-// TODO ?? WX PORT !! Figure out how to do this properly:
-    bool loan_inhibit_simple = loan_inhibit; // !is_loan_simply_representable;
 
     NewLoan.enable(!loan_inhibit);
 
@@ -713,24 +679,6 @@
     InforceRegularLoanBalance  .enable(loan_allowed);
     InforcePreferredLoanBalance.enable(pref_loan_allowed);
 
-    LoanFromAlternative.allow(mce_from_issue     , !loan_inhibit_simple);
-    LoanFromAlternative.allow(mce_from_year      , !loan_inhibit_simple);
-    LoanFromAlternative.allow(mce_from_age       , !loan_inhibit_simple);
-    LoanFromAlternative.allow(mce_from_retirement, !loan_inhibit_simple);
-    LoanFromAlternative.enable(!loan_inhibit_simple);
-
-    LoanToAlternative  .allow(mce_to_retirement  , !loan_inhibit_simple);
-    LoanToAlternative  .allow(mce_to_year        , !loan_inhibit_simple);
-    LoanToAlternative  .allow(mce_to_age         , !loan_inhibit_simple);
-    LoanToAlternative  .allow(mce_to_maturity    , !loan_inhibit_simple);
-    LoanToAlternative  .enable(!loan_inhibit_simple);
-
-    LoanAmount         .enable(!loan_inhibit_simple);
-    LoanFromAge        .enable(!loan_inhibit_simple && mce_from_age  == 
LoanFromAlternative);
-    LoanFromDuration   .enable(!loan_inhibit_simple && mce_from_year == 
LoanFromAlternative);
-    LoanToAge          .enable(!loan_inhibit_simple && mce_to_age    == 
LoanToAlternative);
-    LoanToDuration     .enable(!loan_inhibit_simple && mce_to_year   == 
LoanToAlternative);
-
     TermRider.enable(database_->Query(DB_AllowTerm));
     TermRider.allow(mce_yes, database_->Query(DB_AllowTerm));
 

Modified: lmi/trunk/yare_input.hpp
===================================================================
--- lmi/trunk/yare_input.hpp    2012-10-27 10:09:14 UTC (rev 5585)
+++ lmi/trunk/yare_input.hpp    2012-10-27 11:53:45 UTC (rev 5586)
@@ -251,31 +251,8 @@
 //    mcenum_to_point                   SolveToWhich                    ;
 //    bool                              UseDOB                          ;
 //    bool                              EffectiveDateToday              ;
-//    mcenum_dbopt                      DeathBenefitOptionFromRetirement;
-//    mcenum_dbopt                      DeathBenefitOptionFromIssue     ;
-//    double                            SpecifiedAmountFromRetirement   ;
-//    double                            SpecifiedAmountFromIssue        ;
 //    mcenum_sa_strategy                SpecifiedAmountStrategyFromIssue;
-//    mcenum_mode                       IndividualPaymentMode           ;
-//    mcenum_to_point                   IndividualPaymentToAlternative  ;
-//    int                               IndividualPaymentToAge          ;
-//    int                               IndividualPaymentToDuration     ;
-//    double                            IndividualPaymentAmount         ;
 //    mcenum_pmt_strategy               IndividualPaymentStrategy       ;
-//    double                            LoanAmount                      ;
-//    int                               LoanFromAge                     ;
-//    mcenum_from_point                 LoanFromAlternative             ;
-//    int                               LoanFromDuration                ;
-//    int                               LoanToAge                       ;
-//    mcenum_to_point                   LoanToAlternative               ;
-//    int                               LoanToDuration                  ;
-//    double                            WithdrawalAmount                ;
-//    int                               WithdrawalFromAge               ;
-//    mcenum_from_point                 WithdrawalFromAlternative       ;
-//    int                               WithdrawalFromDuration          ;
-//    int                               WithdrawalToAge                 ;
-//    mcenum_to_point                   WithdrawalToAlternative         ;
-//    int                               WithdrawalToDuration            ;
 
     std::vector<mcenum_sa_strategy  > SpecifiedAmountStrategy         ;
     std::vector<mcenum_pmt_strategy > PaymentStrategy                 ;