Merge pull request #276 from nschloe/contourf

Contourf

Author: nschloe

.circleci/config.yml

@@ -19,7 +19,7 @@ jobs:
       - run: apt update
       # <https://stackoverflow.com/a/44333806/353337>
       - run: DEBIAN_FRONTEND=noninteractive apt install tzdata
-      - run: apt install -y texlive-latex-base texlive-latex-extra python3-pip python3-tk
+      - run: apt install -y texlive-latex-base texlive-latex-extra python3-pip python3-tk python3-scipy
       - run: pip3 install -U pytest pytest-cov excode
       - checkout
       - run: cd ~/work

matplotlib2tikz/__about__.py

@@ -4,5 +4,5 @@
 __email__ = "[email protected]"
 __copyright__ = u"Copyright (c) 2010-2019, {} <{}>".format(__author__, __email__)
 __license__ = "License :: OSI Approved :: MIT License"
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 __status__ = "Development Status :: 5 - Production/Stable"

matplotlib2tikz/axes.py

@@ -76,14 +76,14 @@ def __init__(self, data, obj):
 
         # aspect ratio, plot width/height
         aspect = obj.get_aspect()
-        if aspect == "auto" or aspect == "normal":
+        if aspect in ["auto", "normal"]:
             aspect_num = None  # just take the given width/height values
         elif aspect == "equal":
             aspect_num = 1.0
         else:
             aspect_num = float(aspect)
 
-        self._width(data, aspect_num, xlim, ylim)
+        self._set_axis_dimensions(data, aspect_num, xlim, ylim)
 
         # axis positions
         xaxis_pos = obj.get_xaxis().label_position
@@ -163,7 +163,7 @@ def get_end_code(self, data):
 
         return ""
 
-    def _width(self, data, aspect_num, xlim, ylim):
+    def _set_axis_dimensions(self, data, aspect_num, xlim, ylim):
         if data["fwidth"] and data["fheight"]:
             # width and height overwrite aspect ratio
             self.axis_options.append("width=" + data["fwidth"])
@@ -193,12 +193,8 @@ def _width(self, data, aspect_num, xlim, ylim):
                     data["fwidth"] = str(1.0 / alpha) + "*" + data["fheight"]
                 self.axis_options.append("width=" + data["fwidth"])
         else:
-            if aspect_num:
-                print(
-                    "Non-automatic aspect ratio demanded, "
-                    "but neither height nor width of the plot are given. "
-                    "Discard aspect ratio."
-                )
+            # TODO keep an eye on https://tex.stackexchange.com/q/480058/13262
+            pass
         return
 
     def _ticks(self, data, obj):
@@ -453,17 +449,11 @@ def _get_label_rotation_and_horizontal_alignment(obj, data, axes_obj):
         if any(tick_labels_rotation) != 0:
             values.append("rotate={}".format(tick_labels_rotation[0]))
 
+        # Horizontal alignment will be ignored if no 'x/y tick label text width' has
+        # been passed in the 'extra' parameter
         if tick_label_text_width:
             values.append("align={}".format(tick_labels_horizontal_alignment[0]))
             values.append("text width={}".format(tick_label_text_width))
-        else:
-            print(
-                (
-                    "Horizontal alignment will be ignored as no '{} tick "
-                    "label text width' has been passed in the 'extra' "
-                    "parameter"
-                ).format(axes_obj)
-            )
 
         if values:
             label_style = "{}ticklabel style = {{{}}}".format(

matplotlib2tikz/save.py

@@ -38,7 +38,7 @@ def get_tikz_code(
     extra_axis_parameters=None,
     extra_tikzpicture_parameters=None,
     dpi=None,
-    show_info=True,
+    show_info=False,
     include_disclaimer=True,
     standalone=False,
     float_format="{:.15g}",

test/refresh_reference_files.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+import argparse
 import os
 import importlib.util
 
@@ -8,15 +9,18 @@
 
 
 def _main():
+    parser = argparse.ArgumentParser(description="Refresh the reference TeX files.")
+    parser.add_argument("files", nargs="+", help="Files to refresh")
+    args = parser.parse_args()
+
     this_dir = os.path.dirname(os.path.abspath(__file__))
     exclude_list = ["test_rotated_labels.py", "test_deterministic_output.py"]
-    for filename in os.listdir(this_dir):
+
+    for filename in args.files:
+        if filename in exclude_list:
+            continue
         if filename.startswith("test_") and filename.endswith(".py"):
             spec = importlib.util.spec_from_file_location("plot", filename)
-
-            if filename in exclude_list:
-                continue
-
             module = importlib.util.module_from_spec(spec)
             spec.loader.exec_module(module)
             module.plot()

test/test_annotate.py

@@ -32,12 +32,12 @@ def plot():
 
 
 def test():
-    assert_equality(plot, "test_annotate_reference.tex")
+    assert_equality(plot, __file__[:-3] + "_reference.tex")
     return
 
 
 if __name__ == "__main__":
     import helpers
 
-    # helpers.compare_mpl_latex(plot)
-    helpers.print_tree(plot())
+    helpers.compare_mpl_latex(plot)
+    # helpers.print_tree(plot())

test/test_basic_sin.py

@@ -31,5 +31,5 @@ def test():
 if __name__ == "__main__":
     import helpers
 
-    # helpers.compare_mpl_latex(plot)
-    helpers.print_tree(plot())
+    helpers.compare_mpl_latex(plot)
+    # helpers.print_tree(plot())

test/test_contourf.py

@@ -2,24 +2,43 @@
 #
 import matplotlib.pyplot as plt
 import numpy as np
+from scipy.stats import multivariate_normal
+
+from helpers import assert_equality
 
 
 def plot():
-    delta = 0.8
-    x = y = np.arange(-3.0, 3.01, delta)
-    X, Y = np.meshgrid(x, y)
-    Z1 = plt.mlab.bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
-    Z2 = plt.mlab.bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
-    Z = 10 * (Z1 - Z2)
-    levels = [-2, -1.5, -1.2, -0.9, -0.6, -0.3, 0.0, 0.3, 0.6, 0.9, 1.2, 1.5]
+    mean = np.array([1, 1])
+    cov = np.eye(2)
+    nbins = 5
+
     fig = plt.figure()
-    CS = plt.contourf(X, Y, Z, 10, levels=levels)
-    plt.contour(CS, levels=levels, colors="r")
+    ax = plt.gca()
+
+    x_max = 2
+    x_min = 0
+    y_max = 2
+    y_min = 0
+
+    xi, yi = np.mgrid[x_min : x_max : nbins * 1j, y_min : y_max : nbins * 1j]
+    pos = np.empty(xi.shape + (2,))
+    pos[:, :, 0] = xi
+    pos[:, :, 1] = yi
+    zi = multivariate_normal(mean, cov, allow_singular=True, seed=0).pdf(pos)
+    ax.contourf(xi, yi, zi, 250)
+
+    ax.set_xlim(x_min, x_max)
+    ax.set_ylim(y_min, y_max)
     return fig
 
 
-# TODO reintroduce
-# from helpers import assert_equality
-# def test():
-#     assert_equality(plot, __file__[:-3] + "_reference.tex")
-#     return
+def test():
+    assert_equality(plot, __file__[:-3] + "_reference.tex")
+    return
+
+
+if __name__ == "__main__":
+    import helpers
+
+    helpers.compare_mpl_latex(plot)
+    # helpers.print_tree(plot())