[lmi-commits] [4931] Merge two TUs, renaming 'ihs_database.cpp' to 'database.cpp'

[Greg Chicares]

Revision: 4931
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4931
Author:   chicares
Date:     2010-05-08 23:28:53 +0000 (Sat, 08 May 2010)
Log Message:
-----------
Merge two TUs, renaming 'ihs_database.cpp' to 'database.cpp'

Modified Paths:
--------------
    lmi/trunk/Makefile.am
    lmi/trunk/objects.make

Added Paths:
-----------
    lmi/trunk/database.cpp

Removed Paths:
-------------
    lmi/trunk/database.cpp
    lmi/trunk/ihs_database.cpp

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2010-05-08 23:00:20 UTC (rev 4930)
+++ lmi/trunk/Makefile.am       2010-05-08 23:28:53 UTC (rev 4931)
@@ -245,6 +245,7 @@
     crc32.cpp \
     custom_io_0.cpp \
     data_directory.cpp \
+    database.cpp \
     datum_base.cpp \
     datum_boolean.cpp \
     datum_string.cpp \
@@ -313,7 +314,6 @@
     accountvalue.cpp \
     antediluvian_stubs.cpp \
     basicvalues.cpp \
-    database.cpp \
     mortality_rates.cpp \
     solve.cpp \
     $(liblmi_common_sources)
@@ -333,7 +333,6 @@
     ihs_avsolve.cpp \
     ihs_avstrtgy.cpp \
     ihs_basicval.cpp \
-    ihs_database.cpp \
     ihs_irc7702.cpp \
     ihs_irc7702a.cpp \
     ihs_mortal.cpp \

Deleted: lmi/trunk/database.cpp
===================================================================
--- lmi/trunk/database.cpp      2010-05-08 23:00:20 UTC (rev 4930)
+++ lmi/trunk/database.cpp      2010-05-08 23:28:53 UTC (rev 4931)
@@ -1,146 +0,0 @@
-#include "ihs_database.cpp"
-#if 0
-// Product database.
-//
-// Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 
2010 Gregory W. Chicares.
-// [merged file will inherit 'ihs_database.cpp' copyright:]
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 
2008, 2009, 2010 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-#ifdef __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // __BORLANDC__
-
-#include "database.hpp"
-
-#include "alert.hpp"
-#include "assert_lmi.hpp"
-#include "dbdict.hpp"
-#include "dbnames.hpp"
-#include "dbvalue.hpp"
-#include "oecumenic_enumerations.hpp" // methuselah
-#include "yare_input.hpp"
-
-#include <algorithm> // std::min()
-
-//============================================================================
-product_database::product_database
-    (std::string const& // a_ProductName
-    ,mcenum_gender      a_Gender
-    ,mcenum_class       a_Class
-    ,mcenum_smoking     a_Smoker
-    ,int                a_IssueAge
-    ,mcenum_uw_basis    a_UWBasis
-    ,mcenum_state       a_State
-    )
-    :length_  (0) // Undesirable: set to a nonzero value by initialize().
-    ,Gender   (a_Gender)
-    ,Class    (a_Class)
-    ,Smoker   (a_Smoker)
-    ,IssueAge (a_IssueAge)
-    ,UWBasis  (a_UWBasis)
-    ,State    (a_State)
-{
-//    DBDictionary::instance().Init(a_ProductName);
-    DBDictionary::instance().InitAntediluvian();
-    initialize();
-}
-
-//============================================================================
-product_database::product_database(yare_input const& input)
-{
-    Gender      = input.Gender;
-    Class       = input.UnderwritingClass;
-    Smoker      = input.Smoking;
-    IssueAge    = input.IssueAge;
-    UWBasis     = input.GroupUnderwritingType;
-    State       = input.State;
-
-//    DBDictionary::instance().Init("Irrelevant in antediluvian branch.");
-    DBDictionary::instance().InitAntediluvian();
-    initialize();
-}
-
-//============================================================================
-product_database::~product_database()
-{
-}
-
-//============================================================================
-mcenum_state product_database::GetStateOfJurisdiction() const
-{
-    return State;
-}
-
-//============================================================================
-int product_database::length() const
-{
-    return length_;
-}
-
-//============================================================================
-void product_database::initialize()
-{
-    index_ = database_index(Gender, Class, Smoker, IssueAge, UWBasis, State);
-    length_ = static_cast<int>(Query(DB_EndtAge)) - IssueAge;
-    LMI_ASSERT(0 < length_ && length_ <= methuselah);
-}
-
-//===========================================================================
-double product_database::Query(int k) const
-{
-    database_entity const& v = GetEntry(k);
-    LMI_ASSERT(1 == v.GetLength());
-    return *v[index_];
-}
-
-//===========================================================================
-void product_database::Query(std::vector<double>& dst, int k) const
-{
-    database_entity const& v = GetEntry(k);
-    double const*const z = v[index_];
-    if(1 == v.GetLength())
-        {
-        dst.assign(length_, *z);
-        }
-    else
-        {
-        dst.reserve(length_);
-        dst.assign(z, z + std::min(length_, v.GetLength()));
-        dst.resize(length_, dst.back());
-        }
-}
-
-//===========================================================================
-database_entity const& product_database::GetEntry(int k) const
-{
-    dict_map const& d = DBDictionary::instance().GetDictionary();
-    LMI_ASSERT(d.size() == GetDBNames().size());
-    LMI_ASSERT(d.size() == DB_LAST);
-    LMI_ASSERT(0 == DB_FIRST);
-    LMI_ASSERT(DB_FIRST <= k && k < DB_LAST);
-    dict_map::const_iterator i = d.find(k);
-    LMI_ASSERT(i != d.end());
-    return i->second;
-}
-#endif // 0
-

Copied: lmi/trunk/database.cpp (from rev 4930, lmi/trunk/ihs_database.cpp)
===================================================================
--- lmi/trunk/database.cpp                              (rev 0)
+++ lmi/trunk/database.cpp      2010-05-08 23:28:53 UTC (rev 4931)
@@ -0,0 +1,230 @@
+// Product database.
+//
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 
2008, 2009, 2010 Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+// Should length_ be dynamically reset when IssueAge is?
+// Should State be dynamically reset?
+// Answer: 'no' to both. Axes are set upon construction and are immutable.
+
+#ifdef __BORLANDC__
+#   include "pchfile.hpp"
+#   pragma hdrstop
+#endif // __BORLANDC__
+
+#include "database.hpp"
+
+#include "alert.hpp"
+#include "assert_lmi.hpp"
+#include "data_directory.hpp"
+#include "dbdict.hpp"
+#include "dbnames.hpp"
+#include "dbvalue.hpp"
+#include "lmi.hpp"                    // is_antediluvian_fork()
+#include "oecumenic_enumerations.hpp" // methuselah
+#include "product_data.hpp"
+#include "yare_input.hpp"
+
+#include <algorithm> // std::min()
+
+/// Construct from essential input (product and axes).
+
+product_database::product_database
+    (std::string const& a_ProductName
+    ,mcenum_gender      a_Gender
+    ,mcenum_class       a_Class
+    ,mcenum_smoking     a_Smoker
+    ,int                a_IssueAge
+    ,mcenum_uw_basis    a_UWBasis
+    ,mcenum_state       a_State
+    )
+    :Gender   (a_Gender)
+    ,Class    (a_Class)
+    ,Smoker   (a_Smoker)
+    ,IssueAge (a_IssueAge)
+    ,UWBasis  (a_UWBasis)
+    ,State    (a_State)
+{
+    if(is_antediluvian_fork())
+        {
+        DBDictionary::instance().InitAntediluvian();
+        }
+    else
+        {
+        std::string 
filename(product_data(a_ProductName).datum("DatabaseFilename"));
+        DBDictionary::instance().Init(AddDataDir(filename));
+        }
+    initialize();
+}
+
+/// Construct from normal illustration input.
+///
+/// For the nonce, this ctor determines "state of jurisdiction"
+/// dynamically, and other code uses that state for multiple purposes.
+/// That is a mistake--two states are required:
+///   - FilingApprovalState: the state that must approve a policy-form
+///     filing (whether affirmatively or by deemer) before a contract
+///     can be written; and
+///   - PremiumTaxState: the state to which premium tax must be paid,
+///     which is crucial for products that pass premium tax through as
+///     a load.
+/// Those two states can differ, e.g. on cases with more than five
+/// hundred lives with a common (employer) issue state: the employer's
+/// state approves the policy form, but premium tax follows employee
+/// residence. See:
+///   http://www.naic.org/documents/frs_summit_presentations_03.pdf
+///   
http://www.naic.org/documents/committees_e_app_blanks_adopted_2007-42BWG_Modified.pdf
+///
+/// Soon, both states will be input fields, and these members will be
+/// expunged:
+///   GetStateOfJurisdiction()
+///   Gender
+///   Class
+///   Smoker
+///   IssueAge
+///   UWBasis
+///   State
+/// Database entity DB_PremTaxState will become obsolete, but must be
+/// retained (with a different name) for backward compatibility.
+
+product_database::product_database(yare_input const& input)
+{
+    Gender      = input.Gender;
+    Class       = input.UnderwritingClass;
+    Smoker      = input.Smoking;
+    IssueAge    = input.IssueAge;
+    UWBasis     = input.GroupUnderwritingType;
+    State       = mce_s_CT; // Dummy initialization.
+
+    if(is_antediluvian_fork())
+        {
+        DBDictionary::instance().InitAntediluvian();
+        }
+    else
+        {
+        std::string 
filename(product_data(input.ProductName).datum("DatabaseFilename"));
+        DBDictionary::instance().Init(AddDataDir(filename));
+        }
+    initialize();
+
+    // State of jurisdiction must not depend on itself
+    database_entity const& StateEntry = GetEntry(DB_PremTaxState);
+    if(1 != StateEntry.GetLength(5))
+        {
+        fatal_error()
+            << "Database invalid: circular dependency."
+            << " State of jurisdiction depends on itself."
+            << LMI_FLUSH
+            ;
+        // Should we test this in write()?
+        // Answer: 'no'. This code will soon be expunged.
+        }
+    switch(static_cast<int>(Query(DB_PremTaxState)))
+        {
+        case oe_ee_state:
+            {
+            State = input.State;
+            }
+            break;
+        case oe_er_state:
+            {
+            State = input.CorporationState;
+            }
+            break;
+        default:
+            {
+            fatal_error()
+                << "Cannot determine state of jurisdiction."
+                << LMI_FLUSH
+                ;
+            }
+            break;
+        }
+
+    // It may seem excessive to do this when only 'State' has changed,
+    // but it'll become unnecessary when we handle state of jurisdiction
+    // as an input field instead of trying to determine it here.
+    index_ = database_index(Gender, Class, Smoker, IssueAge, UWBasis, State);
+}
+
+//============================================================================
+product_database::~product_database()
+{
+}
+
+//============================================================================
+mcenum_state product_database::GetStateOfJurisdiction() const
+{
+    return State;
+}
+
+//============================================================================
+int product_database::length() const
+{
+    return length_;
+}
+
+//============================================================================
+void product_database::initialize()
+{
+    index_ = database_index(Gender, Class, Smoker, IssueAge, UWBasis, State);
+    length_ = static_cast<int>(Query(DB_EndtAge)) - IssueAge;
+    LMI_ASSERT(0 < length_ && length_ <= methuselah);
+}
+
+//===========================================================================
+double product_database::Query(int k) const
+{
+    database_entity const& v = GetEntry(k);
+    LMI_ASSERT(1 == v.GetLength());
+    return *v[index_];
+}
+
+//===========================================================================
+void product_database::Query(std::vector<double>& dst, int k) const
+{
+    database_entity const& v = GetEntry(k);
+    double const*const z = v[index_];
+    if(1 == v.GetLength())
+        {
+        dst.assign(length_, *z);
+        }
+    else
+        {
+        dst.reserve(length_);
+        dst.assign(z, z + std::min(length_, v.GetLength()));
+        dst.resize(length_, dst.back());
+        }
+}
+
+//===========================================================================
+database_entity const& product_database::GetEntry(int k) const
+{
+    dict_map const& d = DBDictionary::instance().GetDictionary();
+    LMI_ASSERT(d.size() == GetDBNames().size());
+    LMI_ASSERT(d.size() == DB_LAST);
+    LMI_ASSERT(0 == DB_FIRST);
+    LMI_ASSERT(DB_FIRST <= k && k < DB_LAST);
+    dict_map::const_iterator i = d.find(k);
+    LMI_ASSERT(i != d.end());
+    return i->second;
+}
+

Deleted: lmi/trunk/ihs_database.cpp
===================================================================
--- lmi/trunk/ihs_database.cpp  2010-05-08 23:00:20 UTC (rev 4930)
+++ lmi/trunk/ihs_database.cpp  2010-05-08 23:28:53 UTC (rev 4931)
@@ -1,230 +0,0 @@
-// Product database.
-//
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 
2008, 2009, 2010 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-// Should length_ be dynamically reset when IssueAge is?
-// Should State be dynamically reset?
-// Answer: 'no' to both. Axes are set upon construction and are immutable.
-
-#ifdef __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // __BORLANDC__
-
-#include "database.hpp"
-
-#include "alert.hpp"
-#include "assert_lmi.hpp"
-#include "data_directory.hpp"
-#include "dbdict.hpp"
-#include "dbnames.hpp"
-#include "dbvalue.hpp"
-#include "lmi.hpp"                    // is_antediluvian_fork()
-#include "oecumenic_enumerations.hpp" // methuselah
-#include "product_data.hpp"
-#include "yare_input.hpp"
-
-#include <algorithm> // std::min()
-
-/// Construct from essential input (product and axes).
-
-product_database::product_database
-    (std::string const& a_ProductName
-    ,mcenum_gender      a_Gender
-    ,mcenum_class       a_Class
-    ,mcenum_smoking     a_Smoker
-    ,int                a_IssueAge
-    ,mcenum_uw_basis    a_UWBasis
-    ,mcenum_state       a_State
-    )
-    :Gender   (a_Gender)
-    ,Class    (a_Class)
-    ,Smoker   (a_Smoker)
-    ,IssueAge (a_IssueAge)
-    ,UWBasis  (a_UWBasis)
-    ,State    (a_State)
-{
-    if(is_antediluvian_fork())
-        {
-        DBDictionary::instance().InitAntediluvian();
-        }
-    else
-        {
-        std::string 
filename(product_data(a_ProductName).datum("DatabaseFilename"));
-        DBDictionary::instance().Init(AddDataDir(filename));
-        }
-    initialize();
-}
-
-/// Construct from normal illustration input.
-///
-/// For the nonce, this ctor determines "state of jurisdiction"
-/// dynamically, and other code uses that state for multiple purposes.
-/// That is a mistake--two states are required:
-///   - FilingApprovalState: the state that must approve a policy-form
-///     filing (whether affirmatively or by deemer) before a contract
-///     can be written; and
-///   - PremiumTaxState: the state to which premium tax must be paid,
-///     which is crucial for products that pass premium tax through as
-///     a load.
-/// Those two states can differ, e.g. on cases with more than five
-/// hundred lives with a common (employer) issue state: the employer's
-/// state approves the policy form, but premium tax follows employee
-/// residence. See:
-///   http://www.naic.org/documents/frs_summit_presentations_03.pdf
-///   
http://www.naic.org/documents/committees_e_app_blanks_adopted_2007-42BWG_Modified.pdf
-///
-/// Soon, both states will be input fields, and these members will be
-/// expunged:
-///   GetStateOfJurisdiction()
-///   Gender
-///   Class
-///   Smoker
-///   IssueAge
-///   UWBasis
-///   State
-/// Database entity DB_PremTaxState will become obsolete, but must be
-/// retained (with a different name) for backward compatibility.
-
-product_database::product_database(yare_input const& input)
-{
-    Gender      = input.Gender;
-    Class       = input.UnderwritingClass;
-    Smoker      = input.Smoking;
-    IssueAge    = input.IssueAge;
-    UWBasis     = input.GroupUnderwritingType;
-    State       = mce_s_CT; // Dummy initialization.
-
-    if(is_antediluvian_fork())
-        {
-        DBDictionary::instance().InitAntediluvian();
-        }
-    else
-        {
-        std::string 
filename(product_data(input.ProductName).datum("DatabaseFilename"));
-        DBDictionary::instance().Init(AddDataDir(filename));
-        }
-    initialize();
-
-    // State of jurisdiction must not depend on itself
-    database_entity const& StateEntry = GetEntry(DB_PremTaxState);
-    if(1 != StateEntry.GetLength(5))
-        {
-        fatal_error()
-            << "Database invalid: circular dependency."
-            << " State of jurisdiction depends on itself."
-            << LMI_FLUSH
-            ;
-        // Should we test this in write()?
-        // Answer: 'no'. This code will soon be expunged.
-        }
-    switch(static_cast<int>(Query(DB_PremTaxState)))
-        {
-        case oe_ee_state:
-            {
-            State = input.State;
-            }
-            break;
-        case oe_er_state:
-            {
-            State = input.CorporationState;
-            }
-            break;
-        default:
-            {
-            fatal_error()
-                << "Cannot determine state of jurisdiction."
-                << LMI_FLUSH
-                ;
-            }
-            break;
-        }
-
-    // It may seem excessive to do this when only 'State' has changed,
-    // but it'll become unnecessary when we handle state of jurisdiction
-    // as an input field instead of trying to determine it here.
-    index_ = database_index(Gender, Class, Smoker, IssueAge, UWBasis, State);
-}
-
-//============================================================================
-product_database::~product_database()
-{
-}
-
-//============================================================================
-mcenum_state product_database::GetStateOfJurisdiction() const
-{
-    return State;
-}
-
-//============================================================================
-int product_database::length() const
-{
-    return length_;
-}
-
-//============================================================================
-void product_database::initialize()
-{
-    index_ = database_index(Gender, Class, Smoker, IssueAge, UWBasis, State);
-    length_ = static_cast<int>(Query(DB_EndtAge)) - IssueAge;
-    LMI_ASSERT(0 < length_ && length_ <= methuselah);
-}
-
-//===========================================================================
-double product_database::Query(int k) const
-{
-    database_entity const& v = GetEntry(k);
-    LMI_ASSERT(1 == v.GetLength());
-    return *v[index_];
-}
-
-//===========================================================================
-void product_database::Query(std::vector<double>& dst, int k) const
-{
-    database_entity const& v = GetEntry(k);
-    double const*const z = v[index_];
-    if(1 == v.GetLength())
-        {
-        dst.assign(length_, *z);
-        }
-    else
-        {
-        dst.reserve(length_);
-        dst.assign(z, z + std::min(length_, v.GetLength()));
-        dst.resize(length_, dst.back());
-        }
-}
-
-//===========================================================================
-database_entity const& product_database::GetEntry(int k) const
-{
-    dict_map const& d = DBDictionary::instance().GetDictionary();
-    LMI_ASSERT(d.size() == GetDBNames().size());
-    LMI_ASSERT(d.size() == DB_LAST);
-    LMI_ASSERT(0 == DB_FIRST);
-    LMI_ASSERT(DB_FIRST <= k && k < DB_LAST);
-    dict_map::const_iterator i = d.find(k);
-    LMI_ASSERT(i != d.end());
-    return i->second;
-}
-

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2010-05-08 23:00:20 UTC (rev 4930)
+++ lmi/trunk/objects.make      2010-05-08 23:28:53 UTC (rev 4931)
@@ -185,6 +185,7 @@
   crc32.o \
   custom_io_0.o \
   data_directory.o \
+  database.o \
   datum_base.o \
   datum_boolean.o \
   datum_string.o \
@@ -255,7 +256,6 @@
   accountvalue.o \
   antediluvian_stubs.o \
   basicvalues.o \
-  database.o \
   mortality_rates.o \
   solve.o \
 
@@ -274,7 +274,6 @@
   ihs_avsolve.o \
   ihs_avstrtgy.o \
   ihs_basicval.o \
-  ihs_database.o \
   ihs_irc7702.o \
   ihs_irc7702a.o \
   ihs_mortal.o \
@@ -374,6 +373,7 @@
   configurable_settings.o \
   crc32.o \
   data_directory.o \
+  database.o \
   datum_base.o \
   datum_string.o \
   dbdict.o \
@@ -386,7 +386,6 @@
   fund_data.o \
   global_settings.o \
   ihs_basicval.o \
-  ihs_database.o \
   ihs_mortal.o \
   input.o \
   input_harmonization.o \