From 26536ba6bb6cd43f5ad95fda3c61b7f931fb498a Mon Sep 17 00:00:00 2001 From: Eric Ma Date: Wed, 29 Jul 2015 14:10:43 -0400 Subject: [PATCH 1/3] mep12 on arctest.py --- examples/pylab_examples/arctest.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/pylab_examples/arctest.py b/examples/pylab_examples/arctest.py index b915f0075c93..1134ef7c4e5b 100644 --- a/examples/pylab_examples/arctest.py +++ b/examples/pylab_examples/arctest.py @@ -1,18 +1,17 @@ -#!/usr/bin/env python -from pylab import * - +import matplotlib.pyplot as plt +import numpy as np def f(t): 'a damped exponential' - s1 = cos(2*pi*t) - e1 = exp(-t) - return multiply(s1, e1) + s1 = np.cos(2*np.pi*t) + e1 = np.exp(-t) + return np.multiply(s1, e1) -t1 = arange(0.0, 5.0, .2) +t1 = np.arange(0.0, 5.0, .2) -l = plot(t1, f(t1), 'ro') -setp(l, 'markersize', 30) -setp(l, 'markerfacecolor', 'b') +l = plt.plot(t1, f(t1), 'ro') +plt.setp(l, 'markersize', 30) +plt.setp(l, 'markerfacecolor', 'b') -show() +plt.show() From 5df58fa2a7ffd15ffd6cfbbf2a78a0ccf25df33a Mon Sep 17 00:00:00 2001 From: Eric Ma Date: Thu, 30 Jul 2015 00:33:56 -0400 Subject: [PATCH 2/3] changed np.multiply to simple multiplication --- examples/pylab_examples/arctest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pylab_examples/arctest.py b/examples/pylab_examples/arctest.py index 1134ef7c4e5b..5164ca324689 100644 --- a/examples/pylab_examples/arctest.py +++ b/examples/pylab_examples/arctest.py @@ -5,7 +5,7 @@ def f(t): 'a damped exponential' s1 = np.cos(2*np.pi*t) e1 = np.exp(-t) - return np.multiply(s1, e1) + return s1 * e1 t1 = np.arange(0.0, 5.0, .2) From 626655a280da52f5f59621f561ba71f90398801d Mon Sep 17 00:00:00 2001 From: Eric Ma Date: Thu, 30 Jul 2015 09:25:49 -0400 Subject: [PATCH 3/3] pep8 changes --- examples/pylab_examples/arctest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/pylab_examples/arctest.py b/examples/pylab_examples/arctest.py index 5164ca324689..35c12bee407d 100644 --- a/examples/pylab_examples/arctest.py +++ b/examples/pylab_examples/arctest.py @@ -1,9 +1,10 @@ import matplotlib.pyplot as plt import numpy as np + def f(t): 'a damped exponential' - s1 = np.cos(2*np.pi*t) + s1 = np.cos(2 * np.pi * t) e1 = np.exp(-t) return s1 * e1