[lmi-commits] [4823] Rename class 'TProductData' to 'product_data'

[Greg Chicares]

Revision: 4823
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4823
Author:   chicares
Date:     2010-04-01 03:00:51 +0000 (Thu, 01 Apr 2010)
Log Message:
-----------
Rename class 'TProductData' to 'product_data'

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/basic_values.hpp
    lmi/trunk/generate_product_files.cpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/ihs_database.cpp
    lmi/trunk/input_realization.cpp
    lmi/trunk/mec_server.cpp
    lmi/trunk/my_prod.cpp
    lmi/trunk/policy_document.hpp
    lmi/trunk/product_data.cpp
    lmi/trunk/product_data.hpp
    lmi/trunk/product_file_test.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/ChangeLog 2010-04-01 03:00:51 UTC (rev 4823)
@@ -24714,3 +24714,18 @@
   product_file_test.cpp
 Rename 'ihs_proddata.?pp' to 'product_data.?pp'.
 
+20100401T0300Z <address@hidden> [762]
+
+  basic_values.hpp
+  generate_product_files.cpp
+  ihs_basicval.cpp
+  ihs_database.cpp
+  input_realization.cpp
+  mec_server.cpp
+  my_prod.cpp
+  policy_document.hpp
+  product_data.cpp
+  product_data.hpp
+  product_file_test.cpp
+Rename class 'TProductData' to 'product_data'.
+

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/basic_values.hpp  2010-04-01 03:00:51 UTC (rev 4823)
@@ -59,9 +59,9 @@
 class MortalityRates;
 class SurrChgRates;
 class TDatabase;
-class TProductData;
 class death_benefits;
 class modal_outlay;
+class product_data;
 class rounding_rules;
 class stratified_charges;
 
@@ -117,7 +117,7 @@
 
     boost::shared_ptr<Input const>        Input_;
     yare_input                            yare_input_;
-    boost::shared_ptr<TProductData>       ProductData_;
+    boost::shared_ptr<product_data>       ProductData_;
     boost::shared_ptr<TDatabase>          Database_;
     boost::shared_ptr<FundData>           FundData_;
     boost::shared_ptr<rounding_rules>     RoundingRules_;

Modified: lmi/trunk/generate_product_files.cpp
===================================================================
--- lmi/trunk/generate_product_files.cpp        2010-04-01 01:10:20 UTC (rev 
4822)
+++ lmi/trunk/generate_product_files.cpp        2010-04-01 03:00:51 UTC (rev 
4823)
@@ -41,14 +41,14 @@
     std::cout << "Generating product files." << std::endl;
 
     DBDictionary::instance() .WriteSampleDBFile                  ();
-    TProductData            ::WritePolFiles                      ();
+    product_data            ::WritePolFiles                      ();
     FundData                ::WriteFundFiles                     ();
     StreamableRoundingRules ::WriteRndFiles                      ();
     stratified_charges      ::write_stratified_files             ();
 
     DBDictionary::instance() .WriteProprietaryDBFiles            ();
     FundData                ::WriteProprietaryFundFiles          ();
-    TProductData            ::WriteProprietaryPolFiles           ();
+    product_data            ::WriteProprietaryPolFiles           ();
     StreamableRoundingRules ::WriteProprietaryRndFiles           ();
     stratified_charges      ::write_proprietary_stratified_files ();
 

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/ihs_basicval.cpp  2010-04-01 03:00:51 UTC (rev 4823)
@@ -169,7 +169,7 @@
 //============================================================================
 void BasicValues::Init()
 {
-    ProductData_.reset(new TProductData(yare_input_.ProductName));
+    ProductData_.reset(new product_data(yare_input_.ProductName));
     // bind to policy form
     //      one filename that brings in all the rest incl database?
     // controls as ctor arg?
@@ -285,7 +285,7 @@
 // TODO ??  Not for general use--use for GPT server only, for now--refactor 
later
 void BasicValues::GPTServerInit()
 {
-    ProductData_.reset(new TProductData(yare_input_.ProductName));
+    ProductData_.reset(new product_data(yare_input_.ProductName));
     Database_.reset(new TDatabase(yare_input_));
 
     IssueAge = yare_input_.IssueAge;

Modified: lmi/trunk/ihs_database.cpp
===================================================================
--- lmi/trunk/ihs_database.cpp  2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/ihs_database.cpp  2010-04-01 03:00:51 UTC (rev 4823)
@@ -58,10 +58,7 @@
     ,mcenum_uw_basis    a_UWBasis
     ,mcenum_state       a_State
     )
-    :Filename   (AddDataDir
-                    (TProductData(a_ProductName).GetDatabaseFilename()
-                    )
-                )
+    :Filename (AddDataDir(product_data(a_ProductName).GetDatabaseFilename()))
     ,Gender   (a_Gender)
     ,Class    (a_Class)
     ,Smoker   (a_Smoker)
@@ -75,10 +72,7 @@
 
 //============================================================================
 TDatabase::TDatabase(yare_input const& input)
-    :Filename
-        (AddDataDir
-            (TProductData(input.ProductName).GetDatabaseFilename())
-        )
+    
:Filename(AddDataDir(product_data(input.ProductName).GetDatabaseFilename()))
 {
 // GET RID OF Gender, Class, Smoker, etc.
     Gender      = input.Gender;

Modified: lmi/trunk/input_realization.cpp
===================================================================
--- lmi/trunk/input_realization.cpp     2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/input_realization.cpp     2010-04-01 03:00:51 UTC (rev 4823)
@@ -993,7 +993,7 @@
 // #include "product_data.hpp"   // Product data, needed to access rounding 
rules.
 //
 //        term_spec_amt = StreamableRoundingRules
-//            (AddDataDir(TProductData(ProductName).GetRoundingFilename())
+//            (AddDataDir(product_data(ProductName).GetRoundingFilename())
 //            ).get_rounding_rules().round_specamt()(term_spec_amt)
 //            ;
 //

Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp    2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/mec_server.cpp    2010-04-01 03:00:51 UTC (rev 4823)
@@ -105,7 +105,7 @@
     double                      Payment                      = 
exact_cast<tnr_nonnegative_double  >(input["Payment"                     
])->value();
     double                      BenefitAmount                = 
exact_cast<tnr_nonnegative_double  >(input["BenefitAmount"               
])->value();
 
-    TProductData product_data(ProductName);
+    product_data product_filenames(ProductName);
 
     TDatabase database
         (ProductName
@@ -117,7 +117,7 @@
         ,StateOfJurisdiction
         );
 
-    stratified_charges stratified(AddDataDir(product_data.GetTierFilename()));
+    stratified_charges 
stratified(AddDataDir(product_filenames.GetTierFilename()));
 
     // SOMEDAY !! Ideally these would be in the GUI (or read from product 
files).
     round_to<double> const RoundNonMecPrem(2, r_downward);
@@ -129,7 +129,7 @@
     if(oe_modal_table == target_premium_type)
         {
         TargetPremiumRates = actuarial_table_rates
-            (AddDataDir(product_data.GetTgtPremFilename())
+            (AddDataDir(product_filenames.GetTgtPremFilename())
             ,static_cast<long int>(database.Query(DB_TgtPremTable))
             ,input.issue_age()
             ,input.years_to_maturity()
@@ -141,7 +141,7 @@
         }
 
     std::vector<double> const CvatCorridorFactors = actuarial_table_rates
-        (AddDataDir(product_data.GetCorridorFilename())
+        (AddDataDir(product_filenames.GetCorridorFilename())
         ,static_cast<long int>(database.Query(DB_CorridorTable))
         ,input.issue_age()
         ,input.years_to_maturity()
@@ -156,14 +156,14 @@
     tabular_Ax.push_back(1.0);
 
     std::vector<double> const tabular_7Px = actuarial_table_rates
-        (AddDataDir(product_data.GetTAMRA7PayFilename())
+        (AddDataDir(product_filenames.GetTAMRA7PayFilename())
         ,static_cast<long int>(database.Query(DB_TAMRA7PayTable))
         ,input.issue_age()
         ,input.years_to_maturity()
         );
 
     std::vector<double> Mly7702qc = actuarial_table_rates
-        (AddDataDir(product_data.GetIRC7702Filename())
+        (AddDataDir(product_filenames.GetIRC7702Filename())
         ,static_cast<long int>(database.Query(DB_IRC7702QTable))
         ,input.issue_age()
         ,input.years_to_maturity()

Modified: lmi/trunk/my_prod.cpp
===================================================================
--- lmi/trunk/my_prod.cpp       2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/my_prod.cpp       2010-04-01 03:00:51 UTC (rev 4823)
@@ -43,14 +43,14 @@
 
 #include "data_directory.hpp"
 
-// TODO ?? It would be better to call TProductData::WritePolFiles()
+// TODO ?? It would be better to call product_data::WritePolFiles()
 // here than to duplicate (more or less) its contents. However, it
 // would be better still to use xml for all product data files.
 
 //============================================================================
-void TProductData::WriteProprietaryPolFiles()
+void product_data::WriteProprietaryPolFiles()
 {
-    TProductData foo;
+    product_data foo;
 
     // Generic data.
     foo.CorridorFilename               = "sample";

Modified: lmi/trunk/policy_document.hpp
===================================================================
--- lmi/trunk/policy_document.hpp       2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/policy_document.hpp       2010-04-01 03:00:51 UTC (rev 4823)
@@ -53,7 +53,7 @@
 
     PolicyView& PredominantView() const;
 
-    TProductData product_data_;
+    product_data product_data_;
 
     values_type values_;
 

Modified: lmi/trunk/product_data.cpp
===================================================================
--- lmi/trunk/product_data.cpp  2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/product_data.cpp  2010-04-01 03:00:51 UTC (rev 4823)
@@ -50,23 +50,23 @@
 #include <string>
 
 //============================================================================
-TProductData::TProductData()
+product_data::product_data()
 {
 }
 
 //============================================================================
-TProductData::~TProductData()
+product_data::~product_data()
 {
 }
 
 //============================================================================
-TProductData::TProductData(std::string const& a_Filename)
+product_data::product_data(std::string const& a_Filename)
 {
     Init(a_Filename);
 }
 
 //============================================================================
-void TProductData::Init(std::string const& a_Filename)
+void product_data::Init(std::string const& a_Filename)
 {
     fs::path path(a_Filename);
     LMI_ASSERT(a_Filename == path.leaf());
@@ -83,7 +83,7 @@
 } // Unnamed namespace.
 
 //============================================================================
-void TProductData::Read(std::string const& a_Filename)
+void product_data::Read(std::string const& a_Filename)
 {
     if(access(a_Filename.c_str(), R_OK))
         {
@@ -205,7 +205,7 @@
 }
 
 //============================================================================
-void TProductData::Write(std::string const& a_Filename) const
+void product_data::Write(std::string const& a_Filename) const
 {
     xml_lmi::xml_document document(xml_root_name());
     xml::element& root = document.root_node();
@@ -327,9 +327,9 @@
 }
 
 //============================================================================
-void TProductData::WritePolFiles()
+void product_data::WritePolFiles()
 {
-    TProductData foo;
+    product_data foo;
 
     foo.CorridorFilename               = "sample";
     foo.CurrCOIFilename                = "qx_cso";

Modified: lmi/trunk/product_data.hpp
===================================================================
--- lmi/trunk/product_data.hpp  2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/product_data.hpp  2010-04-01 03:00:51 UTC (rev 4823)
@@ -32,14 +32,14 @@
 
 // Filenames and other free-form offline data that vary by product.
 
-class LMI_SO TProductData
+class LMI_SO product_data
 {
     friend class PolicyDocument;
     friend class PolicyView;
 
   public:
-    explicit TProductData(std::string const& a_Filename);
-    ~TProductData();
+    explicit product_data(std::string const& a_Filename);
+    ~product_data();
 
     static void WritePolFiles();
     static void WriteProprietaryPolFiles();
@@ -147,7 +147,7 @@
     std::string const& GetMonthlyChargesPaymentFootnote () const {return 
MonthlyChargesPaymentFootnote ;}
 
   private:
-    TProductData();
+    product_data();
 
     void Init(std::string const& a_Filename);
     void Read(std::string const& a_Filename);

Modified: lmi/trunk/product_file_test.cpp
===================================================================
--- lmi/trunk/product_file_test.cpp     2010-04-01 01:10:20 UTC (rev 4822)
+++ lmi/trunk/product_file_test.cpp     2010-04-01 03:00:51 UTC (rev 4823)
@@ -71,13 +71,13 @@
 void product_file_test::write_all_files()
 {
     DBDictionary::instance() .WriteSampleDBFile      ();
-    TProductData            ::WritePolFiles          ();
+    product_data            ::WritePolFiles          ();
     FundData                ::WriteFundFiles         ();
     StreamableRoundingRules ::WriteRndFiles          ();
     stratified_charges      ::write_stratified_files ();
 
     policy_filename_     = "sample";
-    TProductData p(policy_filename_);
+    product_data p(policy_filename_);
     database_filename_   = p.GetDatabaseFilename ();
     fund_filename_       = p.GetFundFilename     ();
     rounding_filename_   = p.GetRoundingFilename ();
@@ -97,7 +97,7 @@
 
 void product_file_test::read_policy_file()
 {
-    TProductData p(policy_filename_);
+    product_data p(policy_filename_);
 }
 
 void product_file_test::read_rounding_file()