[lmi-commits] [5662] Support external 7702 NSP tables

[Greg Chicares]

Revision: 5662
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5662
Author:   chicares
Date:     2013-01-11 12:54:26 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
Support external 7702 NSP tables

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/basic_values.hpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/my_prod.cpp
    lmi/trunk/policy_document.cpp
    lmi/trunk/policy_view.xrc
    lmi/trunk/product_data.cpp
    lmi/trunk/product_data.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-01-11 12:07:12 UTC (rev 5661)
+++ lmi/trunk/ChangeLog 2013-01-11 12:54:26 UTC (rev 5662)
@@ -31827,3 +31827,57 @@
   dbdict.cpp
 Remove the danger noted 20130109T2317Z, and a congener.
 
+20130110T1318Z <address@hidden> [544]
+
+  rounding_view.xrc
+Regularize indentation.
+
+20130110T1939Z <address@hidden> [544]
+
+  rounding_view.xrc
+Improve labels.
+
+20130110T2352Z <address@hidden> [544]
+
+  basic_values.hpp
+  basicvalues.cpp
+  ihs_basicval.cpp
+  rounding_document.cpp
+  rounding_rules.cpp
+  rounding_rules.hpp
+  rounding_view.xrc
+Permute to bring 7702 items together.
+
+20130111T1113Z <address@hidden> [544]
+
+  rounding_document.cpp
+Refactor for concinnity.
+
+20130111T1123Z <address@hidden> [544]
+
+  ihs_basicval.cpp
+  rounding_document.cpp
+  rounding_rules.cpp
+Reformat.
+
+20130111T1207Z <address@hidden> [544]
+
+  basic_values.hpp
+  ihs_basicval.cpp
+  rounding_document.cpp
+  rounding_rules.cpp
+  rounding_rules.hpp
+  rounding_view.xrc
+Add rounding rules for 7702 and 7702A premium rates.
+
+20130111T1254Z <address@hidden> [544]
+
+  basic_values.hpp
+  ihs_basicval.cpp
+  my_prod.cpp
+  policy_document.cpp
+  policy_view.xrc
+  product_data.cpp
+  product_data.hpp
+Support external 7702 NSP tables.
+

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2013-01-11 12:07:12 UTC (rev 5661)
+++ lmi/trunk/basic_values.hpp  2013-01-11 12:54:26 UTC (rev 5662)
@@ -144,6 +144,7 @@
     // consequence.
 
     std::vector<double> GetCvatCorridorFactors() const;
+    std::vector<double> GetIrc7702NspRates() const;
     std::vector<double> GetCurrCOIRates0()   const;
     std::vector<double> GetCurrCOIRates1()   const;
     std::vector<double> GetCurrCOIRates2()   const;

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2013-01-11 12:07:12 UTC (rev 5661)
+++ lmi/trunk/ihs_basicval.cpp  2013-01-11 12:54:26 UTC (rev 5662)
@@ -1765,6 +1765,14 @@
         );
 }
 
+std::vector<double> BasicValues::GetIrc7702NspRates() const
+{
+    return GetTable
+        (ProductData_->datum("Irc7702NspFilename")
+        ,DB_CorridorTable
+        );
+}
+
 // Only current (hence midpoint) COI and term rates are blended.
 
 std::vector<double> BasicValues::GetCurrCOIRates0() const

Modified: lmi/trunk/my_prod.cpp
===================================================================
--- lmi/trunk/my_prod.cpp       2013-01-11 12:07:12 UTC (rev 5661)
+++ lmi/trunk/my_prod.cpp       2013-01-11 12:54:26 UTC (rev 5662)
@@ -67,6 +67,7 @@
     z.TierFilename             = glossed_string("sample.strata");
 
     z.CvatCorridorFilename     = glossed_string("sample");
+    z.Irc7702NspFilename       = glossed_string("sample");
     z.CurrCOIFilename          = glossed_string("qx_cso");
     z.GuarCOIFilename          = glossed_string("qx_cso");
     z.WPFilename               = glossed_string("sample");

Modified: lmi/trunk/policy_document.cpp
===================================================================
--- lmi/trunk/policy_document.cpp       2013-01-11 12:07:12 UTC (rev 5661)
+++ lmi/trunk/policy_document.cpp       2013-01-11 12:54:26 UTC (rev 5662)
@@ -46,6 +46,7 @@
     values_["DatabaseFilename"        ] = &product_data_.DatabaseFilename      
  .datum_;
     values_["FundFilename"            ] = &product_data_.FundFilename          
  .datum_;
     values_["CvatCorridorFilename"    ] = &product_data_.CvatCorridorFilename  
  .datum_;
+    values_["Irc7702NspFilename"      ] = &product_data_.Irc7702NspFilename    
  .datum_;
     values_["CurrCOIFilename"         ] = &product_data_.CurrCOIFilename       
  .datum_;
     values_["GuarCOIFilename"         ] = &product_data_.GuarCOIFilename       
  .datum_;
     values_["WPFilename"              ] = &product_data_.WPFilename            
  .datum_;

Modified: lmi/trunk/policy_view.xrc
===================================================================
--- lmi/trunk/policy_view.xrc   2013-01-11 12:07:12 UTC (rev 5661)
+++ lmi/trunk/policy_view.xrc   2013-01-11 12:54:26 UTC (rev 5662)
@@ -121,6 +121,19 @@
                                     <object class="sizeritem">
                                         
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
                                         <object class="wxStaticText">
+                                            <label>Irc7702NspFilename</label>
+                                        </object>
+                                        <option>0</option>
+                                    </object>
+                                    <object class="sizeritem">
+                                        
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxGROW</flag>
+                                        <object class="wxTextCtrl" 
name="Irc7702NspFilename"/>
+                                        <minsize>160,-1</minsize>
+                                        <option>1</option>
+                                    </object>
+                                    <object class="sizeritem">
+                                        
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                                        <object class="wxStaticText">
                                             <label>CurrCOIFilename</label>
                                         </object>
                                         <option>0</option>

Modified: lmi/trunk/product_data.cpp
===================================================================
--- lmi/trunk/product_data.cpp  2013-01-11 12:07:12 UTC (rev 5661)
+++ lmi/trunk/product_data.cpp  2013-01-11 12:54:26 UTC (rev 5662)
@@ -179,6 +179,7 @@
     ascribe("RoundingFilename"              , &product_data::RoundingFilename  
            );
     ascribe("TierFilename"                  , &product_data::TierFilename      
            );
     ascribe("CvatCorridorFilename"          , 
&product_data::CvatCorridorFilename          );
+    ascribe("Irc7702NspFilename"            , 
&product_data::Irc7702NspFilename            );
     ascribe("CurrCOIFilename"               , &product_data::CurrCOIFilename   
            );
     ascribe("GuarCOIFilename"               , &product_data::GuarCOIFilename   
            );
     ascribe("WPFilename"                    , &product_data::WPFilename        
            );
@@ -404,6 +405,7 @@
     z.TierFilename             = glossed_string("sample.strata");
 
     z.CvatCorridorFilename     = glossed_string("sample");
+    z.Irc7702NspFilename       = glossed_string("sample");
     z.CurrCOIFilename          = glossed_string("qx_cso");
     z.GuarCOIFilename          = glossed_string("qx_cso");
     z.WPFilename               = glossed_string("sample");

Modified: lmi/trunk/product_data.hpp
===================================================================
--- lmi/trunk/product_data.hpp  2013-01-11 12:07:12 UTC (rev 5661)
+++ lmi/trunk/product_data.hpp  2013-01-11 12:54:26 UTC (rev 5662)
@@ -147,6 +147,7 @@
 
     // Names of rate-table files.
     glossed_string CvatCorridorFilename;
+    glossed_string Irc7702NspFilename;
     glossed_string CurrCOIFilename;
     glossed_string GuarCOIFilename;
     glossed_string WPFilename;