tremove old debug code, n_walkers as function argument - cosmo - front and backend for Markov-Chain Monte Carlo inversion of cosmogenic nuclide concentrations
 (HTM) git clone git://src.adamsgaard.dk/cosmo
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 3fee2ba842e6ca5c1ff761a054b10d1c8feb86b0
 (DIR) parent 8546c6196e0f72af4813d1c20c0df7fbef27dc79
 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Thu, 27 Aug 2015 11:51:21 +0200
       
       remove old debug code, n_walkers as function argument
       
       Diffstat:
         M matlab/figure_save_multiformat.m    |       6 ------
         M matlab/file_scanner_mcmc_starter.m  |       4 ++++
         M matlab/generate_plots.m             |       1 -
         M matlab/mcmc_inversion.m             |       3 ++-
       
       4 files changed, 6 insertions(+), 8 deletions(-)
       ---
 (DIR) diff --git a/matlab/figure_save_multiformat.m b/matlab/figure_save_multiformat.m
       t@@ -5,17 +5,11 @@ function figure_save_multiformat(fig, basename, formats)
        % Example: 
        %    figure_save_multiformat(gcf, 'first_plot', ['fig', 'png', 'pdf'])
        
       -%keyboard
       -
        for i=1:length(formats)
            format = formats(i);
            if strcmp(format, 'fig')
       -        %disp('saving as fig')
                savefig(fig, strcat(basename, '.fig'));
            else
       -        %disp(['saving as ' format])
       -        %keyboard
       -        %figure(fig); % set current figure
                print(fig, basename, strcat('-d', cell2mat(format)));
            end
        end
        \ No newline at end of file
 (DIR) diff --git a/matlab/file_scanner_mcmc_starter.m b/matlab/file_scanner_mcmc_starter.m
       t@@ -27,6 +27,9 @@ debug = true; % show debugging output to matlab console
        % output graphics formats
        graphics_formats = {'fig', 'png', 'pdf'};
        
       +% number of MCMC walkers
       +n_walkers = 1;
       +
        %% initialization
        addpath(matlab_scripts_folder);
        
       t@@ -65,6 +68,7 @@ while 1
                
                % run inversion
                [Ss, save_file] = mcmc_inversion(matlab_scripts_folder, debug, ...
       +            n_walkers, ...
                    be_conc,  al_conc,  c_conc,  ne_conc, ...
                    be_uncer, al_uncer, c_uncer, ne_uncer, ...
                    be_prod,  al_prod,  c_prod,  ne_prod, ...
 (DIR) diff --git a/matlab/generate_plots.m b/matlab/generate_plots.m
       t@@ -196,7 +196,6 @@ set(fh(1),'pos',figpos1)
        figure(fh(1))
        
        for i=1:4
       -    figure_to_save = fh(i);
            figure_save_multiformat(figure(fh(i)), ...
                strcat(save_file, '-', num2str(i)), ...
                formats);
 (DIR) diff --git a/matlab/mcmc_inversion.m b/matlab/mcmc_inversion.m
       t@@ -1,4 +1,5 @@
        function [Ss, save_file] = mcmc_inversion(matlab_scripts_folder, debug, ...
       +    n_walkers, ...
            be_conc,  al_conc,  c_conc,  ne_conc, ...
            be_uncer, al_uncer, c_uncer, ne_uncer, ...
            be_prod,  al_prod,  c_prod,  ne_prod, ...
       t@@ -191,7 +192,7 @@ switch fs.g_case
        end %switch fs.g_case
        % keyboard
        %>........ For the MetHas algorithm
       -fs.Nwalkers = 1; %Number of random walks
       +fs.Nwalkers = n_walkers; %Number of random walks
        %fs.Nwalkers = 4; %Number of random walks
        fs.WalkerStartMode = 'PriorEdge';%'PriorSample'; 'PriorMean';'PriorCorner';'PriorEdge'
        fs.WalkerSeeds = 1:fs.Nwalkers; %must be at least fs.Nwalkers!