[lmi-commits] [5716] Refactor

[Greg Chicares]

Revision: 5716
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5716
Author:   chicares
Date:     2013-04-21 23:52:18 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
Refactor

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/census_view.cpp
    lmi/trunk/census_view_old.cpp
    lmi/trunk/emit_ledger.cpp
    lmi/trunk/emit_ledger.hpp
    lmi/trunk/group_values.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-04-21 23:24:48 UTC (rev 5715)
+++ lmi/trunk/ChangeLog 2013-04-21 23:52:18 UTC (rev 5716)
@@ -32190,3 +32190,44 @@
 Fix defect introduced 20050212T1259Z, from an original file predating
 the lmi epoch: 'PostHoneymoonSpread', being a rate, is not additive.
 
+20130421T2211Z <address@hidden> [542]
+
+  ihs_acctval.cpp
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+  ledger_variant.cpp
+  ledger_variant.hpp
+  loads.cpp
+  yare_input.cpp
+  yare_input.hpp
+Add data needed for group roster to ledger.
+
+20130421T2248Z <address@hidden> [542]
+
+  ledger_text_formats.cpp
+  ledger_xml_io.cpp
+Specify formats for columns added or renamed 20130421T2211Z.
+
+20130421T2249Z <address@hidden> [542]
+
+  mc_enum_types.cpp
+  mc_enum_types.xpp
+Offer modal minimum premium column on configurable reports.
+
+20130421T2324Z <address@hidden> [542]
+
+  emit_ledger.cpp
+  illustration_view.cpp
+  ledger_text_formats.cpp
+  ledger_text_formats.hpp
+Improve a function name.
+
+20130421T2352Z <address@hidden> [542]
+
+  census_view.cpp
+  census_view_old.cpp
+  emit_ledger.cpp
+  emit_ledger.hpp
+  group_values.cpp
+Refactor.
+

Modified: lmi/trunk/census_view.cpp
===================================================================
--- lmi/trunk/census_view.cpp   2013-04-21 23:24:48 UTC (rev 5715)
+++ lmi/trunk/census_view.cpp   2013-04-21 23:52:18 UTC (rev 5716)
@@ -31,7 +31,6 @@
 #include "alert.hpp"
 #include "assert_lmi.hpp"
 #include "census_document.hpp"
-#include "configurable_settings.hpp"
 #include "contains.hpp"
 #include "default_view.hpp"
 #include "edit_mvc_docview_parameters.hpp"
@@ -61,7 +60,6 @@
 #include <algorithm>
 #include <cctype>
 #include <cstddef>                      // std::size_t
-#include <cstdio>                       // std::remove()
 #include <istream>                      // std::ws
 #include <iterator>
 #include <sstream>
@@ -1605,15 +1603,10 @@
     document().Modify(true);
 }
 
-/// Print tab-delimited output to file loadable in spreadsheet programs.
+/// Print tab-delimited details to file loadable in spreadsheet programs.
 
 void CensusView::UponRunCaseToSpreadsheet(wxCommandEvent&)
 {
-    std::string spreadsheet_filename =
-            base_filename()
-        +   configurable_settings::instance().spreadsheet_file_extension()
-        ;
-    std::remove(spreadsheet_filename.c_str());
     DoAllCells(mce_emit_spreadsheet);
 }
 

Modified: lmi/trunk/census_view_old.cpp
===================================================================
--- lmi/trunk/census_view_old.cpp       2013-04-21 23:24:48 UTC (rev 5715)
+++ lmi/trunk/census_view_old.cpp       2013-04-21 23:52:18 UTC (rev 5716)
@@ -31,7 +31,6 @@
 #include "alert.hpp"
 #include "assert_lmi.hpp"
 #include "census_document.hpp"
-#include "configurable_settings.hpp"
 #include "contains.hpp"
 #include "default_view.hpp"
 #include "illustration_view.hpp"
@@ -55,7 +54,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cstdio>         // std::remove()
 #include <istream>        // std::ws
 #include <iterator>
 #include <sstream>
@@ -940,14 +938,10 @@
     document().Modify(true);
 }
 
-// Print tab-delimited output to file loadable in spreadsheet programs.
+/// Print tab-delimited details to file loadable in spreadsheet programs.
+
 void CensusViewOld::UponRunCaseToSpreadsheet(wxCommandEvent&)
 {
-    std::string spreadsheet_filename =
-            base_filename()
-        +   configurable_settings::instance().spreadsheet_file_extension()
-        ;
-    std::remove(spreadsheet_filename.c_str());
     DoAllCells(mce_emit_spreadsheet);
 }
 

Modified: lmi/trunk/emit_ledger.cpp
===================================================================
--- lmi/trunk/emit_ledger.cpp   2013-04-21 23:24:48 UTC (rev 5715)
+++ lmi/trunk/emit_ledger.cpp   2013-04-21 23:52:18 UTC (rev 5716)
@@ -34,15 +34,38 @@
 #include "ledger.hpp"
 #include "ledger_text_formats.hpp"
 #include "ledger_xsl.hpp"
-#include "miscellany.hpp"          // ios_out_trunc_binary()
+#include "miscellany.hpp"               // ios_out_trunc_binary()
 #include "timer.hpp"
 
 #include <boost/filesystem/convenience.hpp>
 #include <boost/filesystem/fstream.hpp>
 
+#include <cstdio>                       // std::remove()
 #include <iostream>
 #include <string>
 
+/// Prepare to emit ledger(s) in various guises.
+
+double pre_emit_ledger
+    (fs::path const& tsv_filepath
+    ,mcenum_emission emission
+    )
+{
+    Timer timer;
+
+    if(emission & mce_emit_spreadsheet)
+        {
+        LMI_ASSERT(!tsv_filepath.empty());
+        std::string spreadsheet_filename =
+                tsv_filepath.string()
+            +   configurable_settings::instance().spreadsheet_file_extension()
+            ;
+        std::remove(spreadsheet_filename.c_str());
+        }
+
+    return timer.stop().elapsed_seconds();
+}
+
 /// Emit a ledger in various guises.
 ///
 /// The commands for

Modified: lmi/trunk/emit_ledger.hpp
===================================================================
--- lmi/trunk/emit_ledger.hpp   2013-04-21 23:24:48 UTC (rev 5715)
+++ lmi/trunk/emit_ledger.hpp   2013-04-21 23:52:18 UTC (rev 5716)
@@ -33,6 +33,11 @@
 
 class Ledger;
 
+double LMI_SO pre_emit_ledger
+    (fs::path const& tsv_filepath
+    ,mcenum_emission emission
+    );
+
 double LMI_SO emit_ledger
     (fs::path const& filepath
     ,fs::path const& tsv_filepath

Modified: lmi/trunk/group_values.cpp
===================================================================
--- lmi/trunk/group_values.cpp  2013-04-21 23:24:48 UTC (rev 5715)
+++ lmi/trunk/group_values.cpp  2013-04-21 23:52:18 UTC (rev 5716)
@@ -113,6 +113,8 @@
             )
         );
 
+    result.seconds_for_output_ += pre_emit_ledger(file, emission);
+
     for(unsigned int j = 0; j < cells.size(); ++j)
         {
         if(!cell_should_be_ignored(cells[j]))
@@ -598,6 +600,8 @@
         composite.PlusEq(*(*i)->ledger_from_av());
         }
 
+    result.seconds_for_output_ += pre_emit_ledger(file, emission);
+
     {
     int j = 0;
     for(i = cell_values.begin(); i != cell_values.end(); ++i, ++j)