[lmi-commits] [5022] Fix defect introduced 20050114T1947Z

[Greg Chicares]

Revision: 5022
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5022
Author:   chicares
Date:     2010-07-04 12:01:28 +0000 (Sun, 04 Jul 2010)
Log Message:
-----------
Fix defect introduced 20050114T1947Z

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/datum_sequence.cpp
    lmi/trunk/input_harmonization.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-07-03 22:51:38 UTC (rev 5021)
+++ lmi/trunk/ChangeLog 2010-07-04 12:01:28 UTC (rev 5022)
@@ -26244,3 +26244,21 @@
 Implement two specimen derived classes. For the moment, only a dummy
 implementation of allowed_keywords() is provided.
 
+20100703T2251Z <address@hidden> [697]
+
+  datum_sequence.cpp
+  datum_sequence.hpp
+  input.hpp
+  input_harmonization.cpp
+  input_realization.cpp
+  mec_input.hpp
+Refactor, exposing an ancient defect. See:
+  http://lists.nongnu.org/archive/html/lmi/2010-07/msg00006.html
+
+20100704T1201Z <address@hidden> [697]
+
+  datum_sequence.cpp
+  input_harmonization.cpp
+Fix defect introduced 20050114T1947Z, from an original file predating
+the lmi epoch, and noted 20100703T2251Z.
+

Modified: lmi/trunk/datum_sequence.cpp
===================================================================
--- lmi/trunk/datum_sequence.cpp        2010-07-03 22:51:38 UTC (rev 5021)
+++ lmi/trunk/datum_sequence.cpp        2010-07-04 12:01:28 UTC (rev 5022)
@@ -187,19 +187,6 @@
     std::map<std::string,std::string> permissible_keywords = all_keywords;
     permissible_keywords.erase("none");
 
-    bool payment_indeterminate =
-        (
-        false
-    // TODO ?? Further conditions to disallow improper input:
-    // need to compare corresponding years.
-    //  || specamt strategy is neither 'none' nor 'salary-based'
-        );
-
-    if(payment_indeterminate)
-        {
-        permissible_keywords.clear();
-        }
-
     return permissible_keywords;
 }
 

Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp   2010-07-03 22:51:38 UTC (rev 5021)
+++ lmi/trunk/input_harmonization.cpp   2010-07-04 12:01:28 UTC (rev 5022)
@@ -592,11 +592,24 @@
 // 'mce_pmt_table' strategy was selected in a scalar control--but
 // no such scalar control was ported. For payment strategy, lmi offers
 // only input sequences that are enabled by default.
+//
+// TODO ?? 'Payment' and 'CorporationPayment' should have certain payment
+// strategies conditionally blocked. See 'inhibit_premium_based_strategies'
+// and 'prem_indeterminate' above for possible conditions; an old note
+// suggested
+//   || specamt strategy is neither 'none' nor 'salary-based'
+// Ideally, some or all strategy keywords would be blocked, or
+// corresponding parts of the input-sequence editor would be disabled,
+// only at durations that exhibit an actual conflict: e.g., a premium
+// solve for the first ten years only shouldn't inhibit anything after
+// the tenth year.
+//
+// At any rate, keywords should not be blocked when the control is
+// disabled: see
+//   http://lists.nongnu.org/archive/html/lmi/2010-07/msg00006.html
 
-    Payment           .enable              (mce_solve_ee_prem != SolveType);
-    Payment           .block_keyword_values(mce_solve_ee_prem == SolveType);
-    CorporationPayment.enable              (mce_solve_er_prem != SolveType);
-    CorporationPayment.block_keyword_values(mce_solve_er_prem == SolveType);
+    Payment           .enable(mce_solve_ee_prem != SolveType);
+    CorporationPayment.enable(mce_solve_er_prem != SolveType);
 
     IndividualPaymentMode.allow_all(true);
     // TODO ?? Should the following be permitted? If so, then either