beautification for TOMS

Author: pancetta

pySDC/helpers/plot_helper.py

@@ -45,6 +45,7 @@ def setup_mpl(font_size=8):
             r"\usepackage[utf8x]{inputenc}",  # use utf8 fonts becasue your computer can handle it :)
             r"\usepackage[T1]{fontenc}",  # plots will be generated using this preamble
             r"\usepackage{underscore}",
+            r"\usepackage{amsmath,amssymb,marvosym}"
         ]
     }
     mpl.rcParams.update(pgf_with_latex)

pySDC/projects/TOMS/visualize_pySDC_with_PETSc.py

@@ -94,15 +94,15 @@ def visualize_matrix(result=None):
         tmax = max(tmax, item)
 
     plt_helper.setup_mpl()
-    plt_helper.newfig(textwidth=238.96, scale=1.33)
-
+    plt_helper.newfig(textwidth=120, scale=1.5)
     cmap = plt_helper.plt.get_cmap('RdYlGn_r')
     new_cmap = truncate_colormap(cmap, 0.1, 0.9)
-    plt_helper.plt.imshow(mat, origin='lower', norm=colors.LogNorm(vmin=tmin, vmax=tmax), cmap=new_cmap)
+    plt_helper.plt.imshow(mat, origin='lower', norm=colors.LogNorm(vmin=tmin, vmax=tmax), cmap=new_cmap, aspect='auto')
 
     for key, item in result.items():
         timing = "{:3.1f}".format(item)
-        plt_helper.plt.text(process_list.index(key[0]), process_list.index(key[1]), timing, ha='center', va='center')
+        plt_helper.plt.annotate(timing, xy=(process_list.index(key[0]), process_list.index(key[1])), size='x-small',
+                                ha='center', va='center')
 
     plt_helper.plt.xticks(range(dim), process_list)
     plt_helper.plt.yticks(range(dim), process_list)
@@ -136,7 +136,7 @@ def visualize_speedup(result=None):
             timing_PFASST[process_list_PFASST.index(key[0] * key[1])] = item
 
     plt_helper.setup_mpl()
-    plt_helper.newfig(textwidth=238.96, scale=1.33)
+    plt_helper.newfig(textwidth=120, scale=1.5)
 
     process_list_all = process_list_MLSDC + process_list_PFASST
     ideal = [timing_MLSDC[0] / nproc for nproc in process_list_all]

pySDC/projects/node_failure/postproc_grayscott.py

@@ -1,6 +1,8 @@
 import numpy as np
-# import os
-import matplotlib.pyplot as plt
+import os
+
+import pySDC.helpers.plot_helper as plt_helper
+
 from pylab import rcParams
 
 axis_font = {'fontname': 'Arial', 'size': '8', 'family': 'serif'}
@@ -43,6 +45,7 @@ def create_plots(cwd=''):
     nsteps = 0
     maxiter = 0
     vmax = -99
+    vmin = 99
     for file, strategy, label, color, marker in list:
         data = np.load(cwd + 'data/' + file)
 
@@ -60,10 +63,11 @@ def create_plots(cwd=''):
     data = np.load(cwd + 'data/' + ref)
     ref_iter_count = data['iter_count'][nprocs - 1::nprocs]
 
-    rcParams['figure.figsize'] = 6.0, 2.5
-    fig, ax = plt.subplots()
+    plt_helper.setup_mpl()
+
+    fig, ax = plt_helper.newfig(textwidth=238.96, scale=2.0, ratio=0.3)
 
-    plt.plot(range(nblocks), [0] * nblocks, 'k-', linewidth=2)
+    ax.plot(range(nblocks), [0] * nblocks, 'k-', linewidth=2)
 
     ymin = 99
     ymax = 0
@@ -76,23 +80,24 @@ def create_plots(cwd=''):
             ymin = min(ymin, min(iter_count - ref_iter_count))
             ymax = max(ymax, max(iter_count - ref_iter_count))
 
-            plt.plot(range(nblocks), iter_count - ref_iter_count, color=color, label=label, marker=marker, linestyle='',
-                     linewidth=lw, markersize=ms)
+            ax.plot(range(nblocks), iter_count - ref_iter_count, color=color, label=label, marker=marker, linestyle='',
+                    linewidth=lw, markersize=ms)
 
-    plt.xlabel('block', **axis_font)
-    plt.ylabel('$K_\\mathrm{add}$', **axis_font)
-    plt.title('ALL')
-    plt.xlim(-1, nblocks)
-    plt.ylim(-1 + ymin, ymax + 1)
-    plt.legend(loc=2, numpoints=1, fontsize=fs)
-    plt.tick_params(axis='both', which='major', labelsize=fs)
-    ax.xaxis.labelpad = -0.5
-    ax.yaxis.labelpad = -1
-    # plt.tight_layout()
+    ax.set_xlabel('block')
+    ax.set_ylabel(r'$K_\mathrm{add}$')
+    # ax.set_title('ALL')
+    ax.set_xlim(-1, nblocks)
+    ax.set_ylim(-1 + ymin, ymax + 1)
+    ax.legend(loc=2, numpoints=1, fontsize=fs)
+    ax.tick_params(axis='both', which='major', labelsize=fs)
 
-    fname = 'data/GRAYSCOTT_Kadd_vs_NOFAULT_hf.png'
-    plt.savefig(fname, bbox_inches='tight', rasterize=True)
-    # os.system('pdfcrop ' + fname + ' ' + fname)
+    # save plot, beautify
+    fname = 'data/GRAYSCOTT_Kadd_vs_NOFAULT_hf'
+    plt_helper.savefig(fname)
+
+    assert os.path.isfile(fname + '.pdf'), 'ERROR: plotting did not create PDF file'
+    assert os.path.isfile(fname + '.pgf'), 'ERROR: plotting did not create PGF file'
+    assert os.path.isfile(fname + '.png'), 'ERROR: plotting did not create PNG file'
 
     for file, strategy, label, color, marker in list:
 
@@ -104,46 +109,46 @@ def create_plots(cwd=''):
         residual[residual <= 0] = 1E-99
         residual = np.log10(residual)
 
-        rcParams['figure.figsize'] = 8.0, 2.0
-        fig, ax = plt.subplots()
+        fig, ax = plt_helper.newfig(textwidth=238.96, scale=2.0, ratio=0.3)
 
-        cmap = plt.get_cmap('Reds', vmax - vmin + 1)
-        pcol = plt.pcolor(residual, cmap=cmap, vmin=vmin, vmax=vmax)
+        cmap = plt_helper.plt.get_cmap('Reds', vmax - vmin + 1)
+        pcol = ax.pcolor(residual, cmap=cmap, vmin=vmin, vmax=vmax)
         pcol.set_edgecolor('face')
 
         if file is not ref:
             for item in stats:
                 if item[0] in range(minstep, maxstep):
-                    plt.text(item[0] + 0.5 - (maxstep - nsteps), item[1] - 1 + 0.5, 'x', horizontalalignment='center',
-                             verticalalignment='center')
+                    ax.text(item[0] + 0.5 - (maxstep - nsteps), item[1] - 1 + 0.5, r'\text{\Lightning}',
+                            horizontalalignment='center', verticalalignment='center')
 
-        plt.axis([0, nsteps, 0, maxiter])
+        ax.axis([0, nsteps, 0, maxiter - 1])
 
         ticks = np.arange(vmin, vmax + 1, 2)
         tickpos = np.linspace(ticks[0] + 0.5, ticks[-1] - 0.5, len(ticks))
-        cax = plt.colorbar(pcol, ticks=tickpos, pad=0.02)
+        cax = plt_helper.plt.colorbar(pcol, ticks=tickpos, pad=0.02)
         cax.set_ticklabels(ticks)
         cax.ax.tick_params(labelsize=fs)
 
-        cax.set_label('log10(residual)', **axis_font)
-        plt.tick_params(axis='both', which='major', labelsize=fs)
-        ax.xaxis.labelpad = -0.5
-        ax.yaxis.labelpad = -0.5
+        cax.set_label('log10(residual)')
+        ax.tick_params(axis='both', which='major', labelsize=fs)
 
-        ax.set_xlabel('step', **axis_font)
-        ax.set_ylabel('iteration', **axis_font)
+        ax.set_xlabel('step')
+        ax.set_ylabel('iteration')
 
         ax.set_yticks(np.arange(1, maxiter, 2) + 0.5, minor=False)
         ax.set_xticks(np.arange(0, nsteps, xtick_dist) + 0.5, minor=False)
         ax.set_yticklabels(np.arange(1, maxiter, 2) + 1, minor=False)
         ax.set_xticklabels(np.arange(minstep, maxstep, xtick_dist), minor=False)
 
-        plt.title(strategy.replace('_', '-'))
+        # plt.title(strategy.replace('_', '-'))
         # plt.tight_layout()
 
-        fname = 'data/GRAYSCOTT_steps_vs_iteration_hf_' + strategy + '.png'
-        plt.savefig(fname, bbox_inches='tight', rasterize=True)
-        # os.system('pdfcrop ' + fname + ' ' + fname)
+        fname = 'data/GRAYSCOTT_steps_vs_iteration_hf_' + strategy
+        plt_helper.savefig(fname)
+
+        assert os.path.isfile(fname + '.pdf'), 'ERROR: plotting did not create PDF file'
+        assert os.path.isfile(fname + '.pgf'), 'ERROR: plotting did not create PGF file'
+        assert os.path.isfile(fname + '.png'), 'ERROR: plotting did not create PNG file'
 
 
 if __name__ == "__main__":