stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trunk: fixed dsample command (was broken until now) 

git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@2301 ac1d8469-bf42-47a9-8791-bf33cf982152
time-shift
sebastien 2008-12-08 16:19:59 +00:00
parent 34bfaeb3ab
commit 6017007f4f
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
matlab/dsample.m
View File

@ -36,19 +36,19 @@ global options_
options_.smpl = zeros(2,1) ;
if s1 > options_.periods | s2 > options_.periods
t = ['DYNARE dsample error: one of the arguments is larger than the one' ...
' specified in PERIODS'];
error(t);
end
if nargin == 0
options_.smpl(1) = 1 ;
options_.smpl(2) = options_.periods ;
elseif nargin == 1
if s1 > options_.periods
error('DSAMPLE: argument greater than number of periods');
end
options_.smpl(1) = 1 ;
options_.smpl(2) = s1 ;
else
if s1 > options_.periods || s2 > options_.periods
error('DSAMPLE: one of the arguments is greater than number of periods');
end
options_.smpl(1) = s1 ;
options_.smpl(2) = s2 ;
end

4
matlab/global_initialization.m
View File

@ -197,10 +197,6 @@ function global_initialization()
% BVAR
M_.bvar = [];
% rplot
options_.dsample = 0;
% homotopy
options_.homotopy_mode = 0;
options_.homotopy_steps = 1;

4
preprocessor/ComputingTasks.cc
View File

@ -383,9 +383,9 @@ void
DsampleStatement::writeOutput(ostream &output, const string &basename) const
{
if (val2 < 0)
output << "options_.dsample = " << val1 << ";" << endl;
output << "dsample(" << val1 << ");" << endl;
else
output << "options_.dsample = [" << val1 << "; " << val2 << "];" << endl;
output << "dsample(" << val1 << ", " << val2 << ");" << endl;
}
VarobsStatement::VarobsStatement(const SymbolList &symbol_list_arg) :