diff --git a/mex/sources/estimation/ModelSolution.cc b/mex/sources/estimation/ModelSolution.cc index 73066a795..18e5e389a 100644 --- a/mex/sources/estimation/ModelSolution.cc +++ b/mex/sources/estimation/ModelSolution.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Dynare Team + * Copyright (C) 2010-2013 Dynare Team * * This file is part of Dynare. * @@ -37,7 +37,7 @@ ModelSolution::ModelSolution(const std::string &dynamicDllFile, size_t n_endo_a n_jcols(n_exo+n_endo+ zeta_back_arg.size() /*nsPred*/ + zeta_fwrd_arg.size() /*nsForw*/ +2*zeta_mixed_arg.size()), jacobian(n_endo, n_jcols), residual(n_endo), Mx(1, n_exo), decisionRules(n_endo_arg, n_exo_arg, zeta_fwrd_arg, zeta_back_arg, zeta_mixed_arg, zeta_static_arg, INqz_criterium), - dynamicDLLp(dynamicDllFile, n_exo), + dynamicDLLp(dynamicDllFile), llXsteadyState(n_jcols-n_exo) { Mx.setAll(0.0); diff --git a/mex/sources/estimation/utils/dynamic_dll.cc b/mex/sources/estimation/utils/dynamic_dll.cc index 495e0bae4..2bd60aaa8 100644 --- a/mex/sources/estimation/utils/dynamic_dll.cc +++ b/mex/sources/estimation/utils/dynamic_dll.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Dynare Team + * Copyright (C) 2010-2013 Dynare Team * * This file is part of Dynare. * @@ -23,8 +23,7 @@ using namespace std; -DynamicModelDLL::DynamicModelDLL(const std::string &dynamicDllFile, size_t n_exog_arg) throw (TSException) : - n_exog(n_exog_arg) +DynamicModelDLL::DynamicModelDLL(const std::string &dynamicDllFile) throw (TSException) { std::string fName; #if !defined(__CYGWIN32__) && !defined(_WIN32) diff --git a/mex/sources/estimation/utils/dynamic_dll.hh b/mex/sources/estimation/utils/dynamic_dll.hh index d4ab4b7d4..54335a98a 100644 --- a/mex/sources/estimation/utils/dynamic_dll.hh +++ b/mex/sources/estimation/utils/dynamic_dll.hh @@ -44,7 +44,6 @@ class DynamicModelDLL { private: DynamicFn Dynamic; // pointer to the Dynamic function in DLL - const size_t n_exog; // no of exogenous #if defined(_WIN32) || defined(__CYGWIN32__) HINSTANCE dynamicHinstance; // DLL instance pointer in Windows #else @@ -53,7 +52,7 @@ private: public: // construct and load Dynamic model DLL - DynamicModelDLL(const std::string &dynamicDllFile, size_t n_exog_arg) throw (TSException); + DynamicModelDLL(const std::string &dynamicDllFile) throw (TSException); virtual ~DynamicModelDLL(); //! evaluate Dynamic model DLL