From 0845aa8430119c2c4ffffecb4eb3e3cff1554d73 Mon Sep 17 00:00:00 2001 From: Marco Ratto Date: Fri, 3 Feb 2017 12:48:27 +0100 Subject: [PATCH] Fixed header and license of GSA. --- license.txt | 37 +++++++++++++++++++++++++++++- matlab/gsa/Morris_Measure_Groups.m | 5 ++++ matlab/gsa/Sampling_Function_2.m | 5 ++++ matlab/gsa/cumplot.m | 5 ++++ matlab/gsa/filt_mc_.m | 6 ++--- matlab/gsa/ghx2transition.m | 5 +--- matlab/gsa/gsa_plotmatrix.m | 5 ++++ matlab/gsa/gsa_skewness.m | 5 ++++ matlab/gsa/gsa_speed.m | 7 ++---- matlab/gsa/log_trans_.m | 5 ++++ matlab/gsa/map_calibration.m | 5 ++++ matlab/gsa/map_ident_.m | 5 ++++ matlab/gsa/mcf_analysis.m | 2 +- matlab/gsa/myboxplot.m | 5 ++++ matlab/gsa/myprctilecol.m | 5 ++++ matlab/gsa/pick.m | 2 +- matlab/gsa/prior_draw_gsa.m | 7 ++---- matlab/gsa/read_data.m | 7 ++---- matlab/gsa/redform_map.m | 7 ++---- matlab/gsa/redform_screen.m | 7 ++---- matlab/gsa/scatter_mcf.m | 7 +++--- matlab/gsa/smirnov.m | 7 ++---- matlab/gsa/stab_map_.m | 7 ++---- matlab/gsa/stab_map_1.m | 7 ++---- matlab/gsa/stab_map_2.m | 10 +++----- matlab/gsa/stand_.m | 8 ++++--- matlab/gsa/tcrit.m | 4 ++-- matlab/gsa/teff.m | 4 ++-- matlab/gsa/trank.m | 4 ++-- 29 files changed, 125 insertions(+), 70 deletions(-) diff --git a/license.txt b/license.txt index a7b67d7ee..b284e9f24 100644 --- a/license.txt +++ b/license.txt @@ -86,8 +86,43 @@ Copyright: 2016 Benjamin Born and Johannes Pfeifer 2016 Dynare Team License: GPL-3+ +Files: matlab\gsa\Morris_Measure_Groups.m +matlab\gsa\Sampling_Function_2.m +Written by Jessica Cariboni and Francesca Campolongo +Joint Research Centre, The European Commission, +Copyright (C) 2005 European Commission +Copyright (C) 2012 Dynare Team + +Files: matlab\gsa\cumplot.m +matlab\gsa\filt_mc_.m +matlab\gsa\gsa_plotmatrix.m +matlab\gsa\gsa_skewness.m +matlab\gsa\gsa_speed.m +matlab\gsa\log_trans_.m +matlab\gsa\map_calibration.m +matlab\gsa\map_ident_.m +matlab\gsa\mcf_analysis.m +matlab\gsa\myboxplot.m +matlab\gsa\myprctilecol.m +matlab\gsa\prior_draw_gsa.m +matlab\gsa\read_data.m +matlab\gsa\redform_map.m +matlab\gsa\redform_screen.m +matlab\gsa\scatter_mcf.m +matlab\gsa\smirnov.m +matlab\gsa\stab_map_.m +matlab\gsa\stab_map_1.m +matlab\gsa\stab_map_2.m +matlab\gsa\stand_.m +matlab\gsa\tcrit.m +matlab\gsa\teff.m +matlab\gsa\trank.m +Copyright (C) 2011-2017 European Commission +Copyright (C) 2011-2017 Dynare Team + Files: matlab/gsa/pick.m -Copyright: 2001-2017 Marco Ratto +Copyright (C) 2001-2017 European Commission +This file is part of GLUEWIN The program has been developed by M. Ratto, European Commission, Joint Research Centre, Institute for the Protection and Security of The Citizen, Technological and Economic Risk Management, Applied Statistics, as a deliverable of the IMPACT project diff --git a/matlab/gsa/Morris_Measure_Groups.m b/matlab/gsa/Morris_Measure_Groups.m index 5b6c30720..dfd37bdd1 100644 --- a/matlab/gsa/Morris_Measure_Groups.m +++ b/matlab/gsa/Morris_Measure_Groups.m @@ -21,7 +21,12 @@ function [SAmeas, OutMatrix] = Morris_Measure_Groups(NumFact, Sample, Output, p, % OutMatrix (NumFactor*NumOutputs, 3)= [Mu*, Mu, StDev] % for each output it gives the three measures of each factor % ------------------------------------------------------------------------- +% +% Written by Jessica Cariboni and Francesca Campolongo +% Joint Research Centre, The European Commission, +% +% Copyright (C) 2005 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/Sampling_Function_2.m b/matlab/gsa/Sampling_Function_2.m index 9c3fea877..60255cafb 100644 --- a/matlab/gsa/Sampling_Function_2.m +++ b/matlab/gsa/Sampling_Function_2.m @@ -50,7 +50,12 @@ function [Outmatrix, OutFact] = Sampling_Function_2(p, k, r, UB, LB, GroupMat) % % F. Campolongo, J. Cariboni, JRC - IPSC Ispra, Varese, IT % Last Update: 15 November 2005 by J.Cariboni +% +% Written by Jessica Cariboni and Francesca Campolongo +% Joint Research Centre, The European Commission, +% +% Copyright (C) 2005 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/cumplot.m b/matlab/gsa/cumplot.m index 79aae60df..128e209ac 100644 --- a/matlab/gsa/cumplot.m +++ b/matlab/gsa/cumplot.m @@ -1,6 +1,11 @@ function h = cumplot(x); %function h =cumplot(x) +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu + +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/filt_mc_.m b/matlab/gsa/filt_mc_.m index aeca70b4e..90d90042e 100644 --- a/matlab/gsa/filt_mc_.m +++ b/matlab/gsa/filt_mc_.m @@ -11,11 +11,9 @@ function [rmse_MC, ixx] = filt_mc_(OutDir,options_gsa_,dataset_,dataset_info) % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012-2016 European Commission % Copyright (C) 2012-2016 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/ghx2transition.m b/matlab/gsa/ghx2transition.m index 46b463e36..072d8fe36 100644 --- a/matlab/gsa/ghx2transition.m +++ b/matlab/gsa/ghx2transition.m @@ -3,11 +3,8 @@ function [A,B] = ghx2transition(mm,iv,ic,aux) % % Adapted by M. Ratto (from kalman_transition_matrix.m) % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it +% marco.ratto@ec.europa.eu % -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. % Copyright (C) 2012 Dynare Team % diff --git a/matlab/gsa/gsa_plotmatrix.m b/matlab/gsa/gsa_plotmatrix.m index 4caadf407..9c9aee99f 100644 --- a/matlab/gsa/gsa_plotmatrix.m +++ b/matlab/gsa/gsa_plotmatrix.m @@ -1,7 +1,12 @@ function gsa_plotmatrix(type,varargin) % function gsa_plotmatrix(type,varargin) % extended version of the standard MATLAB plotmatrix +% +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu +% Copyright (C) 2011-2012 European Commission % Copyright (C) 2011-2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/gsa_skewness.m b/matlab/gsa/gsa_skewness.m index 01c8186a6..b5af1c6ce 100644 --- a/matlab/gsa/gsa_skewness.m +++ b/matlab/gsa/gsa_skewness.m @@ -1,5 +1,10 @@ function s=gsa_skewness(y), +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu + +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/gsa_speed.m b/matlab/gsa/gsa_speed.m index d0845c57f..9fce2e94b 100644 --- a/matlab/gsa/gsa_speed.m +++ b/matlab/gsa/gsa_speed.m @@ -3,12 +3,9 @@ function [tadj, iff] = gsa_speed(A,B,mf,p), % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/log_trans_.m b/matlab/gsa/log_trans_.m index da34bd480..d1a028e65 100644 --- a/matlab/gsa/log_trans_.m +++ b/matlab/gsa/log_trans_.m @@ -1,5 +1,10 @@ function [yy, xdir, isig, lam]=log_trans_(y0,xdir0,isig,lam) +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu + +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/map_calibration.m b/matlab/gsa/map_calibration.m index c9d95c4ce..d7dea5b5c 100644 --- a/matlab/gsa/map_calibration.m +++ b/matlab/gsa/map_calibration.m @@ -1,5 +1,10 @@ function map_calibration(OutputDirectoryName, Model, DynareOptions, DynareResults, EstimatedParameters, BayesInfo) +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu + +% Copyright (C) 2014-2016 European Commission % Copyright (C) 2014-2016 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/map_ident_.m b/matlab/gsa/map_ident_.m index 535f4bf33..7dc3873db 100644 --- a/matlab/gsa/map_ident_.m +++ b/matlab/gsa/map_ident_.m @@ -1,5 +1,10 @@ function map_ident_(OutputDirectoryName,opt_gsa) +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu + +% Copyright (C) 2012-2016 European Commission % Copyright (C) 2012-2016 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/mcf_analysis.m b/matlab/gsa/mcf_analysis.m index b01ba58e0..0b1e0640e 100644 --- a/matlab/gsa/mcf_analysis.m +++ b/matlab/gsa/mcf_analysis.m @@ -2,7 +2,7 @@ function indmcf = mcf_analysis(lpmat, ibeha, inobeha, options_mcf, DynareOptions % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% marco.ratto@jrc.ec.europa.eu +% marco.ratto@ec.europa.eu % % Copyright (C) 2014 European Commission diff --git a/matlab/gsa/myboxplot.m b/matlab/gsa/myboxplot.m index b83e5af13..b71ad169e 100644 --- a/matlab/gsa/myboxplot.m +++ b/matlab/gsa/myboxplot.m @@ -1,6 +1,11 @@ function sout = myboxplot (data,notched,symbol,vertical,maxwhisker) % sout = myboxplot (data,notched,symbol,vertical,maxwhisker) +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu + +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/myprctilecol.m b/matlab/gsa/myprctilecol.m index 1037a43e7..a71d21687 100644 --- a/matlab/gsa/myprctilecol.m +++ b/matlab/gsa/myprctilecol.m @@ -1,5 +1,10 @@ function y = myprctilecol(x,p); +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu + +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/pick.m b/matlab/gsa/pick.m index 6ed9c614d..87838acc5 100644 --- a/matlab/gsa/pick.m +++ b/matlab/gsa/pick.m @@ -1,6 +1,6 @@ function pick % -% Copyright: 2001-2017 Marco Ratto +% Copyright (C) 2001-2017 European Commission % % This file is part of GLUEWIN % GLUEWIN is a MATLAB code designed for analysing the output diff --git a/matlab/gsa/prior_draw_gsa.m b/matlab/gsa/prior_draw_gsa.m index 1e6672050..a54fda1b3 100644 --- a/matlab/gsa/prior_draw_gsa.m +++ b/matlab/gsa/prior_draw_gsa.m @@ -16,12 +16,9 @@ function pdraw = prior_draw_gsa(init,rdraw) % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012-2015 European Commission % Copyright (C) 2012-2015 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/read_data.m b/matlab/gsa/read_data.m index 7c7912f7c..85674bc5e 100644 --- a/matlab/gsa/read_data.m +++ b/matlab/gsa/read_data.m @@ -1,12 +1,9 @@ function [gend, data] = read_data() % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012-2015 European Commission % Copyright (C) 2012-2015 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/redform_map.m b/matlab/gsa/redform_map.m index 8cf74e697..4b1ceeb55 100644 --- a/matlab/gsa/redform_map.m +++ b/matlab/gsa/redform_map.m @@ -13,12 +13,9 @@ function redform_map(dirname,options_gsa_) % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012-2016 European Commission % Copyright (C) 2012-2016 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/redform_screen.m b/matlab/gsa/redform_screen.m index ab65d846a..ae1d8df74 100644 --- a/matlab/gsa/redform_screen.m +++ b/matlab/gsa/redform_screen.m @@ -8,12 +8,9 @@ function redform_screen(dirname, options_gsa_) % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012-2016 European Commission % Copyright (C) 2012-2016 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/scatter_mcf.m b/matlab/gsa/scatter_mcf.m index 0c4162990..f6f134a5c 100644 --- a/matlab/gsa/scatter_mcf.m +++ b/matlab/gsa/scatter_mcf.m @@ -1,9 +1,10 @@ function scatter_mcf(X,Y,vnames,plotsymbol, fnam, dirname, figtitle, xparam1, DynareOptions, beha_name, non_beha_name) -% Frontend to the Sensitivity Analysis Toolbox for DYNARE % -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu +% Copyright (C) 2014-2016 European Commission % Copyright (C) 2014-2016 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/smirnov.m b/matlab/gsa/smirnov.m index 9568d1e96..ed3b17397 100644 --- a/matlab/gsa/smirnov.m +++ b/matlab/gsa/smirnov.m @@ -4,12 +4,9 @@ function [H,prob,d] = smirnov(x1 , x2 , alpha, iflag ) % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/stab_map_.m b/matlab/gsa/stab_map_.m index f6e6d1eeb..7c931ffad 100644 --- a/matlab/gsa/stab_map_.m +++ b/matlab/gsa/stab_map_.m @@ -32,12 +32,9 @@ function x0 = stab_map_(OutputDirectoryName,opt_gsa) % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012-2016 European Commission % Copyright (C) 2012-2016 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/stab_map_1.m b/matlab/gsa/stab_map_1.m index a5818dd2c..5295d0e30 100644 --- a/matlab/gsa/stab_map_1.m +++ b/matlab/gsa/stab_map_1.m @@ -18,12 +18,9 @@ function [proba, dproba] = stab_map_1(lpmat, ibehaviour, inonbehaviour, aname, i % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu +% Copyright (C) 2012-2016 European Commission % Copyright (C) 2012-2016 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/stab_map_2.m b/matlab/gsa/stab_map_2.m index c72e4c0a3..35c3df82c 100644 --- a/matlab/gsa/stab_map_2.m +++ b/matlab/gsa/stab_map_2.m @@ -3,14 +3,10 @@ function indcorr = stab_map_2(x,alpha2, pvalue_crit, fnam, dirname,xparam1,figti % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it -% -% Reference: -% M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% marco.ratto@ec.europa.eu -% Copyright (C) 2012-2016 Dynare Team -% +% Copyright (C) 2011-2016 European Commission +% Copyright (C) 2011-2016 Dynare Team % This file is part of Dynare. % % Dynare is free software: you can redistribute it and/or modify diff --git a/matlab/gsa/stand_.m b/matlab/gsa/stand_.m index 46eb11598..c69ec4bf3 100644 --- a/matlab/gsa/stand_.m +++ b/matlab/gsa/stand_.m @@ -9,10 +9,12 @@ function [y, meany, stdy] = stand_(x) % my: Vector of mean values for each column of y % sy: Vector of standard deviations for each column of y % -% Author : Marco Ratto +% Written by Marco Ratto +% Joint Research Centre, The European Commission, +% marco.ratto@ec.europa.eu -% Copyright (C) 2012 Dynare Team -% +% Copyright (C) 2012 European Commission +% Copyright (C) 2012 Dynare Team% % This file is part of Dynare. % % Dynare is free software: you can redistribute it and/or modify diff --git a/matlab/gsa/tcrit.m b/matlab/gsa/tcrit.m index 2efd947e6..291725aad 100644 --- a/matlab/gsa/tcrit.m +++ b/matlab/gsa/tcrit.m @@ -6,9 +6,9 @@ function t_crit = tcrit(n,pval0) % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it +% marco.ratto@ec.europa.eu +% Copyright (C) 2011-2012 European Commission % Copyright (C) 2011-2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/teff.m b/matlab/gsa/teff.m index cd26b5a07..0956669a3 100644 --- a/matlab/gsa/teff.m +++ b/matlab/gsa/teff.m @@ -3,12 +3,12 @@ function [yt, j0, ir, ic]=teff(T,Nsam,istable) % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it +% marco.ratto@ec.europa.eu % % Reference: % M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare. diff --git a/matlab/gsa/trank.m b/matlab/gsa/trank.m index d788cf085..d6ac2d2db 100644 --- a/matlab/gsa/trank.m +++ b/matlab/gsa/trank.m @@ -4,12 +4,12 @@ function yr = trank(y); % % Written by Marco Ratto % Joint Research Centre, The European Commission, -% (http://eemc.jrc.ec.europa.eu/), -% marco.ratto@jrc.it +% marco.ratto@ec.europa.eu % % Reference: % M. Ratto, Global Sensitivity Analysis for Macroeconomic models, MIMEO, 2006. +% Copyright (C) 2012 European Commission % Copyright (C) 2012 Dynare Team % % This file is part of Dynare.