[lmi-commits] [5932] Expunge some idiosyncratic code that is no longer useful

[Greg Chicares]

Revision: 5932
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5932
Author:   chicares
Date:     2014-07-20 14:34:13 +0000 (Sun, 20 Jul 2014)
Log Message:
-----------
Expunge some idiosyncratic code that is no longer useful

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/input_xml_io.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-07-18 21:44:35 UTC (rev 5931)
+++ lmi/trunk/ChangeLog 2014-07-20 14:34:13 UTC (rev 5932)
@@ -34026,3 +34026,14 @@
   objects.make
 Eradicate obsolete class Server7702Input.
 
+20140718T2144Z <address@hidden> [534]
+
+  ihs_basicval.cpp
+Restrict an old exception class to obsolescent code.
+
+20140720T1434Z <address@hidden> [534]
+
+  ihs_basicval.cpp
+  input_xml_io.cpp
+Expunge some idiosyncratic code that is no longer useful.
+

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2014-07-18 21:44:35 UTC (rev 5931)
+++ lmi/trunk/ihs_basicval.cpp  2014-07-20 14:34:13 UTC (rev 5932)
@@ -31,7 +31,6 @@
 #include "alert.hpp"
 #include "assert_lmi.hpp"
 #include "calendar_date.hpp"
-#include "configurable_settings.hpp"
 #include "contains.hpp"
 #include "data_directory.hpp"
 #include "database.hpp"
@@ -48,7 +47,6 @@
 #include "loads.hpp"
 #include "math_functors.hpp"
 #include "mc_enum_types_aux.hpp"        // mc_str()
-#include "miscellany.hpp"               // ios_out_trunc_binary()
 #include "mortality_rates.hpp"
 #include "outlay.hpp"
 #include "premium_tax.hpp"
@@ -61,10 +59,8 @@
 #include <algorithm>
 #include <cmath>                        // std::pow()
 #include <cstring>                      // std::strlen(), std::strncmp()
-#include <fstream>
 #include <limits>
 #include <numeric>
-#include <sstream>
 #include <stdexcept>
 
 //============================================================================
@@ -483,38 +479,6 @@
         ,MlyDcvqc.begin()
         ,round_coi_rate()
         );
-    if(contains(yare_input_.Comments, "idiosyncrasy_dcvq"))
-        {
-        std::ostringstream oss;
-        oss
-            << yare_input_.ProductName
-            << '_'
-            << mc_str(yare_input_.Gender)
-            << '_'
-            << mc_str(yare_input_.Smoking)
-            << ".dcvq"
-            << configurable_settings::instance().spreadsheet_file_extension()
-            ;
-        std::ofstream os(oss.str().c_str(), ios_out_trunc_binary());
-        int const minimum_age  = 
static_cast<int>(Database_->Query(DB_MinIssAge  ));
-        int const maturity_age = 
static_cast<int>(Database_->Query(DB_MaturityAge));
-        if(minimum_age != yare_input_.IssueAge)
-            {
-            warning()
-                << "Issue age is "
-                << yare_input_.IssueAge
-                << ", but the minimum is "
-                << minimum_age
-                << ". Use the minimum instead."
-                << LMI_FLUSH
-                ;
-            }
-        for(int j = 0; j < maturity_age - minimum_age; ++j)
-            {
-            std::string s = value_cast<std::string>(MlyDcvqc[j]);
-            os << j + minimum_age << '\t' << s << '\n';
-            }
-        }
 
     // Monthly guar net int for 7702, with 4 or 6% min, is
     //   greater of {4%, 6%} and annual guar int rate

Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp  2014-07-18 21:44:35 UTC (rev 5931)
+++ lmi/trunk/input_xml_io.cpp  2014-07-20 14:34:13 UTC (rev 5932)
@@ -454,18 +454,18 @@
                     ;
                 }
 
-            bool swap = contains(Comments.value(), 
"idiosyncrasy_swap_old_tax_state");
-            mce_state state;
             switch(static_cast<int>(db.Query(DB_PremTaxState)))
                 {
                 case oe_ee_state:
                     {
-                    state = swap ? CorporationState : State;
+                    StateOfJurisdiction = State;
+                    PremiumTaxState     = State;
                     }
                     break;
                 case oe_er_state:
                     {
-                    state = swap ? State : CorporationState;
+                    StateOfJurisdiction = CorporationState;
+                    PremiumTaxState     = CorporationState;
                     }
                     break;
                 default:
@@ -477,8 +477,6 @@
                     }
                     break;
                 }
-            StateOfJurisdiction = state;
-            PremiumTaxState     = state;
             }
         }