[lmi-commits] [5474] Improve concinnity

[Greg Chicares]

Revision: 5474
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5474
Author:   chicares
Date:     2012-05-28 11:36:13 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Improve concinnity

Modified Paths:
--------------
    lmi/trunk/actuarial_table.cpp
    lmi/trunk/actuarial_table.hpp

Modified: lmi/trunk/actuarial_table.cpp
===================================================================
--- lmi/trunk/actuarial_table.cpp       2012-05-28 11:21:19 UTC (rev 5473)
+++ lmi/trunk/actuarial_table.cpp       2012-05-28 11:36:13 UTC (rev 5474)
@@ -31,8 +31,8 @@
 #include "alert.hpp"
 #include "assert_lmi.hpp"
 #include "miscellany.hpp"
-#include "oecumenic_enumerations.hpp" // methuselah
-#include "path_utility.hpp" // fs::path inserter
+#include "oecumenic_enumerations.hpp"   // methuselah
+#include "path_utility.hpp"             // fs::path inserter
 #include "value_cast.hpp"
 #include "xml_lmi.hpp"
 
@@ -44,12 +44,12 @@
 
 #include <xmlwrapp/nodes_view.h>
 
-#include <algorithm> // std::max(), std::min()
-#include <cctype>    // std::toupper()
-#include <climits>   // CHAR_BIT
+#include <algorithm>                    // std::max(), std::min()
+#include <cctype>                       // std::toupper()
+#include <climits>                      // CHAR_BIT
 #include <ios>
 #include <istream>
-#include <iterator>  // std::distance()
+#include <iterator>                     // std::distance()
 #include <limits>
 
 namespace

Modified: lmi/trunk/actuarial_table.hpp
===================================================================
--- lmi/trunk/actuarial_table.hpp       2012-05-28 11:21:19 UTC (rev 5473)
+++ lmi/trunk/actuarial_table.hpp       2012-05-28 11:36:13 UTC (rev 5474)
@@ -170,7 +170,7 @@
 {
   public:
     xml_actuarial_table(std::string const& filename, int table_number);
-    ~xml_actuarial_table();
+    virtual ~xml_actuarial_table();
 
   protected:
     std::vector<double> specific_values(int issue_age, int length) const;
@@ -181,11 +181,12 @@
     void load_xml_duration_table           (xml::element const& node);
     void load_xml_select_table             (xml::element const& node);
     void load_xml_select_and_ultimate_table(xml::element const& node);
-    void load_xml_table_with_ages          (xml::element const& node
-                                            ,std::vector<double>& data
-                                            ,int& min_age
-                                            ,int& max_age
-                                            );
+    void load_xml_table_with_ages
+        (xml::element const& node
+        ,std::vector<double>& data
+        ,int& min_age
+        ,int& max_age
+        );
 
     // Table data. For 1D tables (e_table_aggregate and e_table_duration), this
     // is the vector of values from min_age_ to max_age_.
@@ -226,7 +227,7 @@
 {
   public:
     soa_actuarial_table(std::string const& filename, int table_number);
-    ~soa_actuarial_table();
+    virtual ~soa_actuarial_table();
 
     std::string const& filename       () const {return filename_       ;}