[lmi-commits] [5781] Rearrange

[Greg Chicares]

Revision: 5781
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5781
Author:   chicares
Date:     2013-10-08 22:11:33 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Rearrange

Modified Paths:
--------------
    lmi/trunk/gpt_test.cpp

Modified: lmi/trunk/gpt_test.cpp
===================================================================
--- lmi/trunk/gpt_test.cpp      2013-10-03 23:02:20 UTC (rev 5780)
+++ lmi/trunk/gpt_test.cpp      2013-10-08 22:11:33 UTC (rev 5781)
@@ -86,10 +86,11 @@
 {
 }
 
-void mete_gpt_cf_triad()
+void mete_gpt_vector_parms()
 {
     static std::vector<double> zero(sample_q(0).size(), 0.0);
-    static gpt_vector_parms parms =
+    // This is not static: its construction speed is being measured.
+    volatile gpt_vector_parms z =
         {zero // prem_load_target
         ,zero // prem_load_excess
         ,zero // policy_fee_monthly
@@ -102,18 +103,13 @@
         ,zero // qab_child_rate
         ,zero // qab_waiver_rate
         };
-    static unsigned int length = sample_q(0).size();
-    static std::vector<double> ic(length, 
i_upper_12_over_12_from_i<double>()(0.07));
-    static std::vector<double> ig(length, 
i_upper_12_over_12_from_i<double>()(0.07));
-    volatile gpt_cf_triad z(sample_q(0), ic, ig, ic, ig, parms);
     stifle_warning_for_unused_value(z);
 }
 
-void mete_gpt_vector_parms()
+void mete_gpt_cf_triad()
 {
     static std::vector<double> zero(sample_q(0).size(), 0.0);
-    // This is not static: its construction speed is being measured.
-    volatile gpt_vector_parms z =
+    static gpt_vector_parms parms =
         {zero // prem_load_target
         ,zero // prem_load_excess
         ,zero // policy_fee_monthly
@@ -126,6 +122,10 @@
         ,zero // qab_child_rate
         ,zero // qab_waiver_rate
         };
+    static unsigned int length = sample_q(0).size();
+    static std::vector<double> ic(length, 
i_upper_12_over_12_from_i<double>()(0.07));
+    static std::vector<double> ig(length, 
i_upper_12_over_12_from_i<double>()(0.07));
+    volatile gpt_cf_triad z(sample_q(0), ic, ig, ic, ig, parms);
     stifle_warning_for_unused_value(z);
 }
 
@@ -133,8 +133,8 @@
 {
     std::cout
         << "\n  Speed tests..."
-        << "\n  Commfns   : " << TimeAnAliquot(mete_gpt_cf_triad    )
         << "\n  Init parms: " << TimeAnAliquot(mete_gpt_vector_parms)
+        << "\n  Triad     : " << TimeAnAliquot(mete_gpt_cf_triad    )
         << std::endl
         ;
 }