trunk:
* created a directory "matlab/matlab", for functions missing under Matlab (but existing under Octave) * created a directory "matlab/octave", for functions missing under Octave (but existing under Matlab) * moved "mex/octave/rcond.m" to "matlab/octave/" * moved "matlab/rows.m" to "matlab/matlab/rows.m" (Octave has builtin "rows") * renamed "matlab/cols.m" to "matlab/matlab/columns.m" (Octave has builtin "columns") * moved "matlab/distributions/toolbox" to "matlab/matlab/stats" * adapted "dynare_config.m" to reflect these changes git-svn-id: https://www.dynare.org/svn/dynare/trunk@2628 ac1d8469-bf42-47a9-8791-bf33cf982152time-shift
parent
da6e5e6712
commit
096b2f2541
|
@ -72,7 +72,7 @@ linea = 0;
|
||||||
for file = 1:NumberOfDrawsFiles
|
for file = 1:NumberOfDrawsFiles
|
||||||
load([M_.dname '/metropolis/' DrawsFiles(file).name ]);
|
load([M_.dname '/metropolis/' DrawsFiles(file).name ]);
|
||||||
NumberOfDraws = rows(pdraws);
|
NumberOfDraws = rows(pdraws);
|
||||||
isdrsaved = cols(pdraws)-1;
|
isdrsaved = columns(pdraws)-1;
|
||||||
for linee = 1:NumberOfDraws
|
for linee = 1:NumberOfDraws
|
||||||
linea = linea+1;
|
linea = linea+1;
|
||||||
if isdrsaved
|
if isdrsaved
|
||||||
|
|
|
@ -71,7 +71,7 @@ linea = 0;
|
||||||
for file = 1:NumberOfDrawsFiles
|
for file = 1:NumberOfDrawsFiles
|
||||||
load([M_.dname '/metropolis/' DrawsFiles(file).name ],'pdraws');
|
load([M_.dname '/metropolis/' DrawsFiles(file).name ],'pdraws');
|
||||||
NumberOfDraws = rows(pdraws);
|
NumberOfDraws = rows(pdraws);
|
||||||
isdrsaved = cols(pdraws)-1;
|
isdrsaved = columns(pdraws)-1;
|
||||||
for linee = 1:NumberOfDraws
|
for linee = 1:NumberOfDraws
|
||||||
linea = linea+1;
|
linea = linea+1;
|
||||||
if isdrsaved
|
if isdrsaved
|
||||||
|
|
|
@ -74,7 +74,7 @@ DecompFileNumber = 1;
|
||||||
linea = 0;
|
linea = 0;
|
||||||
for file = 1:NumberOfDrawsFiles
|
for file = 1:NumberOfDrawsFiles
|
||||||
load([M_.dname '/metropolis/' DrawsFiles(file).name ]);
|
load([M_.dname '/metropolis/' DrawsFiles(file).name ]);
|
||||||
isdrsaved = cols(pdraws)-1;
|
isdrsaved = columns(pdraws)-1;
|
||||||
NumberOfDraws = rows(pdraws);
|
NumberOfDraws = rows(pdraws);
|
||||||
for linee = 1:NumberOfDraws
|
for linee = 1:NumberOfDraws
|
||||||
linea = linea+1;
|
linea = linea+1;
|
||||||
|
|
|
@ -15,7 +15,7 @@ function dynareroot = dynare_config(path_to_dynare)
|
||||||
% SPECIAL REQUIREMENTS
|
% SPECIAL REQUIREMENTS
|
||||||
% none
|
% none
|
||||||
|
|
||||||
% Copyright (C) 2001-2008 Dynare Team
|
% Copyright (C) 2001-2009 Dynare Team
|
||||||
%
|
%
|
||||||
% This file is part of Dynare.
|
% This file is part of Dynare.
|
||||||
%
|
%
|
||||||
|
@ -40,17 +40,23 @@ dynareroot = strrep(which('dynare.m'),'dynare.m','');
|
||||||
addpath([dynareroot '/distributions/'])
|
addpath([dynareroot '/distributions/'])
|
||||||
addpath([dynareroot '/kalman/'])
|
addpath([dynareroot '/kalman/'])
|
||||||
addpath([dynareroot '/kalman/likelihood'])
|
addpath([dynareroot '/kalman/likelihood'])
|
||||||
|
addpath([dynareroot '/AIM/'])
|
||||||
|
|
||||||
% Add path to distribution-related function if under Matlab
|
% For functions that exist under Octave and not under Matlab, or vice-versa,
|
||||||
% without the statistics toolbox
|
% we provide some replacement functions
|
||||||
if ~exist('OCTAVE_VERSION') && isempty(ver('stats'))
|
if exist('OCTAVE_VERSION')
|
||||||
addpath([dynareroot '/distributions/toolbox/'])
|
% Functions missing under Octave
|
||||||
end
|
addpath([dynareroot '/octave/'])
|
||||||
|
else
|
||||||
if exist([dynareroot '/AIM'])==7 % Add path to G.Anderson AIM solver (added by GP July'08)
|
% Functions missing under Matlab
|
||||||
addpath([dynareroot '/AIM/']);
|
addpath([dynareroot '/matlab/'])
|
||||||
|
if isempty(ver('stats'))
|
||||||
|
% Replacements for functions of the stats toolbox
|
||||||
|
addpath([dynareroot '/matlab/stats/'])
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
% Add path to MEX files
|
||||||
if exist('OCTAVE_VERSION')
|
if exist('OCTAVE_VERSION')
|
||||||
path_to_mex_files = [dynareroot '../mex/octave/'] ;
|
path_to_mex_files = [dynareroot '../mex/octave/'] ;
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
function c = cols(M)
|
function c = columns(M)
|
||||||
|
% Computes the number of columns of a matrix
|
||||||
|
% NOTE: this function is builtin in Octave
|
||||||
|
|
||||||
% Copyright (C) 2008 Dynare Team
|
% Copyright (C) 2008-2009 Dynare Team
|
||||||
%
|
%
|
||||||
% This file is part of Dynare.
|
% This file is part of Dynare.
|
||||||
%
|
%
|
||||||
|
@ -17,4 +19,4 @@ function c = cols(M)
|
||||||
% You should have received a copy of the GNU General Public License
|
% You should have received a copy of the GNU General Public License
|
||||||
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
|
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
c = size(M,2);
|
c = size(M,2);
|
|
@ -1,6 +1,8 @@
|
||||||
function nr=rows(x)
|
function r = rows(x)
|
||||||
|
% Computes the number of rows of a matrix
|
||||||
|
% NOTE: this function is builtin in Octave
|
||||||
|
|
||||||
% Copyright (C) 2005 Dynare Team
|
% Copyright (C) 2005-2009 Dynare Team
|
||||||
%
|
%
|
||||||
% This file is part of Dynare.
|
% This file is part of Dynare.
|
||||||
%
|
%
|
||||||
|
@ -17,4 +19,4 @@ function nr=rows(x)
|
||||||
% You should have received a copy of the GNU General Public License
|
% You should have received a copy of the GNU General Public License
|
||||||
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
|
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
nr = size(x,1);
|
r = size(x,1);
|
|
@ -66,7 +66,7 @@ Section
|
||||||
File ..\mex\2007b\*.mexw32
|
File ..\mex\2007b\*.mexw32
|
||||||
|
|
||||||
SetOutPath $INSTDIR\mex\octave
|
SetOutPath $INSTDIR\mex\octave
|
||||||
File ..\mex\octave\rcond.m ..\mex\octave\*.mex
|
File ..\mex\octave\*.mex
|
||||||
|
|
||||||
SetOutPath $INSTDIR\doc
|
SetOutPath $INSTDIR\doc
|
||||||
File ..\doc\manual.pdf ..\doc\guide.pdf ..\doc\userguide\UserGuide.pdf ..\doc\bvar-a-la-sims.pdf ..\doc\macroprocessor\macroprocessor.pdf ..\doc\preprocessor\preprocessor.pdf
|
File ..\doc\manual.pdf ..\doc\guide.pdf ..\doc\userguide\UserGuide.pdf ..\doc\bvar-a-la-sims.pdf ..\doc\macroprocessor\macroprocessor.pdf ..\doc\preprocessor\preprocessor.pdf
|
||||||
|
|
Loading…
Reference in New Issue