[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] valyuta/002 d1c1af3 01/21: Revert "Trivially avoid s
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] valyuta/002 d1c1af3 01/21: Revert "Trivially avoid spurious regression errors" |
Date: |
Fri, 18 Sep 2020 21:53:45 -0400 (EDT) |
branch: valyuta/002
commit d1c1af3d44af8215675aea3e6ee776e29a2dc2ad
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Revert "Trivially avoid spurious regression errors"
This reverts commit 3f712186525bf3171da3c143930985388d3ba2d3.
---
ihs_acctval.cpp | 4 ++--
ihs_avmly.cpp | 36 ++++++++++++++++++------------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index c0dc8d0..a9a1de5 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1334,8 +1334,8 @@ void AccountValue::FinalizeYear()
for(int j = 0; j < 12; ++j)
{
- LMI_ASSERT(materially_equal(GrossPmts[j].d(), EeGrossPmts[j].d() +
ErGrossPmts[j].d()));
-// LMI_ASSERT(GrossPmts[j] == EeGrossPmts[j] + ErGrossPmts[j]);
+// LMI_ASSERT(materially_equal(GrossPmts[j], EeGrossPmts[j] +
ErGrossPmts[j]));
+ LMI_ASSERT(GrossPmts[j] == EeGrossPmts[j] + ErGrossPmts[j]);
InvariantValues().GrossPmt [Year] += GrossPmts [j].d();
InvariantValues().EeGrossPmt[Year] += EeGrossPmts[j].d();
InvariantValues().ErGrossPmt[Year] += ErGrossPmts[j].d();
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index b42c17d..f0860b7 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -635,8 +635,8 @@ void AccountValue::TxExch1035()
);
}
- LMI_ASSERT(materially_equal(GrossPmts[Month].d(), EeGrossPmts[Month].d() +
ErGrossPmts[Month].d()));
-// LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
+// LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month]));
+ LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
}
//============================================================================
@@ -1212,7 +1212,7 @@ void AccountValue::TxAscertainDesiredPayment()
return;
}
- if(false && GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
+ if(GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
warning()
<< GrossPmts[Month] << " GrossPmts[Month]\n"
<< EeGrossPmts[Month] + ErGrossPmts[Month] << " EeGrossPmts[Month]
+ ErGrossPmts[Month]\n"
@@ -1222,8 +1222,8 @@ void AccountValue::TxAscertainDesiredPayment()
<< Month << " Month\n"
<< LMI_FLUSH
;
- LMI_ASSERT(materially_equal(GrossPmts[Month].d(), EeGrossPmts[Month].d() +
ErGrossPmts[Month].d()));
-// LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
+// LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month]));
+ LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
currency eepmt {};
if(ee_pay_this_month)
@@ -1255,7 +1255,7 @@ void AccountValue::TxAscertainDesiredPayment()
GrossPmts [Month] += erpmt;
}
- if(false && GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
+ if(GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
warning()
<< GrossPmts[Month] << " GrossPmts[Month]\n"
<< EeGrossPmts[Month] + ErGrossPmts[Month] << " EeGrossPmts[Month]
+ ErGrossPmts[Month]\n"
@@ -1265,8 +1265,8 @@ void AccountValue::TxAscertainDesiredPayment()
<< Month << " Month\n"
<< LMI_FLUSH
;
- LMI_ASSERT(materially_equal(GrossPmts[Month].d(), EeGrossPmts[Month].d() +
ErGrossPmts[Month].d()));
-// LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
+// LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month]));
+ LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
LMI_ASSERT(GrossPmts[Month] < 1.0e100);
if(0 == Year && 0 == Month)
@@ -1283,7 +1283,7 @@ void AccountValue::TxAscertainDesiredPayment()
}
// if(!(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month])))
- if(false && GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
+ if(GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
warning()
<< GrossPmts[Month] << " GrossPmts[Month]\n"
<< EeGrossPmts[Month] + ErGrossPmts[Month] << " EeGrossPmts[Month]
+ ErGrossPmts[Month]\n"
@@ -1293,8 +1293,8 @@ void AccountValue::TxAscertainDesiredPayment()
<< Month << " Month\n"
<< LMI_FLUSH
;
- LMI_ASSERT(materially_equal(GrossPmts[Month].d(), EeGrossPmts[Month].d() +
ErGrossPmts[Month].d()));
-// LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
+// LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month]));
+ LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
}
/// Limit payment (e.g., to the non-MEC maximum).
@@ -1314,7 +1314,7 @@ 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(false && GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
+ if(GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
// if(!(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month])))
warning()
<< GrossPmts[Month] << " GrossPmts[Month]\n"
@@ -1325,8 +1325,8 @@ void AccountValue::TxLimitPayment(double a_maxpmt)
<< Month << " Month\n"
<< LMI_FLUSH
;
- LMI_ASSERT(materially_equal(GrossPmts[Month].d(), EeGrossPmts[Month].d() +
ErGrossPmts[Month].d()));
-// LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
+// LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month]));
+ LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
if(mce_reduce_prem == yare_input_.AvoidMecMethod &&
!Irc7702A_->IsMecAlready())
{
@@ -1350,8 +1350,8 @@ void AccountValue::TxLimitPayment(double a_maxpmt)
GrossPmts[Month] = EeGrossPmts[Month] + ErGrossPmts[Month];
}
- LMI_ASSERT(materially_equal(GrossPmts[Month].d(), EeGrossPmts[Month].d() +
ErGrossPmts[Month].d()));
-// LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
+// LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month]));
+ LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
if(Solving || mce_run_gen_curr_sep_full == RunBasis_)
{
@@ -1365,8 +1365,8 @@ void AccountValue::TxLimitPayment(double a_maxpmt)
GrossPmts[Month] = EeGrossPmts[Month] + ErGrossPmts[Month];
}
- LMI_ASSERT(materially_equal(GrossPmts[Month].d(), EeGrossPmts[Month].d() +
ErGrossPmts[Month].d()));
-// LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
+// LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month]));
+ LMI_ASSERT(GrossPmts[Month] == EeGrossPmts[Month] + ErGrossPmts[Month]);
}
//============================================================================
- [lmi-commits] [lmi] valyuta/002 updated (3f71218 -> 97e9057), Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 da89fe3 04/21: Revert "Make it faster", Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 4b313b0 07/21: Discard some commented-out code, Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 e474aa4 09/21: Remove int relops, Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 d1c1af3 01/21: Revert "Trivially avoid spurious regression errors",
Greg Chicares <=
- [lmi-commits] [lmi] valyuta/002 693dac0 02/21: Revert "Make it even faster", Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 24abb3f 03/21: Revert "Make it more faster", Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 95f34c4 06/21: Get rid of unneeded scalar doubleize(), Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 9dc1602 10/21: Remove double relops, Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 b803441 12/21: Improve documentation, Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 06046b6 05/21: Revert "Make it float", Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 215244a 13/21: Avoid implicit mixed-mode calculations more avidly, Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 63419d4 14/21: Improve documentation, Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 d8e2470 15/21: Refactor for clarity, Greg Chicares, 2020/09/18
- [lmi-commits] [lmi] valyuta/002 b07371e 17/21: Avoid implicit conversions yet more avidly, Greg Chicares, 2020/09/18