From 0cef790498d7c5ed7e0264acd455e4adde584208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Tue, 20 Apr 2021 10:44:18 +0200 Subject: [PATCH] =?UTF-8?q?Preprocessor:=20fix=20treatment=20of=20?= =?UTF-8?q?=E2=80=9Cseries=E2=80=9D=20option=20of=20=E2=80=9Cinitval=5Ffil?= =?UTF-8?q?e=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As a consequence, adapt histval_initvalf.m to the new format. --- matlab/histvalf_initvalf.m | 6 +++--- preprocessor | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/matlab/histvalf_initvalf.m b/matlab/histvalf_initvalf.m index 2ed72aee7..80faa595e 100644 --- a/matlab/histvalf_initvalf.m +++ b/matlab/histvalf_initvalf.m @@ -12,7 +12,7 @@ function series = histvalf_initvalf(caller, M, options) % series: dseries containing selected data from a file or a dseries % -% Copyright (C) 2003-2020 Dynare Team +% Copyright (C) 2003-2021 Dynare Team % % This file is part of Dynare. % @@ -32,7 +32,7 @@ function series = histvalf_initvalf(caller, M, options) % dseries if isfield(options, 'series') - series = options.series; + series = evalin('base', options.series); dseries_ispresent = true; else dseries_ispresent = false; @@ -230,4 +230,4 @@ else last_obs = series.last; end -series = series(first_obs:last_obs); \ No newline at end of file +series = series(first_obs:last_obs); diff --git a/preprocessor b/preprocessor index 7b3df21f1..910649dd2 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 7b3df21f11b81c83938abd982575260ab61c993a +Subproject commit 910649dd28ea3f78d6cf4cb245a2747207828bf5