From 5b6c3bb4523fa7895794537e0dba6c501e9abafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Tue, 9 Jul 2019 17:26:27 +0200 Subject: [PATCH] k_order_perturbation MEX: small simplification in handling of NameLists --- mex/sources/k_order_perturbation/k_ord_dynare.cc | 4 ++-- mex/sources/k_order_perturbation/k_ord_dynare.hh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mex/sources/k_order_perturbation/k_ord_dynare.cc b/mex/sources/k_order_perturbation/k_ord_dynare.cc index e87ec199dc..80d05179cb 100644 --- a/mex/sources/k_order_perturbation/k_ord_dynare.cc +++ b/mex/sources/k_order_perturbation/k_ord_dynare.cc @@ -36,7 +36,7 @@ KordpDynare::KordpDynare(const std::vector<std::string> &endo, nYs{npred + nboth}, nYss{nboth + nforw}, nY{nstat + npred + nboth + nforw}, nJcols{nExog+nY+nYs+nYss}, NNZD{nnzd}, nSteps{nsteps}, nOrder{norder}, journal{jr}, ySteady{ysteady}, params{inParams}, vCov{vcov}, - md{1}, dnl{*this, endo}, denl{*this, exo}, dsnl{*this, dnl, denl}, + md{1}, dnl{endo}, denl{exo}, dsnl{*this, dnl, denl}, ll_Incidence{llincidence}, dynamicModelFile{std::move(dynamicModelFile_arg)} { @@ -223,7 +223,7 @@ KordpDynare::push_back_md(const mxArray *m) dyn_md.emplace_back(ConstTwoDMatrix{m}); } -DynareNameList::DynareNameList(const KordpDynare &dynare, std::vector<std::string> names_arg) +DynareNameList::DynareNameList(std::vector<std::string> names_arg) : names(std::move(names_arg)) { } diff --git a/mex/sources/k_order_perturbation/k_ord_dynare.hh b/mex/sources/k_order_perturbation/k_ord_dynare.hh index db88599461..6154fc16a3 100644 --- a/mex/sources/k_order_perturbation/k_ord_dynare.hh +++ b/mex/sources/k_order_perturbation/k_ord_dynare.hh @@ -35,12 +35,12 @@ class KordpDynare; -// instantiations of pure abstract class NameList in dynamic_model.h +// Trivial implementation of pure abstract class NameList in dynamic_model.h class DynareNameList : public NameList { std::vector<std::string> names; public: - DynareNameList(const KordpDynare &dynare, std::vector<std::string> names_arg); + DynareNameList(std::vector<std::string> names_arg); int getNum() const override { -- GitLab