From 7495668ef27d730fffc8688de38f2c4d6b0fb022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Fri, 19 Apr 2013 11:34:33 +0200 Subject: [PATCH] Minor simplification and improvements --- mex/sources/estimation/LogLikelihoodMain.hh | 4 +--- mex/sources/estimation/SteadyStateSolver.hh | 5 +---- mex/sources/estimation/logposterior.cc | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/mex/sources/estimation/LogLikelihoodMain.hh b/mex/sources/estimation/LogLikelihoodMain.hh index 87296e147..731336a25 100644 --- a/mex/sources/estimation/LogLikelihoodMain.hh +++ b/mex/sources/estimation/LogLikelihoodMain.hh @@ -59,15 +59,13 @@ public: double logLikelihood = 0; for (size_t i = 0; i < estSubsamples.size(); ++i) { - VectorView vSteadyState (steadyState,0,steadyState.getSize()); - MatrixConstView dataView(data, 0, estSubsamples[i].startPeriod, data.getRows(), estSubsamples[i].endPeriod-estSubsamples[i].startPeriod+1); MatrixView detrendedDataView(detrendedData, 0, estSubsamples[i].startPeriod, data.getRows(), estSubsamples[i].endPeriod-estSubsamples[i].startPeriod+1); VectorView vllView(vll, estSubsamples[i].startPeriod, estSubsamples[i].endPeriod-estSubsamples[i].startPeriod+1); - logLikelihood += logLikelihoodSubSample.compute(vSteadyState, dataView, estParams, deepParams, + logLikelihood += logLikelihoodSubSample.compute(steadyState, dataView, estParams, deepParams, Q, H, vllView, detrendedDataView, start, i); } return logLikelihood; diff --git a/mex/sources/estimation/SteadyStateSolver.hh b/mex/sources/estimation/SteadyStateSolver.hh index 826f5d0e0..dad340fd3 100644 --- a/mex/sources/estimation/SteadyStateSolver.hh +++ b/mex/sources/estimation/SteadyStateSolver.hh @@ -67,11 +67,10 @@ public: { assert(steadyState.getStride() == 1); assert(deepParams.getStride() == 1); + assert(Mx.getLd() == Mx.getRows()); assert(steadyState.getSize() == n_endo); - std::cout << "In: " << steadyState << std::endl; - gsl_vector_view ss = gsl_vector_view_array(steadyState.getData(), n_endo); params p = { &static_dll, deepParams.getData(), deepParams.getSize(), Mx.getData(), Mx.getCols(), &residual, &g1 }; @@ -106,8 +105,6 @@ public: gsl_vector_memcpy(&ss.vector, gsl_multiroot_fdfsolver_root(s)); gsl_multiroot_fdfsolver_free(s); - - std::cout << "Out: " << steadyState << std::endl; } }; diff --git a/mex/sources/estimation/logposterior.cc b/mex/sources/estimation/logposterior.cc index f6f879736..72279f243 100644 --- a/mex/sources/estimation/logposterior.cc +++ b/mex/sources/estimation/logposterior.cc @@ -233,7 +233,7 @@ mexFunction(int nlhs, mxArray *plhs[], const mxArray *bayestopt_ = prhs[5]; const mxArray *oo_ = prhs[6]; - mxArray *dataset_data = mxGetField(dataset,0,"data"); + const mxArray *dataset_data = mxGetField(dataset,0,"data"); MatrixConstView data(mxGetPr(dataset_data), mxGetM(dataset_data), mxGetN(dataset_data), mxGetM(dataset_data)); // Creaete LHS arguments