[lmi-commits] [4793] Refactor

[Greg Chicares]

Revision: 4793
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4793
Author:   chicares
Date:     2010-03-19 13:51:50 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Refactor

Modified Paths:
--------------
    lmi/trunk/input.hpp
    lmi/trunk/input_xml_io.cpp
    lmi/trunk/mec_input.cpp
    lmi/trunk/mec_input.hpp
    lmi/trunk/mec_state.cpp
    lmi/trunk/mec_state.hpp

Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2010-03-19 13:23:47 UTC (rev 4792)
+++ lmi/trunk/input.hpp 2010-03-19 13:51:50 UTC (rev 4793)
@@ -187,6 +187,7 @@
         ,std::map<std::string, std::string> detritus_map
         ,std::list<std::string>             residuary_names
         );
+    void        redintegrate_ad_terminum();
 
     // MvcModel required implementation.
     virtual void DoAdaptExternalities();

Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp  2010-03-19 13:23:47 UTC (rev 4792)
+++ lmi/trunk/input_xml_io.cpp  2010-03-19 13:51:50 UTC (rev 4793)
@@ -142,10 +142,7 @@
 
     redintegrate_ex_post(file_version, detritus_map, residuary_names);
 
-    if(EffectiveDateToday.value() && 
!global_settings::instance().regression_testing())
-        {
-        EffectiveDate = calendar_date();
-        }
+    redintegrate_ad_terminum();
 }
 
 //============================================================================
@@ -496,3 +493,13 @@
         }
 }
 
+/// Perform any required after-the-fact fixup.
+
+void Input::redintegrate_ad_terminum()
+{
+    if(EffectiveDateToday.value() && 
!global_settings::instance().regression_testing())
+        {
+        EffectiveDate = calendar_date();
+        }
+}
+

Modified: lmi/trunk/mec_input.cpp
===================================================================
--- lmi/trunk/mec_input.cpp     2010-03-19 13:23:47 UTC (rev 4792)
+++ lmi/trunk/mec_input.cpp     2010-03-19 13:51:50 UTC (rev 4793)
@@ -684,8 +684,7 @@
 
     redintegrate_ex_post(file_version, detritus_map, residuary_names);
 
-    Reconcile();
-    RealizeAllSequenceInput(false);
+    redintegrate_ad_terminum();
 }
 
 void mec_input::write(xml::element& x) const
@@ -772,6 +771,14 @@
         }
 }
 
+/// Perform any required after-the-fact fixup.
+
+void mec_input::redintegrate_ad_terminum()
+{
+    Reconcile();
+    RealizeAllSequenceInput(false);
+}
+
 namespace
 {
 template<typename Number, typename Trammel>

Modified: lmi/trunk/mec_input.hpp
===================================================================
--- lmi/trunk/mec_input.hpp     2010-03-19 13:23:47 UTC (rev 4792)
+++ lmi/trunk/mec_input.hpp     2010-03-19 13:51:50 UTC (rev 4793)
@@ -121,6 +121,7 @@
         ,std::map<std::string, std::string> detritus_map
         ,std::list<std::string>             residuary_names
         );
+    void        redintegrate_ad_terminum();
 
     // MvcModel required implementation.
     virtual void DoAdaptExternalities();

Modified: lmi/trunk/mec_state.cpp
===================================================================
--- lmi/trunk/mec_state.cpp     2010-03-19 13:23:47 UTC (rev 4792)
+++ lmi/trunk/mec_state.cpp     2010-03-19 13:51:50 UTC (rev 4793)
@@ -460,6 +460,8 @@
         }
 
     redintegrate_ex_post(file_version, detritus_map, residuary_names);
+
+    redintegrate_ad_terminum();
 }
 
 void mec_state::write(xml::element& x) const
@@ -545,3 +547,9 @@
         }
 }
 
+/// Perform any required after-the-fact fixup.
+
+void mec_state::redintegrate_ad_terminum()
+{
+}
+

Modified: lmi/trunk/mec_state.hpp
===================================================================
--- lmi/trunk/mec_state.hpp     2010-03-19 13:23:47 UTC (rev 4792)
+++ lmi/trunk/mec_state.hpp     2010-03-19 13:51:50 UTC (rev 4793)
@@ -87,6 +87,7 @@
         ,std::map<std::string, std::string> detritus_map
         ,std::list<std::string>             residuary_names
         );
+    void        redintegrate_ad_terminum();
 
     int    B0_deduced_policy_year;
     int    B1_deduced_contract_year;