add PyPlot glue

Author: simonbyrne

.travis.yml

@@ -15,4 +15,4 @@ before_install:
 script:
   - julia -e 'Pkg.init(); run(`ln -s $(pwd()) $(Pkg.dir("KernelDensity"))`); Pkg.pin("KernelDensity"); Pkg.resolve()'
   - julia -e 'using KernelDensity; @assert isdefined(:KernelDensity); @assert typeof(KernelDensity) === Module'
-  - julia ./runtests.jl
+  - julia test/runtests.jl

README.md

@@ -57,10 +57,11 @@ e.g. `boundary` now takes a tuple of tuples `((xlo,xhi),(ylo,yhi))`.
 
 ## Plotting
 
-The [Winston.jl](https://github.com/nolta/Winston.jl) plotting package is currently
-supported. See
-[this notebook](http://nbviewer.ipython.org/github/JuliaStats/KernelDensity.jl/blob/master/examples/kde.ipynb)
-for an example.
+The [Winston.jl](https://github.com/nolta/Winston.jl) and
+[PyPlot.jl](https://github.com/stevengj/PyPlot.jl) plotting packages are
+currently supported. See the ijulia notebooks:
+* [Winston](http://nbviewer.ipython.org/github/JuliaStats/KernelDensity.jl/blob/master/examples/Winston.ipynb)
+* [PyPlot](http://nbviewer.ipython.org/github/JuliaStats/KernelDensity.jl/blob/master/examples/PyPlot.ipynb)
 
 We plan to include support for other plotting packages: please file an issue
 if your favourite one is not yet available.

examples/PyPlot.ipynb

@@ -22,5 +22,7 @@ macro glue(pkg)
 end
 
 @glue Winston
+@glue PyPlot
 
 end # module
+

examples/kde.ipynb renamed to examples/Winston.ipynb

@@ -0,0 +1,23 @@
+import PyPlot
+
+function PyPlot.plot(k::UnivariateKDE, args...; kwargs...)
+    PyPlot.plot(k.x, k.density, args...; kwargs...)
+end
+
+function PyPlot.contour(k::BivariateKDE, args...; kwargs...)
+    PyPlot.contour(k.x, k.y, k.density', args...; kwargs...)
+end
+function PyPlot.plot_surface(k::BivariateKDE, args...; kwargs...)
+    PyPlot.plot_surface(k.x, k.y, k.density', args...; kwargs...)
+end
+function PyPlot.surf(k::BivariateKDE, args...; kwargs...)
+    PyPlot.surf(k.x, k.y, k.density', args...; kwargs...)
+end
+
+function PyPlot.plot_wireframe(k::BivariateKDE, args...; kwargs...)
+    PyPlot.plot_wireframe(k.x, k.y, k.density', args...; kwargs...)
+end
+
+function PyPlot.imshow(k::BivariateKDE, args...; kwargs...)
+    PyPlot.imshow(k.density', args...; origin="lower", extent=[extrema(k.x)...,extrema(k.y)...], kwargs...)
+end

src/KernelDensity.jl

@@ -1,17 +1,16 @@
-using Winston
-import Winston: plot, imagesc
+import Winston
 
-function plot(p::FramedPlot, k::UnivariateKDE, args...; kwargs...)
-    plot(p, k.x, k.density, args...;  kwargs...)
+function Winston.plot(p::Winston.FramedPlot, k::UnivariateKDE, args...; kwargs...)
+    Winston.plot(p, k.x, k.density, args...;  kwargs...)
 end
 
-function plot(k::UnivariateKDE, args...; kwargs...)
-    plot(Winston.ghf(), k, args...; kwargs...)
+function Winston.plot(k::UnivariateKDE, args...; kwargs...)
+    Winston.plot(Winston.ghf(), k, args...; kwargs...)
 end
 
-function imagesc(k::BivariateKDE, clims::Winston.Interval; kwargs...)
-    imagesc(extrema(k.x), reverse(extrema(k.y)), k.density', clims; kwargs...)
+function Winston.imagesc(k::BivariateKDE, clims::Winston.Interval; kwargs...)
+    Winston.imagesc(extrema(k.x), reverse(extrema(k.y)), k.density', clims; kwargs...)
 end
-function imagesc(k::BivariateKDE; kwargs...)
-    imagesc(k, (0.0,maximum(k.density)); kwargs...)
+function Winston.imagesc(k::BivariateKDE; kwargs...)
+    Winston.imagesc(k, (0.0,maximum(k.density)); kwargs...)
 end