[lmi-commits] [5592] Note a defect; expunge redundant or mistaken comments

[Greg Chicares]

Revision: 5592
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5592
Author:   chicares
Date:     2012-11-11 13:41:15 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
Note a defect; expunge redundant or mistaken comments

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ihs_avstrtgy.cpp
    lmi/trunk/mortality_rates_fetch.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-11-10 13:33:25 UTC (rev 5591)
+++ lmi/trunk/ChangeLog 2012-11-11 13:41:15 UTC (rev 5592)
@@ -30862,3 +30862,39 @@
   input_harmonization.cpp
 Improve documentation; remove some obsolete commented-out code.
 
+20121108T1253Z <address@hidden> [559]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+  oecumenic_enumerations.hpp
+Eradicate dead code.
+
+20121109T1311Z <address@hidden> [559]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+  input_harmonization.cpp
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+  ledger_xml_io.cpp
+Eradicate dead code.
+
+20121110T1333Z <address@hidden> [559]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+  ihs_basicval.cpp
+Rename certain database entities.
+
+20121111T1341Z <address@hidden> [556]
+
+  ihs_avstrtgy.cpp
+  mortality_rates_fetch.cpp
+Note a defect; expunge redundant or mistaken comments.
+

Modified: lmi/trunk/ihs_avstrtgy.cpp
===================================================================
--- lmi/trunk/ihs_avstrtgy.cpp  2012-11-10 13:33:25 UTC (rev 5591)
+++ lmi/trunk/ihs_avstrtgy.cpp  2012-11-11 13:41:15 UTC (rev 5592)
@@ -224,6 +224,11 @@
             }
         case mce_pmt_table:
             {
+// TODO ?? This assumes that the group term proxy rates given by
+// TableYRates() are monthly. They should instead be annual, so that
+// any other qx table can be substituted--for example, an experience
+// table from the SOA database, as DBDictionary::WriteSampleDBFile()
+// specifies.
             return
                   ActualSpecAmt
                 * MortalityRates_->TableYRates()[Year]

Modified: lmi/trunk/mortality_rates_fetch.cpp
===================================================================
--- lmi/trunk/mortality_rates_fetch.cpp 2012-11-10 13:33:25 UTC (rev 5591)
+++ lmi/trunk/mortality_rates_fetch.cpp 2012-11-11 13:41:15 UTC (rev 5592)
@@ -87,45 +87,27 @@
 // temporarily in some other manner, e.g. using a handle-body idiom?
 
 // TODO ?? These are delicate: they get modified downstream.
-    MonthlyGuaranteedCoiRates_   = basic_values.GetGuarCOIRates();
-    MonthlyCurrentCoiRatesBand0_ = basic_values.GetCurrCOIRates0();
-    MonthlyCurrentCoiRatesBand1_ = basic_values.GetCurrCOIRates1();
-    MonthlyCurrentCoiRatesBand2_ = basic_values.GetCurrCOIRates2();
+    MonthlyGuaranteedCoiRates_     = basic_values.GetGuarCOIRates();
+    MonthlyCurrentCoiRatesBand0_   = basic_values.GetCurrCOIRates0();
+    MonthlyCurrentCoiRatesBand1_   = basic_values.GetCurrCOIRates1();
+    MonthlyCurrentCoiRatesBand2_   = basic_values.GetCurrCOIRates2();
 
 // TODO ?? These are delicate: they are needed only conditionally.
     MonthlyGuaranteedTermCoiRates_ = basic_values.GetGuaranteedTermRates();
     MonthlyCurrentTermCoiRates_    = basic_values.GetCurrentTermRates();
-    AdbRates_                   = basic_values.GetAdbRates();
-    WpRates_                    = basic_values.GetWpRates();
-    ChildRiderRates_            = basic_values.GetChildRiderRates();
-    GuaranteedSpouseRiderRates_ = basic_values.GetGuaranteedSpouseRiderRates();
-    CurrentSpouseRiderRates_    = basic_values.GetCurrentSpouseRiderRates();
-    TargetPremiumRates_         = basic_values.GetTgtPremRates();
+    AdbRates_                      = basic_values.GetAdbRates();
+    WpRates_                       = basic_values.GetWpRates();
+    ChildRiderRates_               = basic_values.GetChildRiderRates();
+    GuaranteedSpouseRiderRates_    = 
basic_values.GetGuaranteedSpouseRiderRates();
+    CurrentSpouseRiderRates_       = basic_values.GetCurrentSpouseRiderRates();
+    TargetPremiumRates_            = basic_values.GetTgtPremRates();
 
-    // TODO ?? Why have these here, since they're already in the
-    // basic-values class? Same question for 'TableYRates_' too.
+    Irc7702Q_                      = basic_values.GetIRC7702Rates();
+    TableYRates_                   = basic_values.GetTableYRates();
+    PartialMortalityQ_             = basic_values.Get83GamRates();
+    CvatCorridorFactors_           = basic_values.GetCvatCorridorFactors();
+    SevenPayRates_                 = basic_values.GetTAMRA7PayRates();
 
-    Irc7702Q_ = basic_values.GetIRC7702Rates();
-    TableYRates_ = basic_values.GetTableYRates();
-// TODO ?? 83 GAM and table Y should instead be something like
-//   term cost table
-//   partial mortality table
-// should both permit a choice from among numerous and tables.
-// We could offer the whole SOA database, but it lacks table Y,
-// and some choices would be inappropriate (e.g. lapse factors).
-
-// TODO ?? Is this correct or not?
-/*
-    for(int j = 0; j < Length_; j++)
-        {
-        TableYRates_[j] *= 12.0;  // stored as monthly
-        }
-*/
-
-    PartialMortalityQ_   = basic_values.Get83GamRates();
-    CvatCorridorFactors_ = basic_values.GetCvatCorridorFactors();
-    SevenPayRates_       = basic_values.GetTAMRA7PayRates();
-
     std::transform
         (SubstdTblMult_.begin()
         ,SubstdTblMult_.end()
@@ -133,8 +115,5 @@
         ,SubstdTblMult_.begin()
         ,std::multiplies<double>()
         );
-
-// TODO ?? Move this up here?
-//    CvatNspRates_;
 }