[lmi-commits] [lmi] valyuta/002 680dd5d 23/65: Revert "suppress failing assertions"

[Greg Chicares]

branch: valyuta/002
commit 680dd5d586c0db7e1eb7c8250a35cf44a2e5c5ba
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Revert "suppress failing assertions"
    
    This reverts commit 360060cb879a95e9a703db1f1f258bfc394a07a2.
---
 ihs_acctval.cpp |  4 ++--
 ihs_avmly.cpp   | 16 ++--------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 0444fa3..aa3af36 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1329,7 +1329,7 @@ void AccountValue::FinalizeYear()
 
         for(int j = 0; j < 12; ++j)
             {
-//          LMI_ASSERT(materially_equal(GrossPmts[j], EeGrossPmts[j] + 
ErGrossPmts[j]));
+            LMI_ASSERT(materially_equal(GrossPmts[j], EeGrossPmts[j] + 
ErGrossPmts[j]));
             InvariantValues().GrossPmt  [Year]  += GrossPmts[j];
             InvariantValues().EeGrossPmt[Year]  += EeGrossPmts[j];
             InvariantValues().ErGrossPmt[Year]  += ErGrossPmts[j];
@@ -1338,7 +1338,7 @@ void AccountValue::FinalizeYear()
             {
             InvariantValues().InitPrem = InvariantValues().GrossPmt[Year];
             }
-#if 0
+#if 1
         LMI_ASSERT
             (materially_equal
                 (   InvariantValues().GrossPmt  [Year]
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 24844aa..f03dd8c 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -635,14 +635,12 @@ void AccountValue::TxExch1035()
             );
         }
 
-#if 0
     LMI_ASSERT
         (materially_equal
             (GrossPmts[Month]
             ,EeGrossPmts[Month] + ErGrossPmts[Month]
             )
         );
-#endif // 0
 }
 
 //============================================================================
@@ -1218,7 +1216,6 @@ void AccountValue::TxAscertainDesiredPayment()
         return;
         }
 
-#if 0
     if(!(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month])))
         warning()
             << GrossPmts[Month] << " GrossPmts[Month]\n"
@@ -1230,7 +1227,6 @@ void AccountValue::TxAscertainDesiredPayment()
             << LMI_FLUSH
             ;
     LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month]));
-#endif // 0
 
     currency eepmt = currency(0.0);
     if(ee_pay_this_month)
@@ -1262,7 +1258,6 @@ void AccountValue::TxAscertainDesiredPayment()
         GrossPmts  [Month] += erpmt;
         }
 
-#if 0
     if(!(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month])))
         warning()
             << GrossPmts[Month] << " GrossPmts[Month]\n"
@@ -1274,7 +1269,6 @@ void AccountValue::TxAscertainDesiredPayment()
             << LMI_FLUSH
             ;
     LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month]));
-#endif // 0
     LMI_ASSERT(GrossPmts[Month] < 1.0e100);
 
     if(0 == Year && 0 == Month)
@@ -1290,7 +1284,6 @@ void AccountValue::TxAscertainDesiredPayment()
         GrossPmts  [Month] += Dumpin;
         }
 
-#if 0
     if(!(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month])))
         warning()
             << GrossPmts[Month] << " GrossPmts[Month]\n"
@@ -1302,7 +1295,6 @@ void AccountValue::TxAscertainDesiredPayment()
             << LMI_FLUSH
             ;
     LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month]));
-#endif // 0
 }
 
 //============================================================================
@@ -1318,7 +1310,6 @@ void AccountValue::TxLimitPayment(double a_maxpmt)
     // we shouldn't.
 // TODO ?? TAXATION !! Clean this up, and put GPT limit here, on prem net of 
WD.
 
-#if 0
     if(!(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month])))
         warning()
             << GrossPmts[Month] << " GrossPmts[Month]\n"
@@ -1330,7 +1321,6 @@ void AccountValue::TxLimitPayment(double a_maxpmt)
             << LMI_FLUSH
             ;
     LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month]));
-#endif // 0
 
     if(mce_reduce_prem == yare_input_.AvoidMecMethod && 
!Irc7702A_->IsMecAlready())
         {
@@ -1354,7 +1344,7 @@ void AccountValue::TxLimitPayment(double a_maxpmt)
         GrossPmts[Month] = EeGrossPmts[Month] + ErGrossPmts[Month];
         }
 
-//  LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month]));
+    LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] + 
ErGrossPmts[Month]));
 
     if(Solving || mce_run_gen_curr_sep_full == RunBasis_)
         {
@@ -1368,14 +1358,12 @@ void AccountValue::TxLimitPayment(double a_maxpmt)
         GrossPmts[Month] = EeGrossPmts[Month] + ErGrossPmts[Month];
         }
 
-#if 0
     LMI_ASSERT
         (materially_equal
             (GrossPmts[Month]
             ,EeGrossPmts[Month] + ErGrossPmts[Month]
             )
         );
-#endif // 0
 }
 
 //============================================================================
@@ -1545,7 +1533,7 @@ currency AccountValue::GetPremLoad
         ;
     LMI_ASSERT(0.0 <= sum_of_separate_loads);
 
-#if 0 // Reconsider.
+#if 1
     double total_load =
           target_portion * YearsTotLoadTgt
         + excess_portion * YearsTotLoadExc