[lmi-commits] [lmi] master ab9d0d1 6/8: Truncate GPT corridor factors at maturity age [349]

[Greg Chicares]

branch: master
commit ab9d0d15e8edf265a0e857d16b8104c4bed45f2c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Truncate GPT corridor factors at maturity age [349]
    
    Made the GPT and CVAT corridor-factor vectors the same length.
    
    Incidentally improved assertions and resolved a marked defect.
---
 ihs_irc7702.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ihs_irc7702.cpp b/ihs_irc7702.cpp
index a8987c2..4a700a5 100644
--- a/ihs_irc7702.cpp
+++ b/ihs_irc7702.cpp
@@ -386,8 +386,8 @@ double Irc7702::Forceout()
 void Irc7702::Init()
 {
     Length = lmi::ssize(Qc);
-    // TODO ?? Assumes that endowment age is always 100--should pass as arg 
instead.
-    // TAXATION !! Is the comment above correct? Maturity age is passed as an 
argument.
+    LMI_ASSERT(IssueAge <= EndtAge);
+    LMI_ASSERT(            EndtAge <= 100);
     LMI_ASSERT(Length == EndtAge - IssueAge);
 
     // TAXATION !! "For now": a decade has passed...
@@ -496,10 +496,9 @@ void Irc7702::InitCorridor()
         );
 
     // GPT corridor
-    LMI_ASSERT(IssueAge <= lmi::ssize(CompleteGptCorridor()));
     GptCorridor.assign
         (CompleteGptCorridor().begin() + IssueAge
-        ,CompleteGptCorridor().end()
+        ,CompleteGptCorridor().begin() + EndtAge
         );
 }