[lmi-commits] [lmi] master 8d6c2da 3/6: Transpose two arguments

[Greg Chicares]

branch: master
commit 8d6c2da64a4566736d5ac7a986c2b78736aece2a
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Transpose two arguments
    
    The one moved to the last position will soon become optional.
---
 gpt_cf_triad_test.cpp         | 26 +++++++++++++-------------
 gpt_commutation_functions.cpp |  2 +-
 gpt_commutation_functions.hpp |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gpt_cf_triad_test.cpp b/gpt_cf_triad_test.cpp
index e55bdcd..ff9cc71 100644
--- a/gpt_cf_triad_test.cpp
+++ b/gpt_cf_triad_test.cpp
@@ -340,7 +340,7 @@ void gpt_cf_triad_test::test_preconditions()
     // Negative duration.
     parms.duration = -1;
     LMI_TEST_THROW
-        (z.calculate_premium(oe_gsp, mce_option1_for_7702, parms)
+        (z.calculate_premium(oe_gsp, parms, mce_option1_for_7702)
         ,std::runtime_error
         ,""
         );
@@ -349,7 +349,7 @@ void gpt_cf_triad_test::test_preconditions()
     // Duration greater than omega minus one.
     parms.duration = lmi::ssize(q_m);
     LMI_TEST_THROW
-        (z.calculate_premium(oe_gsp, mce_option1_for_7702, parms)
+        (z.calculate_premium(oe_gsp, parms, mce_option1_for_7702)
         ,std::runtime_error
         ,""
         );
@@ -359,7 +359,7 @@ void gpt_cf_triad_test::test_preconditions()
     // parameters are not redundantly tested here.)
     parms.target_prem = -0.01;
     LMI_TEST_THROW
-        (z.calculate_premium(oe_gsp, mce_option1_for_7702, parms)
+        (z.calculate_premium(oe_gsp, parms, mce_option1_for_7702)
         ,std::runtime_error
         ,""
         );
@@ -369,7 +369,7 @@ void gpt_cf_triad_test::test_preconditions()
     parms.endt_bft = 100000.0;
     parms.f3_bft   =  90000.0;
     LMI_TEST_THROW
-        (z.calculate_premium(oe_gsp, mce_option1_for_7702, parms)
+        (z.calculate_premium(oe_gsp, parms, mce_option1_for_7702)
         ,std::runtime_error
         ,""
         );
@@ -501,9 +501,9 @@ void gpt_cf_triad_test::compare_premiums(int issue_age, 
double target)
     for(int duration = 0; duration < omega - issue_age; ++duration)
         {
         parms.duration = duration;
-        double const r0 = z.calculate_premium(oe_gsp, mce_option1_for_7702, 
parms);
-        double const r1 = z.calculate_premium(oe_glp, mce_option1_for_7702, 
parms);
-        double const r2 = z.calculate_premium(oe_glp, mce_option2_for_7702, 
parms);
+        double const r0 = z.calculate_premium(oe_gsp, parms, 
mce_option1_for_7702);
+        double const r1 = z.calculate_premium(oe_glp, parms, 
mce_option1_for_7702);
+        double const r2 = z.calculate_premium(oe_glp, parms, 
mce_option2_for_7702);
         double const r0_old = z_old.CalculateGSP(duration, f3_bft, endt_bft, 
endt_bft                      );
         double const r1_old = z_old.CalculateGLP(duration, f3_bft, endt_bft, 
endt_bft, mce_option1_for_7702);
         double const r2_old = z_old.CalculateGLP(duration, f3_bft, endt_bft, 
endt_bft, mce_option2_for_7702);
@@ -558,9 +558,9 @@ void gpt_cf_triad_test::test_premium_calculations()
         for(int duration = 0; duration < omega - issue_age; ++duration)
             {
             parms.duration = duration;
-            double const r0 = z.calculate_premium(oe_gsp, 
mce_option1_for_7702, parms);
-            double const r1 = z.calculate_premium(oe_glp, 
mce_option1_for_7702, parms);
-            double const r2 = z.calculate_premium(oe_glp, 
mce_option2_for_7702, parms);
+            double const r0 = z.calculate_premium(oe_gsp, parms, 
mce_option1_for_7702);
+            double const r1 = z.calculate_premium(oe_glp, parms, 
mce_option1_for_7702);
+            double const r2 = z.calculate_premium(oe_glp, parms, 
mce_option2_for_7702);
             int const x_plus_t = issue_age + duration;
             LMI_ASSERT(0 <= x_plus_t && x_plus_t < omega);
             bool const all_materially_equal =
@@ -579,9 +579,9 @@ void gpt_cf_triad_test::mete_premiums()
 {
     static gpt_scalar_parms const parms = s_parms();
     static gpt_cf_triad const z = instantiate_cf();
-    z.calculate_premium(oe_gsp, mce_option1_for_7702, parms);
-    z.calculate_premium(oe_glp, mce_option1_for_7702, parms);
-    z.calculate_premium(oe_glp, mce_option2_for_7702, parms);
+    z.calculate_premium(oe_gsp, parms, mce_option1_for_7702);
+    z.calculate_premium(oe_glp, parms, mce_option1_for_7702);
+    z.calculate_premium(oe_glp, parms, mce_option2_for_7702);
 }
 
 /// Measure instantiation speed of old GPT class.
diff --git a/gpt_commutation_functions.cpp b/gpt_commutation_functions.cpp
index 8f74687..567b545 100644
--- a/gpt_commutation_functions.cpp
+++ b/gpt_commutation_functions.cpp
@@ -233,8 +233,8 @@ gpt_cf_triad::gpt_cf_triad
 
 double gpt_cf_triad::calculate_premium
     (oenum_glp_or_gsp        glp_or_gsp
-    ,mcenum_dbopt_7702       dbo
     ,gpt_scalar_parms const& args
+    ,mcenum_dbopt_7702       dbo
     ) const
 {
     LMI_ASSERT(0 <= args.duration        );
diff --git a/gpt_commutation_functions.hpp b/gpt_commutation_functions.hpp
index 2c7d268..7ebc094 100644
--- a/gpt_commutation_functions.hpp
+++ b/gpt_commutation_functions.hpp
@@ -216,8 +216,8 @@ class gpt_cf_triad
 
     double calculate_premium
         (oenum_glp_or_gsp
-        ,mcenum_dbopt_7702
         ,gpt_scalar_parms const&
+        ,mcenum_dbopt_7702
         ) const;
 
   private: