#191 plotPosteriorClusterPlot now callable method of model

drbenvincent · Jun 2, 2017 · ab9fcdc · ab9fcdc
1 parent 1068d9b
commit ab9fcdc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/ddToolbox/models/Model.m b/ddToolbox/models/Model.m
@@ -416,6 +416,20 @@ function plotUnivarateSummary(obj, varargin)
             obj.export_it(plot_savename)
 
         end
+
+        function plotPosteriorClusterPlot(obj, subplot_handle)
+            %plotPosteriorClusterPlot(H) Plots posterior distributions for
+            % all experiments, in the axis handle H.
+
+            subplot(subplot_handle)
+            % TODO: put clusterPlot function code here rather than have it as a separate function?
+            clusterPlot(...
+                obj.coda,...
+                obj.data,...
+                [1 0 0],...
+                obj.plotOptions,...
+                obj.varList.discountFunctionParams)
+        end
 
 	end
 

diff --git a/ddToolbox/models/parametric_models/Parametric.m b/ddToolbox/models/parametric_models/Parametric.m
@@ -41,21 +41,13 @@ function plot(obj, varargin)
 
             % Plot univariate summary stats
             obj.plotUnivarateSummary('variablesToPlot', 'all')
-            % plot_savename = 'UnivariateSummary';
-            % variables = obj.varList.participantLevel;
-            % obj.coda.plotUnivariateSummaries(variables,...
-            %     obj.plotOptions,...
-            %     obj.data.getParticipantNames());
-            % obj.export_it(plot_savename)
+            % obj.export_it('UnivariateSummary')
 
             % summary figure of core discounting parameters
             plot_savename = 'summary_plot';
-            clusterPlot(...
-                obj.coda,...
-                obj.data,...
-                [1 0 0],...
-                obj.plotOptions,...
-                obj.varList.discountFunctionParams)
+            figure
+            h = subplot(1,1,1);
+            obj.plotPosteriorClusterPlot(h)
             obj.export_it(plot_savename)
 
 

diff --git a/ddToolbox/utils-plot/plot1Dclusters.m b/ddToolbox/utils-plot/plot1Dclusters.m
@@ -13,9 +13,6 @@ function plot1Dclusters(mcmcContainer, data, col, plotOptions, varInfo)
 
 % plot posteriors over log(k) for all participants
 
-
-figure(12), clf
-
 %% REAL EXPERIMENT DATA
 % build samples
 for p = 1:data.getNExperimentFiles()

diff --git a/ddToolbox/utils-plot/plot2Dclusters.m b/ddToolbox/utils-plot/plot2Dclusters.m
@@ -11,8 +11,6 @@ function plot2Dclusters(mcmcContainer, data, col, plotOptions, varInfo)
 
 probMass = 0.5;
 
-figure(12), clf
-
 % build samples
 for p = 1:data.getNExperimentFiles()
 	tempx = mcmcContainer.getSamplesAtIndex_asMatrix(p, {varInfo(1).name});