[lmi-commits] [4941] Rename certain member functions

[Greg Chicares]

Revision: 4941
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4941
Author:   chicares
Date:     2010-05-10 02:01:17 +0000 (Mon, 10 May 2010)
Log Message:
-----------
Rename certain member functions

Modified Paths:
--------------
    lmi/trunk/database.cpp
    lmi/trunk/database.hpp
    lmi/trunk/database_view_editor.cpp
    lmi/trunk/dbdict.cpp
    lmi/trunk/dbvalue.cpp
    lmi/trunk/dbvalue.hpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/input_test.cpp

Modified: lmi/trunk/database.cpp
===================================================================
--- lmi/trunk/database.cpp      2010-05-10 01:35:17 UTC (rev 4940)
+++ lmi/trunk/database.cpp      2010-05-10 02:01:17 UTC (rev 4941)
@@ -122,7 +122,7 @@
     initialize();
 
     // State of jurisdiction must not depend on itself.
-    database_entity const& StateEntry = GetEntry(DB_PremTaxState);
+    database_entity const& StateEntry = entity_from_key(DB_PremTaxState);
     if(1 != StateEntry.GetLength(5))
         {
         fatal_error()
@@ -175,14 +175,14 @@
 
 double product_database::Query(e_database_key k) const
 {
-    database_entity const& v = GetEntry(k);
+    database_entity const& v = entity_from_key(k);
     LMI_ASSERT(1 == v.GetLength());
     return *v[index_];
 }
 
 void product_database::Query(std::vector<double>& dst, e_database_key k) const
 {
-    database_entity const& v = GetEntry(k);
+    database_entity const& v = entity_from_key(k);
     double const*const z = v[index_];
     if(1 == v.GetLength())
         {
@@ -203,7 +203,7 @@
     LMI_ASSERT(0 < length_ && length_ <= methuselah);
 }
 
-database_entity const& product_database::GetEntry(e_database_key k) const
+database_entity const& product_database::entity_from_key(e_database_key k) 
const
 {
     return map_lookup(DBDictionary::instance().GetDictionary(), k);
 }

Modified: lmi/trunk/database.hpp
===================================================================
--- lmi/trunk/database.hpp      2010-05-10 01:35:17 UTC (rev 4940)
+++ lmi/trunk/database.hpp      2010-05-10 02:01:17 UTC (rev 4941)
@@ -77,7 +77,7 @@
     void initialize();
 
   public:  // for the nonce...
-    database_entity const& GetEntry(e_database_key) const;
+    database_entity const& entity_from_key(e_database_key) const;
   private: // ...for the nonce
 
     database_index  index_;

Modified: lmi/trunk/database_view_editor.cpp
===================================================================
--- lmi/trunk/database_view_editor.cpp  2010-05-10 01:35:17 UTC (rev 4940)
+++ lmi/trunk/database_view_editor.cpp  2010-05-10 02:01:17 UTC (rev 4941)
@@ -175,7 +175,7 @@
         return false;
         }
 
-    std::vector<int> const& axis_lengths = db_value_->GetAxisLengths();
+    std::vector<int> const& axis_lengths = db_value_->axis_lengths();
     return n < axis_lengths.size() && 1 < axis_lengths[n];
 }
 
@@ -209,7 +209,7 @@
         return;
         }
 
-    std::vector<int> axis_lengths = db_value_->GetAxisLengths();
+    std::vector<int> axis_lengths = db_value_->axis_lengths();
 
     axis_lengths[n] = varies ? maximum_database_dimensions()[n] : 1;
 
@@ -223,7 +223,7 @@
         return;
         }
 
-    std::vector<int> axis_lengths = db_value_->GetAxisLengths();
+    std::vector<int> axis_lengths = db_value_->axis_lengths();
 
     axis_lengths[eda_duration] = n;
 
@@ -246,7 +246,7 @@
         {
         wxBusyCursor busy;
 
-        db_value_->Reshape(axis_lengths);
+        db_value_->reshape(axis_lengths);
         SetModified();
         }
 }
@@ -258,7 +258,7 @@
         return 1U;
         }
 
-    return db_value_->GetAxisLengths()[eda_duration];
+    return db_value_->axis_lengths()[eda_duration];
 }
 
 bool DatabaseTableAdapter::CanChangeVariationWith(unsigned int n) const
@@ -268,7 +268,7 @@
         return false;
         }
 
-    return n < db_value_->GetAxisLengths().size();
+    return n < db_value_->axis_lengths().size();
 }
 
 void DatabaseTableAdapter::ConvertValue

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2010-05-10 01:35:17 UTC (rev 4940)
+++ lmi/trunk/dbdict.cpp        2010-05-10 02:01:17 UTC (rev 4941)
@@ -105,7 +105,7 @@
             {
             database_entity z;
             xml_serialize::from_xml(*i, z);
-            t[z.GetKey()] = z;
+            t[z.key()] = z;
             }
     }
 };
@@ -220,7 +220,7 @@
 
 void DBDictionary::Add(database_entity const& e)
 {
-    dictionary_[e.GetKey()] = e;
+    dictionary_[e.key()] = e;
 }
 
 /// Initialize all database entities to not-necessarily-plausible values.

Modified: lmi/trunk/dbvalue.cpp
===================================================================
--- lmi/trunk/dbvalue.cpp       2010-05-10 01:35:17 UTC (rev 4940)
+++ lmi/trunk/dbvalue.cpp       2010-05-10 02:01:17 UTC (rev 4941)
@@ -126,7 +126,7 @@
 {
 }
 
-void database_entity::Reshape(std::vector<int> const& dims)
+void database_entity::reshape(std::vector<int> const& dims)
 {
     LMI_ASSERT(e_number_of_axes == dims.size());
     // Create a new instance of this class having the same
@@ -141,7 +141,7 @@
             )
         );
     database_entity new_object
-        (GetKey()
+        (key()
         ,dims
         ,new_data
         );
@@ -302,7 +302,7 @@
     return &data_values_[z];
 }
 
-int database_entity::GetKey() const
+int database_entity::key() const
 {
     return key_;
 }
@@ -318,7 +318,7 @@
     return axis_lengths_.at(axis);
 }
 
-std::vector<int> const& database_entity::GetAxisLengths() const
+std::vector<int> const& database_entity::axis_lengths() const
 {
     return axis_lengths_;
 }

Modified: lmi/trunk/dbvalue.hpp
===================================================================
--- lmi/trunk/dbvalue.hpp       2010-05-10 01:35:17 UTC (rev 4940)
+++ lmi/trunk/dbvalue.hpp       2010-05-10 02:01:17 UTC (rev 4941)
@@ -108,15 +108,15 @@
         );
     ~database_entity();
 
-    void Reshape(std::vector<int> const& dims);
+    void reshape(std::vector<int> const& dims);
 
     double const* operator[](database_index const& idx) const;
     double&       operator[](std::vector<int> const& idx);
 
-    int GetKey()            const;
+    int key() const;
     int GetLength()         const;
     int GetLength(int axis) const;
-    std::vector<int> const& GetAxisLengths() const;
+    std::vector<int> const& axis_lengths() const;
 
     std::ostream& write(std::ostream&) const;
 

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2010-05-10 01:35:17 UTC (rev 4940)
+++ lmi/trunk/ihs_basicval.cpp  2010-05-10 02:01:17 UTC (rev 4941)
@@ -911,7 +911,7 @@
 
     z = db.Query(DB_PremTaxLoad);
 
-    database_entity const& premium_tax_loads = db.GetEntry(DB_PremTaxLoad);
+    database_entity const& premium_tax_loads = 
db.entity_from_key(DB_PremTaxLoad);
     if(!database_entity::VariesByState(premium_tax_loads))
         {
         return z;
@@ -921,7 +921,7 @@
     // it equals premium-tax rate--i.e. that premium tax is passed
     // through exactly--and that therefore tiered tax rates determine
     // loads where applicable and implemented.
-    database_entity const& premium_tax_rates = db.GetEntry(DB_PremTaxRate);
+    database_entity const& premium_tax_rates = 
db.entity_from_key(DB_PremTaxRate);
     if(!database_entity::Equivalent(premium_tax_loads, premium_tax_rates))
         {
         fatal_error()
@@ -967,7 +967,7 @@
     // TODO ?? Don't override parameters--instead, only detect and
     // report inconsistencies.
     //
-    database_entity const& premium_tax_loads = 
Database_->GetEntry(DB_PremTaxLoad);
+    database_entity const& premium_tax_loads = 
Database_->entity_from_key(DB_PremTaxLoad);
     if(!database_entity::VariesByState(premium_tax_loads))
         {
         return;

Modified: lmi/trunk/input_test.cpp
===================================================================
--- lmi/trunk/input_test.cpp    2010-05-10 01:35:17 UTC (rev 4940)
+++ lmi/trunk/input_test.cpp    2010-05-10 02:01:17 UTC (rev 4941)
@@ -145,14 +145,14 @@
 
     std::cout
         << "\n  Database speed tests..."
-        << "\n  initialize()      : " << 
TimeAnAliquot(boost::bind(&product_database::initialize,       &db))
-        << "\n  Query(vector)     : " << 
TimeAnAliquot(boost::bind(&product_database::Query,            &db, v, 
DB_EndtAge))
-        << "\n  Query(scalar)     : " << 
TimeAnAliquot(boost::bind(&product_database::Query,            &db, DB_EndtAge))
-        << "\n  GetEntry()        : " << 
TimeAnAliquot(boost::bind(&product_database::GetEntry,         &db, DB_EndtAge))
+        << "\n  initialize()      : " << 
TimeAnAliquot(boost::bind(&product_database::initialize,      &db))
+        << "\n  Query(vector)     : " << 
TimeAnAliquot(boost::bind(&product_database::Query,           &db, v, 
DB_EndtAge))
+        << "\n  Query(scalar)     : " << 
TimeAnAliquot(boost::bind(&product_database::Query,           &db, DB_EndtAge))
+        << "\n  entity_from_key() : " << 
TimeAnAliquot(boost::bind(&product_database::entity_from_key, &db, DB_EndtAge))
         << '\n'
         ;
 
-    database_entity const maturity = db.GetEntry(DB_EndtAge);
+    database_entity const maturity = db.entity_from_key(DB_EndtAge);
 
     // Maturity age must not vary by duration.
     DBDictionary::instance().dictionary_[DB_EndtAge] = database_entity
@@ -171,7 +171,7 @@
     DBDictionary::instance().dictionary_[1 + DB_LAST] = maturity;
     DBDictionary::instance().dictionary_.erase(DB_EndtAge);
     BOOST_TEST_THROW
-        (db.GetEntry(DB_EndtAge)
+        (db.entity_from_key(DB_EndtAge)
         ,std::runtime_error
         ,"map_lookup: key '258' not found."
         );