From 8fc6e5b52f2bd7e327a75a679d44c270d66d78a3 Mon Sep 17 00:00:00 2001
From: sebastien <sebastien@ac1d8469-bf42-47a9-8791-bf33cf982152>
Date: Fri, 24 Apr 2009 15:19:10 +0000
Subject: [PATCH] 4.0: merged r2625 changeset from trunk (renamed table.m to
dyntable.m: name clash with Octave's table)
git-svn-id: https://www.dynare.org/svn/dynare/branches/4.0@2627 ac1d8469-bf42-47a9-8791-bf33cf982152
---
matlab/disp_moments.m | 6 +++---
matlab/disp_th_moments.m | 8 ++++----
matlab/{table.m => dyntable.m} | 2 +-
matlab/stoch_simul.m | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
rename matlab/{table.m => dyntable.m} (95%)
diff --git a/matlab/disp_moments.m b/matlab/disp_moments.m
index 2bbfe25aff..1630291db0 100644
--- a/matlab/disp_moments.m
+++ b/matlab/disp_moments.m
@@ -57,7 +57,7 @@ function disp_moments(y,var_list)
end
headers=strvcat('VARIABLE','MEAN','STD. DEV.','VARIANCE','SKEWNESS', ...
'KURTOSIS');
- table(title,headers,labels,z,size(labels,2)+2,16,6);
+ dyntable(title,headers,labels,z,size(labels,2)+2,16,6);
end
if options_.nocorr == 0
@@ -68,7 +68,7 @@ function disp_moments(y,var_list)
int2str(options_.hp_filter) ')'];
end
headers = strvcat('VARIABLE',M_.endo_names(ivar,:));
- table(title,headers,labels,corr,size(labels,2)+2,8,4);
+ dyntable(title,headers,labels,corr,size(labels,2)+2,8,4);
end
ar = options_.ar;
@@ -86,7 +86,7 @@ function disp_moments(y,var_list)
int2str(options_.hp_filter) ')'];
end
headers = strvcat('VARIABLE',int2str([1:ar]'));
- table(title,headers,labels,autocorr,size(labels,2)+2,8,4);
+ dyntable(title,headers,labels,autocorr,size(labels,2)+2,8,4);
end
warning(warning_old_state);
diff --git a/matlab/disp_th_moments.m b/matlab/disp_th_moments.m
index 16e00c6872..52d423bdee 100644
--- a/matlab/disp_th_moments.m
+++ b/matlab/disp_th_moments.m
@@ -57,7 +57,7 @@ function disp_th_moments(dr,var_list)
title = [title ' (HP filter, lambda = ' int2str(options_.hp_filter) ')'];
end
headers=strvcat('VARIABLE','MEAN','STD. DEV.','VARIANCE');
- table(title,headers,deblank(M_.endo_names(ivar,:)),z,lh,11,4);
+ dyntable(title,headers,deblank(M_.endo_names(ivar,:)),z,lh,11,4);
if M_.exo_nbr > 1
disp(' ')
title='VARIANCE DECOMPOSITION (in percent)';
@@ -68,7 +68,7 @@ function disp_th_moments(dr,var_list)
headers = M_.exo_names;
headers(M_.exo_names_orig_ord,:) = headers;
headers = strvcat(' ',headers);
- table(title,headers,deblank(M_.endo_names(ivar(i1),:)),100*oo_.gamma_y{options_.ar+2}(i1,:), ...
+ dyntable(title,headers,deblank(M_.endo_names(ivar(i1),:)),100*oo_.gamma_y{options_.ar+2}(i1,:), ...
lh,8,2);
end
end
@@ -82,7 +82,7 @@ function disp_th_moments(dr,var_list)
labels = deblank(M_.endo_names(ivar,:));
headers = strvcat('Variables',labels(i1,:));
corr = oo_.gamma_y{1}(i1,i1)./(sd(i1)*sd(i1)');
- table(title,headers,labels(i1,:),corr,lh,8,4);
+ dyntable(title,headers,labels(i1,:),corr,lh,8,4);
end
if options_.ar > 0
@@ -98,7 +98,7 @@ function disp_th_moments(dr,var_list)
oo_.autocorr{i} = oo_.gamma_y{i+1};
z(:,i) = diag(oo_.gamma_y{i+1}(i1,i1));
end
- table(title,headers,labels,z,0,8,4);
+ dyntable(title,headers,labels,z,0,8,4);
end
% 10/09/02 MJ
diff --git a/matlab/table.m b/matlab/dyntable.m
similarity index 95%
rename from matlab/table.m
rename to matlab/dyntable.m
index 96edb29a56..71d33714a1 100644
--- a/matlab/table.m
+++ b/matlab/dyntable.m
@@ -1,4 +1,4 @@
-function table(title,headers,labels,values,label_width,val_width, ...
+function dyntable(title,headers,labels,values,label_width,val_width, ...
val_precis)
% Copyright (C) 2002 Dynare Team
diff --git a/matlab/stoch_simul.m b/matlab/stoch_simul.m
index 9b0f629661..b4880170bf 100644
--- a/matlab/stoch_simul.m
+++ b/matlab/stoch_simul.m
@@ -60,7 +60,7 @@ function info=stoch_simul(var_list)
labels = deblank(M_.exo_names);
headers = strvcat('Variables',labels);
lh = size(labels,2)+2;
- table(my_title,headers,labels,M_.Sigma_e,lh,10,6);
+ dyntable(my_title,headers,labels,M_.Sigma_e,lh,10,6);
disp(' ')
disp_dr(oo_.dr,options_.order,var_list);
end
--
GitLab