[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master f335cd1 4/4: Hold a shared_ptr to lingo in cl
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master f335cd1 4/4: Hold a shared_ptr to lingo in class BasicValues |
Date: |
Fri, 13 Nov 2020 17:28:41 -0500 (EST) |
branch: master
commit f335cd1832c637568cb9f2ee8e1a1254c437775d
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Hold a shared_ptr to lingo in class BasicValues
---
basic_values.hpp | 2 ++
ihs_basicval.cpp | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/basic_values.hpp b/basic_values.hpp
index ce3816f..5480e29 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -59,6 +59,7 @@ class Irc7702A;
class Loads;
class MortalityRates;
class death_benefits;
+class lingo;
class modal_outlay;
class premium_tax;
class rounding_rules;
@@ -119,6 +120,7 @@ class LMI_SO BasicValues
yare_input yare_input_;
product_data const product_;
product_database const database_;
+ std::shared_ptr<lingo> lingo_;
std::shared_ptr<FundData> FundData_;
std::shared_ptr<rounding_rules> RoundingRules_;
std::shared_ptr<stratified_charges> StratifiedCharges_;
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 21aa86e..341efe2 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -41,6 +41,7 @@
#include "ihs_irc7702a.hpp"
#include "input.hpp"
#include "interest_rates.hpp"
+#include "lingo.hpp"
#include "loads.hpp"
#include "math_functions.hpp"
#include "mc_enum_types_aux.hpp" // mc_str()
@@ -208,6 +209,7 @@ void BasicValues::Init()
<< LMI_FLUSH
;
}
+ lingo_.reset(new lingo(AddDataDir(product().datum("LingoFilename"))));
FundData_.reset(new FundData(AddDataDir(product().datum("FundFilename"))));
RoundingRules_.reset
(new rounding_rules(AddDataDir(product().datum("RoundingFilename")))
@@ -298,9 +300,8 @@ void BasicValues::GPTServerInit()
std::string("Issue age greater than maximum")
);
}
-// FundData_ = new FundData
-// (AddDataDir(product().datum("FundFilename"))
-// );
+// lingo_.reset(new lingo(AddDataDir(product().datum("LingoFilename"))));
+// FundData_.reset(new FundData(AddDataDir(product().datum("FundFilename"))));
RoundingRules_.reset
(new rounding_rules(AddDataDir(product().datum("RoundingFilename")))
);