Merge remote-tracking branch 'rattoma/gsa'

matlab/gsa/scatter_callback.m

@@ -23,7 +23,7 @@ function  scatter_callback(K, type)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-global oo_ M_
+global oo_ M_ options_ bayestopt_ estim_params_
 
 x=get(gcf,'userdata');
 r2=x{1};
@@ -37,6 +37,6 @@ switch type
         
     case 'eval'
         disp('Evaluating smoother ...')
-        oo_=evaluate_smoother(xparam1,M_.endo_names);
+        [oo_, M_]=evaluate_smoother(xparam1,M_.endo_names,M_,oo_,options_,bayestopt_,estim_params_);
         % [rmse, lnam, r2,vv] = plot_fit(obsname{:});
 end

matlab/gsa/scatter_plots.m

@@ -1,5 +1,4 @@
 function scatter_plots(X,xp,vnames,plotsymbol, fnam, dirname, figtitle, xparam1, DynareOptions)
-
 %
 % Written by Marco Ratto
 % Joint Research Centre, The European Commission,
@@ -53,16 +52,17 @@ if nargin<4 || isempty(plotsymbol)
     end
 end
 
-if nargin<5
-    fnam='';
+if nargin<5 || isempty(fnam)
+    fnam='scatter_plot';
 end
-if nargin<6,
+if nargin<6 || isempty(dirname),
   dirname='';
   nograph=1;
+  DynareOptions.nodisplay=0;
 else
   nograph=0;    
 end
-if nargin<7,
+if nargin<7 || isempty(figtitle),
   figtitle=fnam;
 end
 if nargin<8,
@@ -75,7 +75,6 @@ fig_nam_=[fnam];
 if ~nograph,
     hh=dyn_figure(DynareOptions.nodisplay,'name',figtitle);
     set(hh,'userdata',{X,xp})
-end
 
 bf = 0.1;
 ffs = 0.05/(p-1);