Merge pull request #444 from theRealSuperMario/fix/logscale

Fix/logscale
nschloe · Nov 1, 2020 · 3c1e08e · 3c1e08e
2 parents 3ca706e + 25b685b
commit 3c1e08e
Show file tree

Hide file tree

Showing 2 changed files with 148 additions and 40 deletions.
diff --git a/test/test_cleanfigure.py b/test/test_cleanfigure.py
@@ -33,45 +33,6 @@ def test_plot(self):
             assert numLinesRaw - numLinesClean == 18
         plt.close("all")
 
-    def test_logplot(self):
-        x = np.logspace(-3, 3, 20)
-        y = np.logspace(-3, 3, 20)
-
-        with plt.rc_context(rc=RC_PARAMS):
-            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
-            ax.plot(x, y)
-            ax.set_xscale("log")
-            ax.set_yscale("log")
-            ax.set_ylim([10 ** (-2), 10 ** (2)])
-            ax.set_xlim([10 ** (-2), 10 ** (2)])
-            raw = get_tikz_code()
-
-            clean_figure(fig)
-            clean = get_tikz_code()
-            numLinesRaw = raw.count("\n")
-            numLinesClean = clean.count("\n")
-            assert numLinesRaw - numLinesClean == 11
-        plt.close("all")
-
-    def test_semilogplot(self):
-        x = np.logspace(-3, 3, 20)
-        y = np.linspace(1, 100, 20)
-
-        with plt.rc_context(rc=RC_PARAMS):
-            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
-            ax.plot(x, y)
-            ax.set_xscale("log")
-            ax.set_xlim([10 ** (-2), 10 ** (2)])
-            ax.set_ylim([20, 80])
-            raw = get_tikz_code()
-
-            clean_figure(fig)
-            clean = get_tikz_code()
-            numLinesRaw = raw.count("\n")
-            numLinesClean = clean.count("\n")
-            assert numLinesRaw - numLinesClean == 6
-        plt.close("all")
-
     def test_step(self):
         x = np.linspace(1, 100, 20)
         y = np.linspace(1, 100, 20)
@@ -556,6 +517,154 @@ def test_subplot(self):
         plt.close("all")
 
 
+class Test_logscale:
+    def test_ylog(self):
+        x = np.linspace(0, 3, 100)
+        y = np.exp(x)
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1)
+            ax.plot(x, y)
+            ax.set_yscale("log")
+            raw = get_tikz_code()
+            clean_figure()
+
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 98
+            assert numLinesClean == 25
+        plt.close("all")
+
+    def test_xlog(self):
+        y = np.linspace(0, 3, 100)
+        x = np.exp(y)
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1)
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            raw = get_tikz_code()
+            clean_figure()
+
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 98
+            assert numLinesClean == 25
+        plt.close("all")
+
+    def test_loglog(self):
+        x = np.exp(np.logspace(0, 5, 100))
+        y = np.exp(np.logspace(0, 5, 100))
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1)
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            ax.set_yscale("log")
+            raw = get_tikz_code()
+            clean_figure()
+
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 98
+            assert numLinesClean == 27
+        plt.close("all")
+
+    def test_ylog_2(self):
+        x = np.arange(1, 100)
+        y = np.arange(1, 100)
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1)
+            ax.plot(x, y)
+            ax.set_yscale("log")
+            raw = get_tikz_code()
+            clean_figure()
+
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 51
+            assert numLinesClean == 71
+        plt.close("all")
+
+    def test_xlog_2(self):
+        x = np.arange(1, 100)
+        y = np.arange(1, 100)
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1)
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            raw = get_tikz_code()
+            clean_figure()
+
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 51
+            assert numLinesClean == 71
+        plt.close("all")
+
+    def test_loglog_2(self):
+        x = np.arange(1, 100)
+        y = np.arange(1, 100)
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1)
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            ax.set_yscale("log")
+            raw = get_tikz_code()
+            clean_figure()
+
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 97
+            assert numLinesClean == 27
+        plt.close("all")
+
+    def test_loglog_3(self):
+        x = np.logspace(-3, 3, 20)
+        y = np.logspace(-3, 3, 20)
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            ax.set_yscale("log")
+            ax.set_ylim([10 ** (-2), 10 ** (2)])
+            ax.set_xlim([10 ** (-2), 10 ** (2)])
+            raw = get_tikz_code()
+
+            clean_figure(fig)
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 18
+        plt.close("all")
+
+    def test_xlog_3(self):
+        x = np.logspace(-3, 3, 20)
+        y = np.linspace(1, 100, 20)
+
+        with plt.rc_context(rc=RC_PARAMS):
+            fig, ax = plt.subplots(1, 1, figsize=(5, 5))
+            ax.plot(x, y)
+            ax.set_xscale("log")
+            ax.set_xlim([10 ** (-2), 10 ** (2)])
+            ax.set_ylim([20, 80])
+            raw = get_tikz_code()
+
+            clean_figure(fig)
+            clean = get_tikz_code()
+            numLinesRaw = raw.count("\n")
+            numLinesClean = clean.count("\n")
+            assert numLinesRaw - numLinesClean == 18
+        plt.close("all")
+
+
 def test_memory():
     plt.plot(np.arange(100000))
     clean_figure()

diff --git a/tikzplotlib/_cleanfigure.py b/tikzplotlib/_cleanfigure.py
@@ -230,7 +230,6 @@ def _cleanline(fighandle, axhandle, linehandle, target_resolution, scale_precisi
 
         if not is3D:
             visual_data = _move_points_closer(xLim, yLim, visual_data)
-            visual_data = _get_visual_data(axhandle, visual_data, is3D)
 
         hasMarkers = not linehandle.get_marker() == "None"
         hasLines = not linehandle.get_linestyle() == "None"