diff --git a/license.txt b/license.txt index aa420ab47..fdbc86805 100644 --- a/license.txt +++ b/license.txt @@ -192,21 +192,6 @@ Copyright: 2011-2018 European Commission 2011-2023 Dynare Team License: GPL-3+ -Files: matlab/gsa/pick.m -Copyright: none -License: public-domain-jrc - This software has been developed at the Joint Research Centre of European Commission - by officers in the course of their official duties. This software is not subject to copyright - protection and is in the public domain. It is an experimental system. The Joint Research Centre - of European Commission assumes no responsibility whatsoever for its use by other parties - and makes no guarantees, expressed or implied, about its quality, reliability, or any other - characteristic. We would appreciate acknowledgement if the software is used. -Comment: 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 - (EC Fifth Framework Programme, SCA Project, IST-1999-11313, DG-INFSO). - Files: matlab/optimization/simpsa.m matlab/optimization/simpsaget.m matlab/optimization/simpsaset.m Copyright: 2005 Henning Schmidt, FCC, henning@fcc.chalmers.se 2006 Brecht Donckels, BIOMATH, brecht.donckels@ugent.be diff --git a/matlab/gsa/pick.m b/matlab/gsa/pick.m deleted file mode 100644 index de1cdabaf..000000000 --- a/matlab/gsa/pick.m +++ /dev/null @@ -1,91 +0,0 @@ -function pick -% -% Copyright © 2001-2017 European Commission -% Copyright © 2017-2023 DynareTeam - -% This file is part of GLUEWIN -% GLUEWIN is a MATLAB code designed for analysing the output -% of Monte Carlo runs when empirical observations of the model output are available -% and implements the GSA-GLUE methodology by Ratto et al. [1], based on a combination -% of GLUE (Generalised Likelihood Uncertainty Estimation) by K. Beven [2] and GSA -% Global Sensitivity Analysis) [3].'] -% 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 -% (EC Fifth Framework Programme, SCA Project, IST-1999-11313, DG-INFSO). -% -% The graphical layout of the code is inspired by the freeware GLUE package by K. Beven, -% vailable at the Lancaster University web site on the page [4]: -% http://www.es.lancs.ac.uk/hfdg/glue.html -% to which the GLUEWIN code introduces several extensions and additional options. -% Thanks are due to R. Girardi, A. Rossi, A. Saltelli, S. Tarantola and U. Callies for numerous -% comments and suggestions. -% For more information, please contact marco.ratto@ec.europa.eu -% -% Disclaimer: This software has been developed at the Joint Research Centre of European Commission -% by officers in the course of their official duties. This software is not subject to copyright -% protection and is in the public domain. It is an experimental system. The Joint Research Centre -% of European Commission assumes no responsibility whatsoever for its use by other parties -% and makes no guarantees, expressed or implied, about its quality, reliability, or any other -% characteristic. We would appreciate acknowledgement if the software is used. -% -% [1] Ratto, M., Tarantola, S., A. Saltelli, Sensitivity analysis in model calibration: GSA-GLUE approach. -% 'Computer Physics Communications, 136, 2001, 212-224 -% [2] Beven K.J., Binley A., The Future of Distributed Models: Model Calibration and Uncertainty -% 'Prediction, Hydrological Processes, 6, 279-298, 1992 -% [3] Saltelli, A., K. Chan, M. Scott, Editors, (2000), Sensitivity analysis, John Wiley & Sons -% 'publishers, Probability and Statistics series. -% [4] Beven K., GLUE for Windows User manual, 1998. - - - -pmenu=findobj(gcf,'type','uicontextmenu','Tag','Run viewer'); -button1=findobj(gcf,'type','uimenu','Tag','save params'); -button2=findobj(gcf,'type','uimenu','Tag','eval params'); -%button=get(pmenu,'children'); -gg=gco; -ax0=gca; -set(gg,'buttondownfcn',[]); -c=get(gca,'currentpoint'); -x=c(1,1); -y=c(1,2); -X=get(gco,'xdata'); -Y=get(gco,'ydata'); -dx=get(gca,'xlim'); -dy=get(gca,'ylim'); -pos=get(gca,'position'); -scalex=dx(2)-dx(1); -scaley=dy(2)-dy(1); -if length(X)>1 - K = dsearchn([(Y./scaley)' (X./scalex)'],[y/scaley x/scalex]); -else - az=get(gca,'children'); - T =get(az(end),'ydata'); - [dum K]=max(T); -end - -KK=K; - -set(button1,'Label',['Save ',num2str(K)],'Callback',['scatter_callback(',num2str(KK),',''save'')']); -set(button2,'Label',['Eval ',num2str(K)],'Callback',['scatter_callback(',num2str(KK),',''eval'')']); -hh_obj=findobj(gcf,'type','axes','Tag','scatter'); -for k=1:length(hh_obj) - axes(hh_obj(k)); - dum=get(gca,'children'); - dumx=get(dum(end),'xdata'); - dumy=get(dum(end),'ydata'); - xmid=min(dumx) + 0.5*(max(dumx)-min(dumx)); - hold on - plot(dumx(KK),dumy(KK),'or'); - if dumx(KK) < xmid - text(dumx(KK),dumy(KK),[' ',num2str(K)], ... - 'FontWeight','Bold',... - 'Color','r'); - else - text(dumx(KK),dumy(KK),[num2str(K),' '], ... - 'HorizontalAlignment','right', ... - 'FontWeight','Bold',... - 'Color','r'); - end - hold off -end \ No newline at end of file diff --git a/matlab/gsa/scatter_callback.m b/matlab/gsa/scatter_callback.m deleted file mode 100644 index d7f84826c..000000000 --- a/matlab/gsa/scatter_callback.m +++ /dev/null @@ -1,40 +0,0 @@ -function scatter_callback(K, type) -% -% Written by Marco Ratto -% Joint Research Centre, The European Commission, -% marco.ratto@ec.europa.eu -% - -% Copyright © 2017 European Commission -% Copyright © 2018 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 . - -global oo_ M_ options_ bayestopt_ estim_params_ - -x=get(gcf,'userdata'); -r2=x{1}; -x=x{2}; - -xparam1=x(K,:)'; - -switch type - case 'save' - save(['my_params_' int2str(K)],'xparam1') - case 'eval' - disp('Evaluating smoother ...') - [oo_, M_]=evaluate_smoother(xparam1, M_.endo_names, M_, oo_, options_, bayestopt_, estim_params_); -end diff --git a/matlab/gsa/scatter_plots.m b/matlab/gsa/scatter_plots.m index eeccd6eed..64e76b715 100644 --- a/matlab/gsa/scatter_plots.m +++ b/matlab/gsa/scatter_plots.m @@ -102,27 +102,6 @@ for i = 1:p plot(X(:,i),X(:,j),[plotsymbol,'b']) set(h,'Tag','scatter') - %% - if ~isoctave - % Define a context menu; it is not attached to anything - hcmenu = uicontextmenu('Callback','pick','Tag','Run viewer'); - % Define callbacks for context menu - % items that change linestyle - hcb1 = 'scatter_callback'; - % hcb2 = ['set(gco,''LineStyle'','':'')']; - % hcb3 = ['set(gco,''LineStyle'',''-'')']; - % % Define the context menu items and install their callbacks - item1 = uimenu(hcmenu,'Label','save','Callback',hcb1,'Tag','save params'); - item2 = uimenu(hcmenu,'Label','eval','Callback',hcb1,'Tag','eval params'); - % item3 = uimenu(hcmenu,'Label','solid','Callback',hcb3); - % Locate line objects - hlines = findall(h,'Type','line'); - % Attach the context menu to each line - for line = 1:length(hlines) - set(hlines(line),'uicontextmenu',hcmenu) - end - end - %% if ~isempty(xparam1) hold on, plot(xparam1(i),xparam1(j),'s','MarkerFaceColor',[0 0.75 0],'MarkerEdgeColor',[0 0.75 0]) end