[lmi-commits] [5927] Dichotomize a member datum into "old" and "new"

[Greg Chicares]

Revision: 5927
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5927
Author:   chicares
Date:     2014-07-11 11:57:33 +0000 (Fri, 11 Jul 2014)
Log Message:
-----------
Dichotomize a member datum into "old" and "new"

Modified Paths:
--------------
    lmi/trunk/ihs_server7702.cpp
    lmi/trunk/ihs_server7702io.cpp
    lmi/trunk/ihs_server7702io.hpp

Modified: lmi/trunk/ihs_server7702.cpp
===================================================================
--- lmi/trunk/ihs_server7702.cpp        2014-07-10 15:00:38 UTC (rev 5926)
+++ lmi/trunk/ihs_server7702.cpp        2014-07-11 11:57:33 UTC (rev 5927)
@@ -366,7 +366,7 @@
         ,Input.OldSpecAmt
         ,Input.OldDbo                   .value()
         ,Input.OldAccidentalDeathInForce
-        ,Input.TargetPremium
+        ,Input.OldTarget
         );
 
     Output.GuidelineLevelPremiumPolicyA = basic_values_A.Irc7702_->CalculateGLP
@@ -399,7 +399,7 @@
         ,Input.NewSpecAmt
         ,Input.NewDbo                   .value()
         ,Input.NewAccidentalDeathInForce
-        ,Input.TargetPremium
+        ,Input.NewTarget
         );
 
     Output.GuidelineLevelPremiumPolicyB = basic_values_B.Irc7702_->CalculateGLP
@@ -428,7 +428,7 @@
         ,Input.OldSpecAmt
         ,Input.OldDbo                   .value()
         ,Input.OldAccidentalDeathInForce
-        ,Input.TargetPremium
+        ,Input.OldTarget
         );
 
     Output.GuidelineLevelPremiumPolicyC = basic_values_C.Irc7702_->CalculateGLP

Modified: lmi/trunk/ihs_server7702io.cpp
===================================================================
--- lmi/trunk/ihs_server7702io.cpp      2014-07-10 15:00:38 UTC (rev 5926)
+++ lmi/trunk/ihs_server7702io.cpp      2014-07-11 11:57:33 UTC (rev 5927)
@@ -74,8 +74,8 @@
     OldAccidentalDeathRating   = "None";
     NewSubstandardTable        = 
exact_cast<mce_table_rating>(z["NewSubstandardTable"])->value();
     OldSubstandardTable        = 
exact_cast<mce_table_rating>(z["OldSubstandardTable"])->value();
-    LMI_ASSERT(z["OldTarget"] == z["NewTarget"]);
-    TargetPremium              = 
exact_cast<tnr_nonnegative_double>(z["NewTarget"])->value();
+    NewTarget                  = 
exact_cast<tnr_nonnegative_double>(z["NewTarget"])->value();
+    OldTarget                  = 
exact_cast<tnr_nonnegative_double>(z["OldTarget"])->value();
 }
 
 Server7702Input::operator gpt_input() const
@@ -122,9 +122,8 @@
     z["OldQabTermAmt"]         = value_cast<std::string>(OldQabTermAmt);
     z["NewSubstandardTable"]   = NewSubstandardTable.str();
     z["OldSubstandardTable"]   = OldSubstandardTable.str();
-    // 'TargetPremium' should have had "old" and "new" variants.
-    z["OldTarget"]             = value_cast<std::string>(TargetPremium);
-    z["NewTarget"]             = value_cast<std::string>(TargetPremium);
+    z["NewTarget"]             = value_cast<std::string>(NewTarget);
+    z["OldTarget"]             = value_cast<std::string>(OldTarget);
 
     return z;
 }

Modified: lmi/trunk/ihs_server7702io.hpp
===================================================================
--- lmi/trunk/ihs_server7702io.hpp      2014-07-10 15:00:38 UTC (rev 5926)
+++ lmi/trunk/ihs_server7702io.hpp      2014-07-11 11:57:33 UTC (rev 5927)
@@ -80,7 +80,8 @@
     mce_table_rating OldAccidentalDeathRating;   // UNUSED
     mce_table_rating NewSubstandardTable;        // UNUSED
     mce_table_rating OldSubstandardTable;        // UNUSED
-    double           TargetPremium; // the target premium. The client will 
always calculate and store it.
+    double           NewTarget;                  // the target premium. The 
client will always calculate and store it.
+    double           OldTarget;
 };
 
 struct Server7702Output