[lmi-commits] [5900] Add some GPT fields

[Greg Chicares]

Revision: 5900
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5900
Author:   chicares
Date:     2014-06-19 21:17:17 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
Add some GPT fields

Modified Paths:
--------------
    lmi/trunk/gpt_state.cpp
    lmi/trunk/gpt_state.hpp

Modified: lmi/trunk/gpt_state.cpp
===================================================================
--- lmi/trunk/gpt_state.cpp     2014-06-17 23:43:17 UTC (rev 5899)
+++ lmi/trunk/gpt_state.cpp     2014-06-19 21:17:17 UTC (rev 5900)
@@ -118,7 +118,7 @@
         ;
 
     oss << "<p>" << htmlize(heading) << "</p>\n";
-
+#if 0
     oss
         << "<hr>\n"
         << "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" 
width=\"100%\">\n"
@@ -273,6 +273,44 @@
         << "</tr>\n"
         << "</table>\n"
         ;
+#endif // 0
+    oss
+        << "<hr>\n"
+        << "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" 
width=\"100%\">\n"
+        << "<tr align=\"right\">\n"
+        << "<td nowrap>" << "glp"                          << "</td>\n"
+        << "<td nowrap>" << f(X0_glp               ) << "</td>\n"
+        << "</tr>\n"
+        << "<tr align=\"right\">\n"
+        << "<td nowrap>" << "gsp"                          << "</td>\n"
+        << "<td nowrap>" << f(X1_gsp               ) << "</td>\n"
+        << "</tr>\n"
+        << "<tr align=\"right\">\n"
+        << "<td nowrap>" << "glp A"                        << "</td>\n"
+        << "<td nowrap>" << f(X2_glp_a             ) << "</td>\n"
+        << "</tr>\n"
+        << "<tr align=\"right\">\n"
+        << "<td nowrap>" << "gsp A"                        << "</td>\n"
+        << "<td nowrap>" << f(X3_gsp_a             ) << "</td>\n"
+        << "</tr>\n"
+        << "<tr align=\"right\">\n"
+        << "<td nowrap>" << "glp B"                        << "</td>\n"
+        << "<td nowrap>" << f(X4_glp_b             ) << "</td>\n"
+        << "</tr>\n"
+        << "<tr align=\"right\">\n"
+        << "<td nowrap>" << "gsp B"                        << "</td>\n"
+        << "<td nowrap>" << f(X5_gsp_b             ) << "</td>\n"
+        << "</tr>\n"
+        << "<tr align=\"right\">\n"
+        << "<td nowrap>" << "glp C"                        << "</td>\n"
+        << "<td nowrap>" << f(X6_glp_c             ) << "</td>\n"
+        << "</tr>\n"
+        << "<tr align=\"right\">\n"
+        << "<td nowrap>" << "gsp C"                        << "</td>\n"
+        << "<td nowrap>" << f(X7_gsp_c             ) << "</td>\n"
+        << "</tr>\n"
+        << "</table>\n"
+        ;
 
     oss
         << "</body>\n"
@@ -284,6 +322,7 @@
 
 void gpt_state::AscribeMembers()
 {
+#if 0
     ascribe("B0_deduced_policy_year"   , &gpt_state::B0_deduced_policy_year   
);
     ascribe("B1_deduced_contract_year" , &gpt_state::B1_deduced_contract_year 
);
     ascribe("B2_deduced_px7_rate"      , &gpt_state::B2_deduced_px7_rate      
);
@@ -347,6 +386,15 @@
     ascribe("Q4_cum_px7"               , &gpt_state::Q4_cum_px7               
);
     ascribe("Q5_cum_amt_pd"            , &gpt_state::Q5_cum_amt_pd            
);
     ascribe("Q6_max_non_mec_prem"      , &gpt_state::Q6_max_non_mec_prem      
);
+#endif // 0
+    ascribe("X0_glp"                   , &gpt_state::X0_glp                   
);
+    ascribe("X1_gsp"                   , &gpt_state::X1_gsp                   
);
+    ascribe("X2_glp_a"                 , &gpt_state::X2_glp_a                 
);
+    ascribe("X3_gsp_a"                 , &gpt_state::X3_gsp_a                 
);
+    ascribe("X4_glp_b"                 , &gpt_state::X4_glp_b                 
);
+    ascribe("X5_gsp_b"                 , &gpt_state::X5_gsp_b                 
);
+    ascribe("X6_glp_c"                 , &gpt_state::X6_glp_c                 
);
+    ascribe("X7_gsp_c"                 , &gpt_state::X7_gsp_c                 
);
 }
 
 /// Backward-compatibility serial number of this class's xml version.

Modified: lmi/trunk/gpt_state.hpp
===================================================================
--- lmi/trunk/gpt_state.hpp     2014-06-17 23:43:17 UTC (rev 5899)
+++ lmi/trunk/gpt_state.hpp     2014-06-19 21:17:17 UTC (rev 5900)
@@ -41,6 +41,10 @@
 /// For design discussion, see:
 ///   http://lists.nongnu.org/archive/html/lmi/2009-07/msg00002.html
 ///
+/// When any GPT work is to be done, some 7702A work is probably
+/// needed as well. Therefore, this class is more a superset than a
+/// sibling of the corresponding 'mec_' class.
+///
 /// Variables are prefixed '[A-Z][0-9]_' so that they sort by groups:
 /// in particular, when their names are used to nominate xml elements.
 /// 'A*_' is reserved in case it's wanted later--e.g., for arguments.
@@ -136,6 +140,15 @@
     double Q4_cum_px7;
     double Q5_cum_amt_pd;
     double Q6_max_non_mec_prem;
+
+    double X0_glp;
+    double X1_gsp;
+    double X2_glp_a;
+    double X3_gsp_a;
+    double X4_glp_b;
+    double X5_gsp_b;
+    double X6_glp_c;
+    double X7_gsp_c;
 };
 
 #endif // gpt_state_hpp