From bb2064b6d92d1b6bd43f675b47a892162aeb35a9 Mon Sep 17 00:00:00 2001 From: Houtan Bastani <houtan@dynare.org> Date: Mon, 17 Oct 2016 12:32:30 +0200 Subject: [PATCH] `inputname` no longer works in `subsref`. Default name for saving dseries is now `dynare_series` --- src/@dseries/save.m | 14 +++++--------- src/@dseries/subsref.m | 10 +++------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/@dseries/save.m b/src/@dseries/save.m index 87584a7..7b3123d 100644 --- a/src/@dseries/save.m +++ b/src/@dseries/save.m @@ -2,7 +2,7 @@ function save(A,basename,format) % --*-- Unitary tests --*-- % Saves a dseries object on disk. -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2016 Dynare Team % % This file is part of Dynare. % @@ -24,7 +24,7 @@ if nargin<3 || isempty(format) end if nargin<2 || isempty(basename) - basename = inputname(1); + basename = 'dynare_series'; end switch format @@ -163,20 +163,16 @@ end %$ % Define names %$ A_name = {'A1';'A2'}; %$ -%$ % Instantiate a time series object. +%$ % Instantiate and save a time series object. %$ try %$ ts1 = dseries(A,[],A_name,[]); -%$ if isoctave -%$ ts1.save('A'); -%$ else -%$ ts1.save; -%$ end +%$ ts1.save; %$ t = 1; %$ catch %$ t = 0; %$ end %$ -%$ delete('ts1.csv'); +%$ delete('dynare_series.csv'); %$ %$ T = all(t); %@eof:4 diff --git a/src/@dseries/subsref.m b/src/@dseries/subsref.m index 36e50d8..c5eead2 100644 --- a/src/@dseries/subsref.m +++ b/src/@dseries/subsref.m @@ -150,7 +150,7 @@ switch S(1).type error('dseries::subsref: Wrong syntax.') end elseif isequal(length(S),1) - save(A,inputname(1)); + save(A); else error('dseries::subsref: Call to save method must come in last position!') end @@ -587,17 +587,13 @@ end %$ % Instantiate a time series object. %$ try %$ ts1 = dseries(A,[],A_name,[]); -%$ if isoctave -%$ ts1.save('ts1'); -%$ else -%$ ts1.save(); -%$ end +%$ ts1.save(); %$ t = 1; %$ catch %$ t = 0; %$ end %$ -%$ delete('ts1.csv') +%$ delete('dynare_series.csv') %$ %$ T = all(t); %@eof:12 -- GitLab