Octave compatibility fixes in graph decomposition

matlab/graph_decomp.m

@@ -189,7 +189,7 @@ for j=1:nvar
         hold on
         ht = text(0.3,y1+0.3*height,labels(i,:),'Interpreter','none');
         hold on
-        if interactive & (~isoctave & use_shock_groups)
+        if interactive && (~isoctave && use_shock_groups)
             mydata.fig_name = DynareOptions.plot_shock_decomp.fig_name(2:end);
             mydata.use_shock_groups = DynareOptions.plot_shock_decomp.use_shock_groups;
             mydata.shock_group = shock_groups.(shock_ind{i});

matlab/graph_decomp_detail.m

@@ -166,7 +166,7 @@ for j=1:nvar
             ineg=zz<0;
             hax = subplot(nrow,ncol,i); set(gca,'box','on')
             hbar = bar(x(2:end),(zz.*ipos)','stacked','FaceColor','flat');
-            if ~matlab_ver_less_than('9.3.0')
+            if ~isoctave && ~matlab_ver_less_than('9.3.0')
             % make bar obey colormap under MATLAB R2017b
             for k = 1:2
                 hbar(k).CData = k;
@@ -175,7 +175,7 @@ for j=1:nvar
             set(hbar,'edgecolor','flat');
             hold on,
             hbar = bar(x(2:end),(zz.*ineg)','stacked','FaceColor','flat');
-            if ~matlab_ver_less_than('9.3.0')
+            if ~isoctave && ~matlab_ver_less_than('9.3.0')
             % make bar obey colormap under MATLAB R2017b
             for k = 1:2
                 hbar(k).CData = k;
@@ -191,7 +191,7 @@ for j=1:nvar
             a0(4)=max(a(4),a0(4));
             set(gca,'ylim',a0(3:4))
             hold on, h1=plot(x(2:end),z1(end,:),'k-','LineWidth',2);
-            if interactive & (~isoctave & use_shock_groups)
+            if interactive && (~isoctave && use_shock_groups)
                 mydata.fig_name = DynareOptions.plot_shock_decomp.fig_name(2:end);
                 mydata.use_shock_groups = DynareOptions.plot_shock_decomp.use_shock_groups;
                 mydata.shock_group = shock_groups.(shock_ind{ic});