[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 3dfa5eb 2/2: Improve concinnity
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 3dfa5eb 2/2: Improve concinnity |
|
Date: |
Sun, 11 Mar 2018 19:28:55 -0400 (EDT) |
branch: master
commit 3dfa5eb49ce8a73a223d72913f72c4c587df223b
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Improve concinnity
If a floating literal would end in '.', append '0' for uniformity.
---
ledger_evaluator.cpp | 2 +-
ledger_pdf_generator_wx.cpp | 8 ++---
ncnnnpnn_test.cpp | 80 ++++++++++++++++++++++-----------------------
3 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 17e4c77..202b82d 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -720,7 +720,7 @@ ledger_evaluator Ledger::make_evaluator() const
scalars["SalesLoadRefundRate1"] = &SalesLoadRefundRate1;
double GenAcctAllocation = ledger_invariant_->GenAcctAllocation;
- double GenAcctAllocationComplement = 1. - GenAcctAllocation;
+ double GenAcctAllocationComplement = 1.0 - GenAcctAllocation;
scalars["GenAcctAllocationPercent" ] = &GenAcctAllocation;
scalars["GenAcctAllocationComplementPercent"] =
&GenAcctAllocationComplement;
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index f3def5d..9d2b812 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -602,8 +602,8 @@ TAG_HANDLER_BEGIN(scaled_image, "SCALED_IMAGE")
wxString inv_factor_str;
if (tag.GetParamAsString("INV_FACTOR", &inv_factor_str))
{
- double inv_factor = 0.;
- if (!inv_factor_str.ToCDouble(&inv_factor) || inv_factor == 0.)
+ double inv_factor = 0.0;
+ if (!inv_factor_str.ToCDouble(&inv_factor) || inv_factor == 0.0)
{
throw std::runtime_error
( "invalid value for \"inv_factor\" attribute of "
@@ -2421,14 +2421,14 @@ class nasd_supplemental : public
page_with_tabular_report
case column_premium_tax_load:
case column_dac_tax_load:
// These columns only appear in non-split premiums case.
- return invar.SplitMinPrem == 0.;
+ return invar.SplitMinPrem == 0.0;
case column_er_gross_payment:
case column_ee_gross_payment:
case column_er_min_premium:
case column_ee_min_premium:
// While those only appear in split premiums case.
- return invar.SplitMinPrem == 1.;
+ return invar.SplitMinPrem == 1.0;
case column_policy_year:
case column_premium_outlay:
diff --git a/ncnnnpnn_test.cpp b/ncnnnpnn_test.cpp
index 4e8c59f..6dac406 100644
--- a/ncnnnpnn_test.cpp
+++ b/ncnnnpnn_test.cpp
@@ -43,26 +43,26 @@ int test_main(int, char*[])
BOOST_TEST_EQUAL( "890.14", ncnnnpnn( 890.14159));
BOOST_TEST_EQUAL( "90.14", ncnnnpnn( 90.14159));
BOOST_TEST_EQUAL( "0.14", ncnnnpnn( 0.14159));
- BOOST_TEST_EQUAL( "1,234,567,890.00", ncnnnpnn( 1234567890. ));
- BOOST_TEST_EQUAL( "234,567,890.00", ncnnnpnn( 234567890. ));
- BOOST_TEST_EQUAL( "34,567,890.00", ncnnnpnn( 34567890. ));
- BOOST_TEST_EQUAL( "4,567,890.00", ncnnnpnn( 4567890. ));
- BOOST_TEST_EQUAL( "567,890.00", ncnnnpnn( 567890. ));
- BOOST_TEST_EQUAL( "67,890.00", ncnnnpnn( 67890. ));
- BOOST_TEST_EQUAL( "7,890.00", ncnnnpnn( 7890. ));
- BOOST_TEST_EQUAL( "890.00", ncnnnpnn( 890. ));
- BOOST_TEST_EQUAL( "90.00", ncnnnpnn( 90. ));
- BOOST_TEST_EQUAL( "1.00", ncnnnpnn( 1. ));
- BOOST_TEST_EQUAL( "1,000,000,000.00", ncnnnpnn( 1000000000. ));
- BOOST_TEST_EQUAL( "100,000,000.00", ncnnnpnn( 100000000. ));
- BOOST_TEST_EQUAL( "10,000,000.00", ncnnnpnn( 10000000. ));
- BOOST_TEST_EQUAL( "1,000,000.00", ncnnnpnn( 1000000. ));
- BOOST_TEST_EQUAL( "100,000.00", ncnnnpnn( 100000. ));
- BOOST_TEST_EQUAL( "10,000.00", ncnnnpnn( 10000. ));
- BOOST_TEST_EQUAL( "1,000.00", ncnnnpnn( 1000. ));
- BOOST_TEST_EQUAL( "100.00", ncnnnpnn( 100. ));
- BOOST_TEST_EQUAL( "10.00", ncnnnpnn( 10. ));
- BOOST_TEST_EQUAL( "1.00", ncnnnpnn( 1. ));
+ BOOST_TEST_EQUAL( "1,234,567,890.00", ncnnnpnn( 1234567890.0 ));
+ BOOST_TEST_EQUAL( "234,567,890.00", ncnnnpnn( 234567890.0 ));
+ BOOST_TEST_EQUAL( "34,567,890.00", ncnnnpnn( 34567890.0 ));
+ BOOST_TEST_EQUAL( "4,567,890.00", ncnnnpnn( 4567890.0 ));
+ BOOST_TEST_EQUAL( "567,890.00", ncnnnpnn( 567890.0 ));
+ BOOST_TEST_EQUAL( "67,890.00", ncnnnpnn( 67890.0 ));
+ BOOST_TEST_EQUAL( "7,890.00", ncnnnpnn( 7890.0 ));
+ BOOST_TEST_EQUAL( "890.00", ncnnnpnn( 890.0 ));
+ BOOST_TEST_EQUAL( "90.00", ncnnnpnn( 90.0 ));
+ BOOST_TEST_EQUAL( "1.00", ncnnnpnn( 1.0 ));
+ BOOST_TEST_EQUAL( "1,000,000,000.00", ncnnnpnn( 1000000000.0 ));
+ BOOST_TEST_EQUAL( "100,000,000.00", ncnnnpnn( 100000000.0 ));
+ BOOST_TEST_EQUAL( "10,000,000.00", ncnnnpnn( 10000000.0 ));
+ BOOST_TEST_EQUAL( "1,000,000.00", ncnnnpnn( 1000000.0 ));
+ BOOST_TEST_EQUAL( "100,000.00", ncnnnpnn( 100000.0 ));
+ BOOST_TEST_EQUAL( "10,000.00", ncnnnpnn( 10000.0 ));
+ BOOST_TEST_EQUAL( "1,000.00", ncnnnpnn( 1000.0 ));
+ BOOST_TEST_EQUAL( "100.00", ncnnnpnn( 100.0 ));
+ BOOST_TEST_EQUAL( "10.00", ncnnnpnn( 10.0 ));
+ BOOST_TEST_EQUAL( "1.00", ncnnnpnn( 1.0 ));
BOOST_TEST_EQUAL( "0.10", ncnnnpnn( 0.1 ));
BOOST_TEST_EQUAL( "0.01", ncnnnpnn( 0.01 ));
BOOST_TEST_EQUAL( "2,147,483,647.00", ncnnnpnn( 2147483647.0 ));
@@ -83,26 +83,26 @@ int test_main(int, char*[])
BOOST_TEST_EQUAL( "-890.14", ncnnnpnn( -890.14159));
BOOST_TEST_EQUAL( "-90.14", ncnnnpnn( -90.14159));
BOOST_TEST_EQUAL( "-0.14", ncnnnpnn( -0.14159));
- BOOST_TEST_EQUAL("-1,234,567,890.00", ncnnnpnn(-1234567890. ));
- BOOST_TEST_EQUAL( "-234,567,890.00", ncnnnpnn( -234567890. ));
- BOOST_TEST_EQUAL( "-34,567,890.00", ncnnnpnn( -34567890. ));
- BOOST_TEST_EQUAL( "-4,567,890.00", ncnnnpnn( -4567890. ));
- BOOST_TEST_EQUAL( "-567,890.00", ncnnnpnn( -567890. ));
- BOOST_TEST_EQUAL( "-67,890.00", ncnnnpnn( -67890. ));
- BOOST_TEST_EQUAL( "-7,890.00", ncnnnpnn( -7890. ));
- BOOST_TEST_EQUAL( "-890.00", ncnnnpnn( -890. ));
- BOOST_TEST_EQUAL( "-90.00", ncnnnpnn( -90. ));
- BOOST_TEST_EQUAL( "-1.00", ncnnnpnn( -1. ));
- BOOST_TEST_EQUAL("-1,000,000,000.00", ncnnnpnn(-1000000000. ));
- BOOST_TEST_EQUAL( "-100,000,000.00", ncnnnpnn( -100000000. ));
- BOOST_TEST_EQUAL( "-10,000,000.00", ncnnnpnn( -10000000. ));
- BOOST_TEST_EQUAL( "-1,000,000.00", ncnnnpnn( -1000000. ));
- BOOST_TEST_EQUAL( "-100,000.00", ncnnnpnn( -100000. ));
- BOOST_TEST_EQUAL( "-10,000.00", ncnnnpnn( -10000. ));
- BOOST_TEST_EQUAL( "-1,000.00", ncnnnpnn( -1000. ));
- BOOST_TEST_EQUAL( "-100.00", ncnnnpnn( -100. ));
- BOOST_TEST_EQUAL( "-10.00", ncnnnpnn( -10. ));
- BOOST_TEST_EQUAL( "-1.00", ncnnnpnn( -1. ));
+ BOOST_TEST_EQUAL("-1,234,567,890.00", ncnnnpnn(-1234567890.0 ));
+ BOOST_TEST_EQUAL( "-234,567,890.00", ncnnnpnn( -234567890.0 ));
+ BOOST_TEST_EQUAL( "-34,567,890.00", ncnnnpnn( -34567890.0 ));
+ BOOST_TEST_EQUAL( "-4,567,890.00", ncnnnpnn( -4567890.0 ));
+ BOOST_TEST_EQUAL( "-567,890.00", ncnnnpnn( -567890.0 ));
+ BOOST_TEST_EQUAL( "-67,890.00", ncnnnpnn( -67890.0 ));
+ BOOST_TEST_EQUAL( "-7,890.00", ncnnnpnn( -7890.0 ));
+ BOOST_TEST_EQUAL( "-890.00", ncnnnpnn( -890.0 ));
+ BOOST_TEST_EQUAL( "-90.00", ncnnnpnn( -90.0 ));
+ BOOST_TEST_EQUAL( "-1.00", ncnnnpnn( -1.0 ));
+ BOOST_TEST_EQUAL("-1,000,000,000.00", ncnnnpnn(-1000000000.0 ));
+ BOOST_TEST_EQUAL( "-100,000,000.00", ncnnnpnn( -100000000.0 ));
+ BOOST_TEST_EQUAL( "-10,000,000.00", ncnnnpnn( -10000000.0 ));
+ BOOST_TEST_EQUAL( "-1,000,000.00", ncnnnpnn( -1000000.0 ));
+ BOOST_TEST_EQUAL( "-100,000.00", ncnnnpnn( -100000.0 ));
+ BOOST_TEST_EQUAL( "-10,000.00", ncnnnpnn( -10000.0 ));
+ BOOST_TEST_EQUAL( "-1,000.00", ncnnnpnn( -1000.0 ));
+ BOOST_TEST_EQUAL( "-100.00", ncnnnpnn( -100.0 ));
+ BOOST_TEST_EQUAL( "-10.00", ncnnnpnn( -10.0 ));
+ BOOST_TEST_EQUAL( "-1.00", ncnnnpnn( -1.0 ));
BOOST_TEST_EQUAL( "-0.10", ncnnnpnn( -0.1 ));
BOOST_TEST_EQUAL( "-0.01", ncnnnpnn( -0.01 ));
BOOST_TEST_EQUAL("-2,147,483,647.00", ncnnnpnn(-2147483647.0 ));