[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 5623352 06/14: Remove pointless assertions
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 5623352 06/14: Remove pointless assertions |
Date: |
Thu, 18 Feb 2021 12:03:40 -0500 (EST) |
branch: master
commit 56233521de2b57d44a4fed805efbc252261935c5
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Remove pointless assertions
For
int n = some_small_integer;
std::vector<double> v(n);
std::vector<double> u = v;
it is not necessary to assert that n is the size of u and v.
(The original code that used std::transform() sprawled so verbosely
that such things were not necessarily obvious.)
---
ihs_irc7702.cpp | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/ihs_irc7702.cpp b/ihs_irc7702.cpp
index 1211d66..e8c67ee 100644
--- a/ihs_irc7702.cpp
+++ b/ihs_irc7702.cpp
@@ -533,22 +533,17 @@ void Irc7702::InitPvVectors(EIOBasis const& a_EIOBasis)
// Present value of charges per policy
std::vector<double> ann_chg_pol(Length);
- LMI_ASSERT(Length == lmi::ssize(ann_chg_pol));
LMI_ASSERT(Length == lmi::ssize(AnnChgPol));
LMI_ASSERT(Length == lmi::ssize(comm_fns.aD()));
ann_chg_pol += AnnChgPol * comm_fns.aD();
std::vector<double> mly_chg_pol(Length);
- LMI_ASSERT(Length == lmi::ssize(mly_chg_pol));
LMI_ASSERT(Length == lmi::ssize(MlyChgPol));
LMI_ASSERT(Length <= lmi::ssize(comm_fns.kD()));
mly_chg_pol += MlyChgPol * comm_fns.kD();
std::vector<double>& chg_pol = PvChgPol[a_EIOBasis];
chg_pol.resize(Length);
- LMI_ASSERT(Length == lmi::ssize(chg_pol));
- LMI_ASSERT(Length == lmi::ssize(ann_chg_pol));
- LMI_ASSERT(Length <= lmi::ssize(mly_chg_pol));
chg_pol += ann_chg_pol + mly_chg_pol;
// ET !! This is just APL written verbosely in a funny C++ syntax.
@@ -565,7 +560,6 @@ void Irc7702::InitPvVectors(EIOBasis const& a_EIOBasis)
// APL: chg_sa gets rotate plus scan rotate MlyChgSpecAmt times kD
std::vector<double>& chg_sa = PvChgSpecAmt[a_EIOBasis];
chg_sa.resize(Length);
- LMI_ASSERT(Length == lmi::ssize(chg_sa));
LMI_ASSERT(Length == lmi::ssize(MlyChgSpecAmt));
LMI_ASSERT(Length == lmi::ssize(comm_fns.kD()));
chg_sa += MlyChgSpecAmt * comm_fns.kD();
@@ -576,7 +570,6 @@ void Irc7702::InitPvVectors(EIOBasis const& a_EIOBasis)
// APL: chg_add gets rotate plus scan rotate MlyChgADD times kD
std::vector<double>& chg_add = PvChgADD[a_EIOBasis];
chg_add.resize(Length);
- LMI_ASSERT(Length == lmi::ssize(chg_add));
LMI_ASSERT(Length == lmi::ssize(MlyChgADD));
LMI_ASSERT(Length == lmi::ssize(comm_fns.kD()));
chg_add += MlyChgADD * comm_fns.kD();
@@ -596,14 +589,12 @@ void Irc7702::InitPvVectors(EIOBasis const& a_EIOBasis)
std::vector<double>& npf_sgl_tgt = PvNpfSglTgt[a_EIOBasis];
npf_sgl_tgt.resize(Length);
- LMI_ASSERT(Length == lmi::ssize(npf_sgl_tgt));
LMI_ASSERT(Length == lmi::ssize(LoadTgt));
LMI_ASSERT(Length == lmi::ssize(comm_fns.aD()));
npf_sgl_tgt += (1.0 - LoadTgt) * comm_fns.aD();
std::vector<double>& npf_lvl_tgt = PvNpfLvlTgt[a_EIOBasis];
npf_lvl_tgt = npf_sgl_tgt;
- LMI_ASSERT(Length == lmi::ssize(npf_lvl_tgt));
std::reverse(npf_lvl_tgt.begin(), npf_lvl_tgt.end());
std::partial_sum(npf_lvl_tgt.begin(), npf_lvl_tgt.end(),
npf_lvl_tgt.begin());
std::reverse(npf_lvl_tgt.begin(), npf_lvl_tgt.end());
@@ -613,13 +604,11 @@ void Irc7702::InitPvVectors(EIOBasis const& a_EIOBasis)
std::vector<double>& npf_sgl_exc = PvNpfSglExc[a_EIOBasis];
npf_sgl_exc.resize(Length);
LMI_ASSERT(Length == lmi::ssize(LoadExc));
- LMI_ASSERT(Length == lmi::ssize(npf_sgl_exc));
LMI_ASSERT(Length == lmi::ssize(comm_fns.aD()));
npf_sgl_exc += (1.0 - LoadExc) * comm_fns.aD();
std::vector<double>& npf_lvl_exc = PvNpfLvlExc[a_EIOBasis];
npf_lvl_exc = npf_sgl_exc;
- LMI_ASSERT(Length == lmi::ssize(npf_lvl_exc));
std::reverse(npf_lvl_exc.begin(), npf_lvl_exc.end());
std::partial_sum(npf_lvl_exc.begin(), npf_lvl_exc.end(),
npf_lvl_exc.begin());
std::reverse(npf_lvl_exc.begin(), npf_lvl_exc.end());
- [lmi-commits] [lmi] master updated (f0a4840 -> 7dd2680), Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 2e84c56 03/14: Rearrange comments, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 5623352 06/14: Remove pointless assertions,
Greg Chicares <=
- [lmi-commits] [lmi] master 140c288 05/14: Remove dead code [304], Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 3edb81f 12/14: Add and use a backward-summation function template, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master bff8d5b 04/14: Note a possible defect, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 387657b 08/14: Move assertions upward, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 074ed9e 07/14: Eliminate some local variables, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 18a189a 11/14: Remove duplicate assertions, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master cef60d4 09/14: Strengthen assertions, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 9c580de 01/14: Improve documentation, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 80fce3e 02/14: Rename a member function for clarity, Greg Chicares, 2021/02/18
- [lmi-commits] [lmi] master 837c225 10/14: Sort assertions, Greg Chicares, 2021/02/18