[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5269] Expunge unused legacy code
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5269] Expunge unused legacy code |
|
Date: |
Wed, 24 Aug 2011 16:45:17 +0000 |
Revision: 5269
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5269
Author: chicares
Date: 2011-08-24 16:45:17 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Expunge unused legacy code
Modified Paths:
--------------
lmi/trunk/input_harmonization.cpp
Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp 2011-08-24 16:39:20 UTC (rev 5268)
+++ lmi/trunk/input_harmonization.cpp 2011-08-24 16:45:17 UTC (rev 5269)
@@ -1204,374 +1204,3 @@
SolveEndTime = issue_age() + SolveEndYear .value();
}
-#if 0
-
-// What follows is a reimplementation of parts of the legacy system
-// whose sole author is GWC.
-
-// TODO ?? Much more work is needed here. Lines that seem unnecessary
-// or haven't been tested are marked with four slashes.
-
-void Input::WithdrawalChanged()
-{
-//// if(!IsFlagSet(wfFullyCreated))
-//// {
-//// return;
-//// }
-//// Changed();
-
- // Reinitialize vectors to bland defaults. Otherwise, since these
- // are always of length 100, values past the maturity year could
- // cause problems, because elsewhere we replicate the maturity-year
- // value through element 100 after setting the vectors from sequence
- // strings at certain times. For instance, setting death benefit
- // option "b" gives us 100 occurrences of "b"; if we change that to
- // "a" here, then a change from B to A is detected before the elements
- // after maturity are reset, and some policy forms don't allow such
- // a change. Obviously this is just a workaround for a bad design
- // that should be fixed eventually.
-//// WD.assign(KludgeLength, r_wd(0.0));
-
-//// transfer_mft_string
-//// (WD
-//// ,*DIAGNOSTICS
-//// ,*WITHDRAWAL
-//// ,Withdrawal
-//// ,years_to_maturity()
-//// ,static_cast<int>(IssueAge)
-//// ,static_cast<int>(RetirementAge)
-//// ,static_cast<int>(InforceYear)
-//// ,calendar_date(EffDate).year()
-//// ,false
-//// );
-////
-//// if(0 == DIAGNOSTICS->GetTextLen())
-//// {
-//// std::string s;
-//// s = realize_sequence_string_for_withdrawal();
-//// if(s.empty())
-//// {
-//// return;
-//// }
-//// DIAGNOSTICS->SetText(s);
-//// set_validity(*WITHDRAWAL, false);
-//// return;
-//// }
-
- InputSequence s
- (Withdrawal
- ,years_to_maturity()
- ,static_cast<int>(IssueAge)
- ,static_cast<int>(RetirementAge)
- ,static_cast<int>(InforceYear)
- ,calendar_date(EffDate).year()
- ,0
- );
- TransferWithdrawalInputSequenceToSimpleControls(s);
-}
-
-void Input::TransferWithdrawalSimpleControlsToInputSequence()
-{
-//// if(!IsFlagSet(wfFullyCreated))
-//// {
-//// return;
-//// }
-////
-//// ClearFlag(wfFullyCreated);
-//// TXferPropertyPage::TransferData(tdGetData);
-
- std::string s;
-
- switch(local_rep->WDFromWhich)
- {
- case enumerator_fromret:
- {
- if(IssueAge < RetirementAge)
-// TODO ?? RetirementAge < database_->Query(DB_MaturityAge)
- {
- s += "0, retirement";
- s += "; ";
- }
- }
- break;
- case enumerator_fromage:
- {
- if(IssueAge < local_rep->WDBegTime)
-// TODO ?? local_rep->WDBegTime < database_->Query(DB_MaturityAge)
- {
- s += "0, @" + value_cast<std::string>(local_rep->WDBegTime);
- s += "; ";
- }
- }
- break;
- case enumerator_fromyear:
- {
- if(0 < local_rep->WDBegTime)
-// TODO ?? ( IssueAge + local_rep->WDBegTime
-// < database_->Query(DB_MaturityAge)
-// )
- {
- s += "0, " + value_cast<std::string>(local_rep->WDBegTime);
- s += "; ";
- }
- }
- break;
- case enumerator_fromissue:
- {
- // Do nothing.
- }
- break;
- default:
- {
- fatal_error()
- << "Case '"
- << local_rep->WDFromWhich
- << "' not found."
- << LMI_FLUSH
- ;
- }
- }
-
- static const int n = 1000;
- char z[n];
- WD_AMT->GetText(z, n);
- s += z;
-
- switch(local_rep->WDToWhich)
- {
- case enumerator_toret:
- {
- if(RetirementAge < database_->Query(DB_MaturityAge))
- {
- s += ", retirement";
- s += "; 0";
- }
- }
- break;
- case enumerator_toage:
- {
- if(local_rep->WDEndTime < database_->Query(DB_MaturityAge))
- {
- s += ", @" + value_cast<std::string>(local_rep->WDEndTime);
- s += "; 0";
- }
- }
- break;
- case enumerator_toyear:
- {
- if
- ( IssueAge + local_rep->WDEndTime
- < database_->Query(DB_MaturityAge)
- )
- {
- s += ", " + value_cast<std::string>(local_rep->WDEndTime);
- s += "; 0";
- }
- }
- break;
- case enumerator_toend:
- {
- // Do nothing.
- }
- break;
- default:
- {
- fatal_error()
- << "Case '"
- << local_rep->WDToWhich
- << "' not found."
- << LMI_FLUSH
- ;
- }
- }
-
- // Simplify the input sequence if WD is zero.
- if("0" == std::string(z))
- {
- s = "0";
- }
-
- WITHDRAWAL->SetText(s);
-//// wxSafeYield();
-//// SetFlag(wfFullyCreated);
-}
-
-void Input::TransferWithdrawalInputSequenceToSimpleControls
- (InputSequence const& s
- )
-{
-////// if(!IsFlagSet(wfFullyCreated))
-////// {
-////// return;
-////// }
-
- bool is_valid = s.formatted_diagnostics().empty(); // &&
WITHDRAWAL->IsWindowEnabled(); // TODO ?? Kludge.
- std::vector<ValueInterval> const& intervals = s.interval_representation();
- bool is_simple =
- 0 == intervals.size()
- || (
- ( 1 == intervals.size()
- && 0 == intervals[0].begin_duration
- )
- || ( 2 == intervals.size()
- && ( 0.0 == intervals[0].value_number
- || 0.0 == intervals[1].value_number
- )
- )
- || ( 3 == intervals.size()
- && 0.0 == intervals[0].value_number
- && 0.0 == intervals[2].value_number
- )
- )
- ;
- is_wd_simply_representable = is_valid && is_simple;
- if(!is_wd_simply_representable || 0 == intervals.size())
- {
- Enabler(); // Enablement of simple controls.
-
- ClearFlag(wfFullyCreated);
- WD_AMT->SetText("0");
- wxSafeYield();
- SetFlag(wfFullyCreated);
-
- return;
- }
-
- local_rep->sWD = WD[0];
-
- bool wd_in_second_interval =
- 0.0 == WD[0]
- && 2 <= intervals.size()
- ;
- int wd_interval;
- if(wd_in_second_interval)
- {
- local_rep->sWD = WD[intervals[1].begin_duration];
- wd_interval = 1;
- }
- else
- {
- local_rep->sWD = WD[0];
- wd_interval = 0;
- }
-
- switch(intervals[wd_interval].begin_mode)
- {
- case e_number_of_years:
- {
- local_rep->WDFromWhich = enumerator_fromyear;
- local_rep->WDBegTime = intervals[wd_interval].begin_duration;
- }
- break;
- case e_duration:
- {
- local_rep->WDFromWhich = enumerator_fromyear;
- local_rep->WDBegTime = intervals[wd_interval].begin_duration;
- }
- break;
- case e_attained_age:
- {
- local_rep->WDFromWhich = enumerator_fromage;
- local_rep->WDBegTime =
- intervals[wd_interval].begin_duration
- + IssueAge
- ;
- }
- break;
- case e_inception:
- {
- local_rep->WDFromWhich = enumerator_fromyear;
- local_rep->WDBegTime = 0;
- }
- break;
- case e_retirement:
- {
- local_rep->WDFromWhich = enumerator_fromret;
- }
- break;
- case e_inforce: // Fall through: not implemented.
- case e_maturity: // Fall through: illogical.
- default:
- {
- fatal_error()
- << "Case '"
- << intervals[wd_interval].begin_mode
- << "' not found."
- << LMI_FLUSH
- ;
- }
- }
-
- switch(intervals[wd_interval].end_mode)
- {
- case e_number_of_years:
- // Fall through. In this special case, number of years
- // and duration are the same, because the interval
- // must begin at duration zero.
- case e_duration:
- {
- local_rep->WDToWhich = enumerator_toyear;
- local_rep->WDEndTime = intervals[wd_interval].end_duration;
- }
- break;
- case e_attained_age:
- {
- local_rep->WDToWhich = enumerator_toage;
- local_rep->WDEndTime =
- intervals[wd_interval].end_duration + IssueAge
- ;
- }
- break;
- case e_retirement:
- {
- local_rep->WDToWhich = enumerator_toret;
- }
- break;
- case e_maturity:
- {
- local_rep->WDToWhich = enumerator_toend;
- }
- break;
- case e_inception: // Fall through: illogical.
- case e_inforce: // Fall through: not implemented.
- default:
- {
- fatal_error()
- << "Case '"
- << intervals[wd_interval].end_mode
- << "' not found."
- << LMI_FLUSH
- ;
- }
- }
-
-//// ClearFlag(wfFullyCreated);
-//// Enabler();
-//// EnableTransferToSequenceControls(false);
-//// TXferPropertyPage::TransferData(tdSetData);
-//// wxSafeYield();
-//// EnableTransferToSequenceControls(true);
-//// Enabler();
-//// SetFlag(wfFullyCreated);
-}
-
-// TRICKY !! Use this with caution. It works only if all affected
-// controls come last in the transfer struct. The legacy GUI library
-// was not smart enough to skip through the transfer struct based on
-// dynamic transfer enablement.
-void Input::EnableTransferToSequenceControls(bool enable)
-{
-//// if(enable)
-//// {
-//// NEWLOAN ->EnableTransfer();
-//// WITHDRAWAL ->EnableTransfer();
-//// }
-//// else
-//// {
-//// NEWLOAN ->DisableTransfer();
-//// WITHDRAWAL ->DisableTransfer();
-//// }
-}
-
-#endif // 0
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5269] Expunge unused legacy code,
Greg Chicares <=