[lmi-commits] [4803] Anticipate new product-file names

[Greg Chicares]

Revision: 4803
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4803
Author:   chicares
Date:     2010-03-22 16:26:27 +0000 (Mon, 22 Mar 2010)
Log Message:
-----------
Anticipate new product-file names

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ce_product_name.hpp
    lmi/trunk/dbnames.hpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/my_db.cpp
    lmi/trunk/my_fund.cpp
    lmi/trunk/my_tier.cpp
    lmi/trunk/product_names.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-03-22 13:26:38 UTC (rev 4802)
+++ lmi/trunk/ChangeLog 2010-03-22 16:26:27 UTC (rev 4803)
@@ -24576,3 +24576,14 @@
 Add a unit test to measure speed of reading product files, emulating
 'progress_meter_test.cpp'.
 
+20100322T1626Z <address@hidden> [761]
+
+  ce_product_name.hpp
+  dbnames.hpp
+  ihs_basicval.cpp
+  my_db.cpp
+  my_fund.cpp
+  my_tier.cpp
+  product_names.hpp
+Anticipate new product-file names.
+

Modified: lmi/trunk/ce_product_name.hpp
===================================================================
--- lmi/trunk/ce_product_name.hpp       2010-03-22 13:26:38 UTC (rev 4802)
+++ lmi/trunk/ce_product_name.hpp       2010-03-22 16:26:27 UTC (rev 4803)
@@ -43,7 +43,7 @@
 /// Because there is no enum to map to, there is no 'm' for "Mapped"
 /// at the beginning of the class's or file's name.
 ///
-/// Valid values are the base names of policy ('.pol') files found
+/// Valid values are the base names of '.policy' product files found
 /// in the (configurable) data directory. They are read only once and
 /// cached, not because of any measured improvement in run time, but
 /// in order to keep the type from mutating with unknown consequences.

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2010-03-22 13:26:38 UTC (rev 4802)
+++ lmi/trunk/dbnames.hpp       2010-03-22 16:26:27 UTC (rev 4803)
@@ -30,6 +30,8 @@
 
 #include <vector>
 
+/// See 'dbnames.xpp' for the definition of each entity.
+
 enum DatabaseNames
     {DB_FIRST
 
@@ -42,8 +44,8 @@
         ,DB_AllowFullUW
         ,DB_AllowSimpUW
         ,DB_AllowGuarUW
-        ,DB_SmokeOrTobacco       // DATABASE !! Move to '.pol'
-        ,DB_PrefOrSelect         // DATABASE !! Move to '.pol'
+        ,DB_SmokeOrTobacco       // DATABASE !! Move to '.policy'
+        ,DB_PrefOrSelect         // DATABASE !! Move to '.policy'
         ,DB_AllowPreferredClass
         ,DB_AllowUltraPrefClass
 
@@ -432,14 +434,7 @@
         ,DB_PrimaryHurdle
         ,DB_SecondaryHurdle
 
-    ,DB_LAST    // Adding a new item? Insert directly above *only*.
-    // That way, old databases remain compatible with new code, and any
-    // error in using a new item will occur when the new item is used
-    // instead of where a renumbered old item is used--that should make
-    // such errors much easier to track down and repair. We can re-sort
-    // additions into categories when preparing a major release.
-    //
-    // See 'dbnames.xpp' for the definition of each entity.
+    ,DB_LAST
     };
 
 struct db_names

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2010-03-22 13:26:38 UTC (rev 4802)
+++ lmi/trunk/ihs_basicval.cpp  2010-03-22 16:26:27 UTC (rev 4803)
@@ -397,7 +397,7 @@
             {
             // Allow hardcoded number of funds < Funds.GetNumberOfFunds
             // so an accurate fund average can be calculated (based
-            // on the funds in the *.fnd file), even though the inputs
+            // on the funds in the '.funds' file), even though the inputs
             // class may not accommodate that many funds. If j falls
             // outside the range of yare_input_.FundAllocations, use a
             // weight of zero.
@@ -409,11 +409,11 @@
         else if(j < static_cast<int>(yare_input_.FundAllocations.size()))
             {
             // TODO ?? Can this be correct? Shouldn't we be looking to
-            // the .fnd file rather than the input class?
+            // the '.funds' file rather than the input class?
             //
             // Allow hardcoded number of funds < Funds.GetNumberOfFunds
             // so an accurate fund average can be calculated (based
-            // on the funds in the *.fnd file), even though the inputs
+            // on the funds in the '.funds' file), even though the inputs
             // class may not accommodate that many funds. If j falls
             // outside the range of yare_input_.FundAllocations, use a
             // weight of zero.

Modified: lmi/trunk/my_db.cpp
===================================================================
--- lmi/trunk/my_db.cpp 2010-03-22 13:26:38 UTC (rev 4802)
+++ lmi/trunk/my_db.cpp 2010-03-22 16:26:27 UTC (rev 4803)
@@ -53,7 +53,7 @@
     Add(TDBValue(DB_GuarPolFee, 10.00));
     // etc.
 // Not necessary for 'sample' product only, because it's built in.
-//  WriteDB(AddDataDir("sample.db4"));
+//  WriteDB(AddDataDir("sample.database"));
   }
   // Another policy form....
 }

Modified: lmi/trunk/my_fund.cpp
===================================================================
--- lmi/trunk/my_fund.cpp       2010-03-22 13:26:38 UTC (rev 4802)
+++ lmi/trunk/my_fund.cpp       2010-03-22 16:26:27 UTC (rev 4803)
@@ -50,14 +50,14 @@
     // Sample product.
     FundData foo;
 // Not necessary for 'sample' product only, because it's built in.
-//    foo->Write(AddDataDir("sample.fnd"));
+//    foo->Write(AddDataDir("sample.funds"));
     }
 #if 0 // Template for other products.
     {
     // Another product.
     FundData foo;
     foo.FundInfo_.push_back(FundInfo(70, "Short Name", "Long Fund Name"));
-    foo.Write(AddDataDir("another_product.fnd"));
+    foo.Write(AddDataDir("another_product.funds"));
     }
 #endif // 0
 }

Modified: lmi/trunk/my_tier.cpp
===================================================================
--- lmi/trunk/my_tier.cpp       2010-03-22 13:26:38 UTC (rev 4802)
+++ lmi/trunk/my_tier.cpp       2010-03-22 16:26:27 UTC (rev 4803)
@@ -56,7 +56,7 @@
     foo.raw_entity(e_curr_sepacct_load_tiered_by_assets   
).limits_.push_back(DBL_MAX);
 
 // Not necessary for 'sample' product only, because it's built in.
-//    foo.write(AddDataDir("sample.tir"));
+//    foo.write(AddDataDir("sample.strata"));
 
     // Another policy form....
 }

Modified: lmi/trunk/product_names.hpp
===================================================================
--- lmi/trunk/product_names.hpp 2010-03-22 13:26:38 UTC (rev 4802)
+++ lmi/trunk/product_names.hpp 2010-03-22 16:26:27 UTC (rev 4803)
@@ -29,7 +29,7 @@
 #include <string>
 #include <vector>
 
-/// Base names of policy ('.pol') files found in data directory.
+/// Base names of '.policy' files found in data directory.
 /// They are read only once and cached: see documentation for
 /// class ce_product_name.