[lmi-commits] [4932] Remove old markup and questions answered in merge

[Greg Chicares]

Revision: 4932
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4932
Author:   chicares
Date:     2010-05-09 00:21:46 +0000 (Sun, 09 May 2010)
Log Message:
-----------
Remove old markup and questions answered in merge

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/database.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-05-08 23:28:53 UTC (rev 4931)
+++ lmi/trunk/ChangeLog 2010-05-09 00:21:46 UTC (rev 4932)
@@ -25600,3 +25600,26 @@
 faster to avoid calling GetEntry() repeatedly, especially now that
 GetEntry() dominates the time spent in Query().
 
+20100508T2300Z <address@hidden> [706]
+
+  Makefile.am
+  antediluvian_stubs.cpp
+  database.cpp
+  ihs_database.cpp
+  objects.make
+Document preparations for merging '*database.cpp'.
+
+20100508T2328Z <address@hidden> [706]
+
+  Makefile.am
+  database.cpp     [overwritten by renamed 'ihs_database.cpp']
+  ihs_database.cpp [renamed to 'database.cpp']
+  objects.make
+Merge two TUs, renaming 'ihs_database.cpp' to 'database.cpp'. This
+achieves the goal announced 20100506T0226Z.
+
+20100509T0021Z <address@hidden> [706]
+
+  database.cpp
+Remove old markup and questions answered in merge.
+

Modified: lmi/trunk/database.cpp
===================================================================
--- lmi/trunk/database.cpp      2010-05-08 23:28:53 UTC (rev 4931)
+++ lmi/trunk/database.cpp      2010-05-09 00:21:46 UTC (rev 4932)
@@ -21,10 +21,6 @@
 
 // $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
@@ -125,7 +121,7 @@
         }
     initialize();
 
-    // State of jurisdiction must not depend on itself
+    // State of jurisdiction must not depend on itself.
     database_entity const& StateEntry = GetEntry(DB_PremTaxState);
     if(1 != StateEntry.GetLength(5))
         {
@@ -134,8 +130,6 @@
             << " 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)))
         {
@@ -165,24 +159,20 @@
     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);
@@ -190,7 +180,6 @@
     LMI_ASSERT(0 < length_ && length_ <= methuselah);
 }
 
-//===========================================================================
 double product_database::Query(int k) const
 {
     database_entity const& v = GetEntry(k);
@@ -198,7 +187,6 @@
     return *v[index_];
 }
 
-//===========================================================================
 void product_database::Query(std::vector<double>& dst, int k) const
 {
     database_entity const& v = GetEntry(k);
@@ -215,7 +203,6 @@
         }
 }
 
-//===========================================================================
 database_entity const& product_database::GetEntry(int k) const
 {
     dict_map const& d = DBDictionary::instance().GetDictionary();