[lmi-commits] [lmi] master 7ec4ab0: Omit "age 70" from composite numerical summary, part deux

[Greg Chicares]

branch: master
commit 7ec4ab067eb33464dbcfd26bec39d9b6e91c29d3
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Omit "age 70" from composite numerical summary, part deux
    
    * ledger_text_formats.cpp: Reorder code to avoid printing a line that
        matches regexp / $/ .
    * sample.cns.touchstone: Likewise; also omit "age 70" and lapse years.
---
 ledger_text_formats.cpp | 8 ++++----
 sample.cns.touchstone   | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index 3aaad30..78486f9 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -1059,10 +1059,6 @@ void FlatTextLedgerPrinter::PrintNumericalSummary() const
             continue;
             }
 
-        os_.setf(std::ios_base::fixed, std::ios_base::floatfield);
-        os_.precision(0);
-        os_.width(7);
-
         // For composites, don't print the age-70 row (because age
         // is undefined) or lapse durations (which generally vary).
         if(ledger_.is_composite() && &row == &summary_rows.back())
@@ -1071,6 +1067,10 @@ void FlatTextLedgerPrinter::PrintNumericalSummary() const
             return;
             }
 
+        os_.setf(std::ios_base::fixed, std::ios_base::floatfield);
+        os_.precision(0);
+        os_.width(7);
+
         if(&row == &summary_rows.back())
             {
             os_ << " Age 70";
diff --git a/sample.cns.touchstone b/sample.cns.touchstone
index b4fdecb..9b1a975 100644
--- a/sample.cns.touchstone
+++ b/sample.cns.touchstone
@@ -55,9 +55,6 @@ Page 1 of 3                                                  
     Numerical sum
       5    20000.00    77192.53    77192.53  1000000.00    87582.96    
87582.96  1000000.00    98583.07    98583.07  1000000.00
      10    20000.00   158327.86   158327.86  1000000.00   190706.06   
190706.06  1000000.00   226705.97   226705.97  1000000.00
      20    20000.00   311466.19   311466.19  1000000.00   448253.70   
448253.70  1000000.00   612687.37   612687.37  1000000.00
- Age 70    20000.00   362433.83   362433.83  1000000.00   609159.58   
609159.58  1000000.00   910688.81   910688.81  1056399.02
-
-                             Lapses in year 39                   Matures at 
age 100                  Matures at age 100
 
                                                       Required signatures