[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] valyuta/002 3f71218 14/14: Trivially avoid spurious
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] valyuta/002 3f71218 14/14: Trivially avoid spurious regression errors |
Date: |
Thu, 17 Sep 2020 16:27:16 -0400 (EDT) |
branch: valyuta/002
commit 3f712186525bf3171da3c143930985388d3ba2d3
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Trivially avoid spurious regression errors
Using 'double' as the underlying type, not rounding, and not multiplying
every number by 100.0 * 0.01 * 100.0 * 0.01 * 100.0 * 0.01, along with
a sprinkling of ".d()" and comparing floats for material equality, makes
the regression test acceptable.
This is a throwaway commit that serves only to make that point. It will
soon be reverted.
---
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 a9a1de5..c0dc8d0 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], EeGrossPmts[j] +
ErGrossPmts[j]));
- LMI_ASSERT(GrossPmts[j] == EeGrossPmts[j] + ErGrossPmts[j]);
+ LMI_ASSERT(materially_equal(GrossPmts[j].d(), EeGrossPmts[j].d() +
ErGrossPmts[j].d()));
+// 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 f0860b7..b42c17d 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -635,8 +635,8 @@ void AccountValue::TxExch1035()
);
}
-// LMI_ASSERT(materially_equal(GrossPmts[Month], EeGrossPmts[Month] +
ErGrossPmts[Month]));
- LMI_ASSERT(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]);
}
//============================================================================
@@ -1212,7 +1212,7 @@ void AccountValue::TxAscertainDesiredPayment()
return;
}
- if(GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
+ if(false && 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], EeGrossPmts[Month] +
ErGrossPmts[Month]));
- LMI_ASSERT(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]);
currency eepmt {};
if(ee_pay_this_month)
@@ -1255,7 +1255,7 @@ void AccountValue::TxAscertainDesiredPayment()
GrossPmts [Month] += erpmt;
}
- if(GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
+ if(false && 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], EeGrossPmts[Month] +
ErGrossPmts[Month]));
- LMI_ASSERT(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(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(GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
+ if(false && 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], EeGrossPmts[Month] +
ErGrossPmts[Month]));
- LMI_ASSERT(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]);
}
/// 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(GrossPmts[Month] != EeGrossPmts[Month] + ErGrossPmts[Month])
+ if(false && 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], EeGrossPmts[Month] +
ErGrossPmts[Month]));
- LMI_ASSERT(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]);
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], EeGrossPmts[Month] +
ErGrossPmts[Month]));
- LMI_ASSERT(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]);
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], EeGrossPmts[Month] +
ErGrossPmts[Month]));
- LMI_ASSERT(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-commits] [lmi] valyuta/002 c80d1eb 09/14: Add two experimental options, (continued)
- [lmi-commits] [lmi] valyuta/002 c80d1eb 09/14: Add two experimental options, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 e4cb0f1 10/14: Make it float, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 cfe336c 11/14: Make it faster, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 4a6bc6c 02/14: Resolve confusion, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 0d47d8d 03/14: Refine an assertion, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 27c198e 05/14: fixup, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 3d1ff11 06/14: Remove useless casts, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 594bd68 07/14: Allow floating currency::data_type, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 1fbef51 13/14: Make it even faster, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 420fac7 08/14: Allow currency to be dollars rather than cents, Greg Chicares, 2020/09/17
- [lmi-commits] [lmi] valyuta/002 3f71218 14/14: Trivially avoid spurious regression errors,
Greg Chicares <=
- [lmi-commits] [lmi] valyuta/002 e262406 12/14: Make it more faster, Greg Chicares, 2020/09/17