[Pkg-octave-commit] [SCM] dynare branch, master, updated. b78f627d1f9593d7b6b9c183aaf82ece738558ee
Sébastien Villemot
sebastien.villemot at ens.fr
Thu Jun 25 13:28:25 UTC 2009
The following commit has been merged in the master branch:
commit f0688d22eadbf5a191ad48a2757f4e59c67985f5
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date: Tue Jun 23 10:08:04 2009 +0200
Removed table-name-clash patch (incoporated upstream)
diff --git a/debian/changelog b/debian/changelog
index 0b81b0c..52afbf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dynare (4.0.4-1) UNRELEASED; urgency=low
* New upstream release:
+ debian/patches/bashisms-in-makefiles:
- Dropped, incorporated upstream.
+ + debian/patches/table-name-clash:
+ - Dropped, incorporated upstream.
-- Sébastien Villemot <sebastien.villemot at ens.fr> Tue, 23 Jun 2009 09:52:56 +0200
diff --git a/debian/patches/series b/debian/patches/series
index b56588b..8e6e325 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
extra-addpath
fhs-compliance
-table-name-clash
rows-name-clash
build-matlab
manual-fix-for-debian
diff --git a/debian/patches/table-name-clash b/debian/patches/table-name-clash
deleted file mode 100644
index 1fbbc0f..0000000
--- a/debian/patches/table-name-clash
+++ /dev/null
@@ -1,171 +0,0 @@
-Fixes the name clash of Dynare table.m with Octave's by renaming it to dyntable.m
---- a/matlab/table.m
-+++ /dev/null
-@@ -1,42 +0,0 @@
--function table(title,headers,labels,values,label_width,val_width, ...
-- val_precis)
--
--% Copyright (C) 2002 Dynare Team
--%
--% This file is part of Dynare.
--%
--% Dynare is free software: you can redistribute it and/or modify
--% it under the terms of the GNU General Public License as published by
--% the Free Software Foundation, either version 3 of the License, or
--% (at your option) any later version.
--%
--% Dynare is distributed in the hope that it will be useful,
--% but WITHOUT ANY WARRANTY; without even the implied warranty of
--% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--% GNU General Public License for more details.
--%
--% You should have received a copy of the GNU General Public License
--% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
--
-- label_width = max(size(deblank(strvcat(headers(1,:),labels)),2)+2, ...
-- label_width);
-- val_width = max(size(deblank(headers(2:end,:)),2)+2,val_width);
-- label_fmt = sprintf('%%-%ds',label_width);
-- header_fmt = sprintf('%%-%ds',val_width);
-- val_fmt = sprintf('%%%d.%df',val_width,val_precis);
-- if length(title) > 0
-- disp(sprintf('\n\n%s\n',title));
-- end
-- if length(headers) > 0
-- hh = sprintf(label_fmt,headers(1,:));
-- hh = [hh char(32*ones(1,floor(val_width/4)))];
-- for i=2:size(headers,1)
-- hh = [hh sprintf(header_fmt,headers(i,:))];
-- end
-- disp(hh);
-- end
-- for i=1:size(values,1)
-- disp([sprintf(label_fmt,labels(i,:)) sprintf(val_fmt,values(i,:))]);
-- end
--
--% 10/30/02 MJ
-\ No newline at end of file
---- /dev/null
-+++ b/matlab/dyntable.m
-@@ -0,0 +1,42 @@
-+function dyntable(title,headers,labels,values,label_width,val_width, ...
-+ val_precis)
-+
-+% Copyright (C) 2002 Dynare Team
-+%
-+% This file is part of Dynare.
-+%
-+% Dynare is free software: you can redistribute it and/or modify
-+% it under the terms of the GNU General Public License as published by
-+% the Free Software Foundation, either version 3 of the License, or
-+% (at your option) any later version.
-+%
-+% Dynare is distributed in the hope that it will be useful,
-+% but WITHOUT ANY WARRANTY; without even the implied warranty of
-+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+% GNU General Public License for more details.
-+%
-+% You should have received a copy of the GNU General Public License
-+% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
-+
-+ label_width = max(size(deblank(strvcat(headers(1,:),labels)),2)+2, ...
-+ label_width);
-+ val_width = max(size(deblank(headers(2:end,:)),2)+2,val_width);
-+ label_fmt = sprintf('%%-%ds',label_width);
-+ header_fmt = sprintf('%%-%ds',val_width);
-+ val_fmt = sprintf('%%%d.%df',val_width,val_precis);
-+ if length(title) > 0
-+ disp(sprintf('\n\n%s\n',title));
-+ end
-+ if length(headers) > 0
-+ hh = sprintf(label_fmt,headers(1,:));
-+ hh = [hh char(32*ones(1,floor(val_width/4)))];
-+ for i=2:size(headers,1)
-+ hh = [hh sprintf(header_fmt,headers(i,:))];
-+ end
-+ disp(hh);
-+ end
-+ for i=1:size(values,1)
-+ disp([sprintf(label_fmt,labels(i,:)) sprintf(val_fmt,values(i,:))]);
-+ end
-+
-+% 10/30/02 MJ
-\ No newline at end of file
---- a/matlab/disp_moments.m
-+++ b/matlab/disp_moments.m
-@@ -57,7 +57,7 @@
- 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 @@
- 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 @@
- 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);
---- a/matlab/disp_th_moments.m
-+++ b/matlab/disp_th_moments.m
-@@ -57,7 +57,7 @@
- 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 @@
- 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 @@
- 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 @@
- 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
---- a/matlab/stoch_simul.m
-+++ b/matlab/stoch_simul.m
-@@ -60,7 +60,7 @@
- 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
--
dynare
More information about the Pkg-octave-commit
mailing list