From ccabe197b38e324f32a7989bef1216c4bfb88863 Mon Sep 17 00:00:00 2001
From: Roger Herikstad <roger.herikstad@gmail.com>
Date: Sun, 27 Apr 2014 18:09:25 +0800
Subject: [PATCH 1/6] Adds type and functions for doing boxplots

---
 src/Winston.jl | 149 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/plot.jl    |  41 ++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/src/Winston.jl b/src/Winston.jl
index c67f6c9..df3ffcd 100644
--- a/src/Winston.jl
+++ b/src/Winston.jl
@@ -2033,6 +2033,155 @@ function make(self::Histogram, context::PlotContext)
     GroupPainter(getattr(self,:style), PathPainter(u, v))
 end
 
+type Boxplot <: PlotComponent
+    attr::PlotAttributes
+    median::Float64
+    quartiles::(Float64,Float64)
+    iqr::Float64
+    outliers::AbstractVector
+    notch::Bool
+    width::Float64
+    n::Int64
+    position::Float64
+
+
+    function Boxplot(median, quartiles, outliers, n,args...; kvs...)
+        self = new(Dict())
+        iniattr(self)
+        kw_init(self, args...; kvs...)
+        self.median = median
+        self.quartiles = quartiles
+        self.iqr = quartiles[2] - quartiles[1]
+        self.outliers = filter(x-> (x<quartiles[1]-1.5*self.iqr)&(x>quartiles[2]+1.5*self.iqr),outliers)
+        self.notch = get(args2dict(kvs...), :notch, false)
+        self.width=1.0
+        self.position = 1.0
+        self.n = n 
+        self
+    end
+end
+
+function Boxplot(X::Vector;kvs...)
+    #compute median and quartiles directly
+    Xs = sort(X)
+    m = median(X)
+    l = quantile(X,0.25)
+    h = quantile(X,0.75)
+    iqr = h-l
+    Boxplot(m,(l,h),X[(X.>h+1.5*iqr)&(X.<l-1.5*iqr)],length(X);kvs...)
+end
+
+function limits(self::Boxplot, window::BoundingBox)
+    if !isempty(self.outliers)
+        ymin = min(self.quartiles[1]-1.5*self.iqr,minimum(self.outliers))
+        ymax = max(self.quartiles[2]+1.5*self.iqr,maximum(self.outliers))
+    else
+        ymin = self.quartiles[1]-1.5*self.iqr
+        ymax = self.quartiles[2]+1.5*self.iqr
+    end
+    xl = self.position - 1.0*self.width
+    xr = self.position + 1.0*self.width
+    bounds_within([xl,xl,xr,xr],[ymin,ymax, ymin, ymax],  window)
+end
+
+function make(self::Boxplot, context::PlotContext)
+    objs = GroupPainter(getattr(self,:style))
+    xl = self.position - 0.5*self.width
+    xr = self.position + 0.5*self.width
+    xm = self.position
+
+    #draw notch
+    if self.notch 
+        xln = self.position - 0.25*self.width
+        xrn = self.position + 0.25*self.width
+        ymin = self.median-1.58*self.iqr/sqrt(self.n)
+        ymax = self.median+1.58*self.iqr/sqrt(self.n)
+        #top notch
+        p = project(context.geom, xln, self.median)
+        q = project(context.geom, xl, ymax)
+        push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+        p = project(context.geom, xrn, self.median)
+        q = project(context.geom, xr, ymax)
+        push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+        #bottom notch
+        p = project(context.geom, xln, self.median)
+        q = project(context.geom, xl, ymin)
+        push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+        p = project(context.geom, xrn, self.median)
+        q = project(context.geom, xr, ymin)
+        push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+        #median
+        p = project(context.geom, xrn, self.median)
+        q = project(context.geom, xln, self.median)
+        push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+        
+        #change the starting points for the quartile boxes
+        qtop = ymax 
+        qbottom = ymin
+    else
+        #median
+        p = project(context.geom, xl, self.median)
+        q = project(context.geom, xr, self.median)
+        m = LinePainter(Point(p[1],p[2]), Point(q[1],q[2]))
+        push!(objs,m)
+        qtop = self.median
+        qbottom = self.median
+    end
+
+    #quartiles
+    #horizontal lines
+    p = project(context.geom, xl, self.quartiles[1])
+    q = project(context.geom, xr, self.quartiles[1])
+    l1 = LinePainter(Point(p[1],p[2]), Point(q[1],q[2]))
+    push!(objs,l1)
+    p = project(context.geom, xl, self.quartiles[2])
+    q = project(context.geom, xr, self.quartiles[2])
+    l2 = LinePainter(Point(p[1],p[2]), Point(q[1],q[2]))
+    push!(objs,l2)
+    
+    #vertical lines
+    p = project(context.geom, xl, qtop)
+    q = project(context.geom, xl, self.quartiles[2])
+    push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+    p = project(context.geom, xl, qbottom)
+    q = project(context.geom, xl, self.quartiles[1])
+    push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+
+    p = project(context.geom, xr, qtop)
+    q = project(context.geom, xr, self.quartiles[2])
+    push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+    p = project(context.geom, xr, qbottom)
+    q = project(context.geom, xr, self.quartiles[1])
+    push!(objs,LinePainter(Point(p[1],p[2]), Point(q[1],q[2])))
+
+    #draw the whiskers
+    xlm = xm - 0.25*self.width
+    xrm = xm + 0.25*self.width
+    p = project(context.geom, xm, self.quartiles[1])
+    q = project(context.geom, xm, self.quartiles[1]-1.5*self.iqr)
+    l5 = LinePainter(Point(p[1],p[2]), Point(q[1],q[2]))
+    push!(objs,l5)
+    p = project(context.geom, xlm, self.quartiles[1]-1.5*self.iqr)
+    q = project(context.geom, xrm, self.quartiles[1]-1.5*self.iqr)
+    l6 = LinePainter(Point(p[1],p[2]), Point(q[1],q[2]))
+    push!(objs,l6)
+
+    p = project(context.geom, xm, self.quartiles[2])
+    q = project(context.geom, xm, self.quartiles[2]+1.5*self.iqr)
+    l7 = LinePainter(Point(p[1],p[2]), Point(q[1],q[2]))
+    push!(objs,l7)
+    p = project(context.geom, xlm, self.quartiles[2]+1.5*self.iqr)
+    q = project(context.geom, xrm, self.quartiles[2]+1.5*self.iqr)
+    l8 = LinePainter(Point(p[1],p[2]), Point(q[1],q[2]))
+    push!(objs,l8)
+    #outliers
+    for o in self.outliers
+        p = project(context.geom, xm, o)
+        push!(objs, SymbolPainter(Point(p[1],p[2])))
+    end
+    objs
+end
+
 type LineX <: LineComponent
     attr::PlotAttributes
     x::Float64
diff --git a/src/plot.jl b/src/plot.jl
index 534aecc..2abec66 100644
--- a/src/plot.jl
+++ b/src/plot.jl
@@ -381,6 +381,47 @@ end
 plothist(p::FramedPlot, args...; kvs...) = plothist(p::FramedPlot, hist(args...); kvs...)
 plothist(args...; kvs...) = plothist(ghf(), args...; kvs...)
 
+boxplot(args...; kvs...) = boxplot(ghf(), args...; kvs...)
+
+function boxplot(p::FramedPlot, h::Matrix;kvs...)
+    for i=1:size(h,2)
+        b = Boxplot(h[:,i];kvs...)
+        b.position = 1.1*b.width*i
+        boxplot(p,b;kvs...)
+    end
+    p
+end
+
+function boxplot(p::FramedPlot, h::Vector;kvs...)
+    b = Boxplot(h;kvs...)
+    boxplot(p,b;kvs...)
+end
+
+function boxplot(p::FramedPlot, h::(Float64,(Float64,Float64),Vector);kvs...)
+    b = Boxplot(h...;kvs...)
+    boxplot(p,b;kvs...)
+end
+
+function boxplot(p::FramedPlot, b::Boxplot;kvs...)
+    #messy...
+    dd = args2dict(kvs...)
+    if :position in keys(dd)
+        setattr(b,:position, dd[:position])
+        b.position = dd[:position]
+    end
+    add(p,b)
+    for (k,v) in kvs
+        if k in [:color,:linecolor,:linekind,:linetype,:linewidth]
+            style(b, k, v)
+        else
+            setattr(p, k, v)
+        end
+    end
+
+    global _pwinston = p
+    p
+end
+
 # 3x3 gaussian
 #_default_kernel2d=[.05 .1 .05; .1 .4 .1; .05 .1 .05]
 

From a9e8c465f25794cbd706565ba597184048c26f5c Mon Sep 17 00:00:00 2001
From: Roger Herikstad <roger.herikstad@gmail.com>
Date: Sun, 27 Apr 2014 18:18:24 +0800
Subject: [PATCH 2/6] Adds exporting of new function boxplot and type Boxplot

---
 src/Winston.jl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Winston.jl b/src/Winston.jl
index df3ffcd..922b71e 100644
--- a/src/Winston.jl
+++ b/src/Winston.jl
@@ -19,6 +19,7 @@ export
     plot,
     plothist,
     plothist2d,
+    boxplot,
     savefig,
     scatter,
     semilogx,
@@ -37,7 +38,8 @@ export
     FramedPlot,
     Plot,
     Table,
-
+    
+    Boxplot,
     Curve,
     FillAbove,
     FillBelow,

From 6e2adc7c07521bbcaa259d9781a75faa22097547 Mon Sep 17 00:00:00 2001
From: Roger Herikstad <roger.herikstad@gmail.com>
Date: Sun, 27 Apr 2014 18:28:48 +0800
Subject: [PATCH 3/6] Fixes a problem where outliers were not plotted

---
 src/Winston.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Winston.jl b/src/Winston.jl
index 922b71e..09a26bf 100644
--- a/src/Winston.jl
+++ b/src/Winston.jl
@@ -2054,7 +2054,7 @@ type Boxplot <: PlotComponent
         self.median = median
         self.quartiles = quartiles
         self.iqr = quartiles[2] - quartiles[1]
-        self.outliers = filter(x-> (x<quartiles[1]-1.5*self.iqr)&(x>quartiles[2]+1.5*self.iqr),outliers)
+        self.outliers = filter(x-> (x<quartiles[1]-1.5*self.iqr)|(x>quartiles[2]+1.5*self.iqr),outliers)
         self.notch = get(args2dict(kvs...), :notch, false)
         self.width=1.0
         self.position = 1.0
@@ -2070,7 +2070,7 @@ function Boxplot(X::Vector;kvs...)
     l = quantile(X,0.25)
     h = quantile(X,0.75)
     iqr = h-l
-    Boxplot(m,(l,h),X[(X.>h+1.5*iqr)&(X.<l-1.5*iqr)],length(X);kvs...)
+    Boxplot(m,(l,h),X[(X.>h+1.5*iqr)|(X.<l-1.5*iqr)],length(X);kvs...)
 end
 
 function limits(self::Boxplot, window::BoundingBox)

From 6bb3d901c6d8e8c11eab580946504923d82e1087 Mon Sep 17 00:00:00 2001
From: Roger Herikstad <roger.herikstad@gmail.com>
Date: Fri, 9 May 2014 10:22:07 +0800
Subject: [PATCH 4/6] Change name from 'boxplot' to 'quartilebox'

---
 src/Winston.jl | 16 ++++++++--------
 src/plot.jl    | 22 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Winston.jl b/src/Winston.jl
index 09a26bf..a7deab1 100644
--- a/src/Winston.jl
+++ b/src/Winston.jl
@@ -19,7 +19,7 @@ export
     plot,
     plothist,
     plothist2d,
-    boxplot,
+    quartileboxes,
     savefig,
     scatter,
     semilogx,
@@ -39,7 +39,7 @@ export
     Plot,
     Table,
     
-    Boxplot,
+    QuartileBoxes,
     Curve,
     FillAbove,
     FillBelow,
@@ -2035,7 +2035,7 @@ function make(self::Histogram, context::PlotContext)
     GroupPainter(getattr(self,:style), PathPainter(u, v))
 end
 
-type Boxplot <: PlotComponent
+type QuartileBoxes <: PlotComponent
     attr::PlotAttributes
     median::Float64
     quartiles::(Float64,Float64)
@@ -2047,7 +2047,7 @@ type Boxplot <: PlotComponent
     position::Float64
 
 
-    function Boxplot(median, quartiles, outliers, n,args...; kvs...)
+    function QuartileBoxes(median, quartiles, outliers, n,args...; kvs...)
         self = new(Dict())
         iniattr(self)
         kw_init(self, args...; kvs...)
@@ -2063,17 +2063,17 @@ type Boxplot <: PlotComponent
     end
 end
 
-function Boxplot(X::Vector;kvs...)
+function QuartileBoxes(X::Vector;kvs...)
     #compute median and quartiles directly
     Xs = sort(X)
     m = median(X)
     l = quantile(X,0.25)
     h = quantile(X,0.75)
     iqr = h-l
-    Boxplot(m,(l,h),X[(X.>h+1.5*iqr)|(X.<l-1.5*iqr)],length(X);kvs...)
+    QuartileBoxes(m,(l,h),X[(X.>h+1.5*iqr)|(X.<l-1.5*iqr)],length(X);kvs...)
 end
 
-function limits(self::Boxplot, window::BoundingBox)
+function limits(self::QuartileBoxes, window::BoundingBox)
     if !isempty(self.outliers)
         ymin = min(self.quartiles[1]-1.5*self.iqr,minimum(self.outliers))
         ymax = max(self.quartiles[2]+1.5*self.iqr,maximum(self.outliers))
@@ -2086,7 +2086,7 @@ function limits(self::Boxplot, window::BoundingBox)
     bounds_within([xl,xl,xr,xr],[ymin,ymax, ymin, ymax],  window)
 end
 
-function make(self::Boxplot, context::PlotContext)
+function make(self::QuartileBoxes, context::PlotContext)
     objs = GroupPainter(getattr(self,:style))
     xl = self.position - 0.5*self.width
     xr = self.position + 0.5*self.width
diff --git a/src/plot.jl b/src/plot.jl
index 2abec66..1b51e3c 100644
--- a/src/plot.jl
+++ b/src/plot.jl
@@ -381,28 +381,28 @@ end
 plothist(p::FramedPlot, args...; kvs...) = plothist(p::FramedPlot, hist(args...); kvs...)
 plothist(args...; kvs...) = plothist(ghf(), args...; kvs...)
 
-boxplot(args...; kvs...) = boxplot(ghf(), args...; kvs...)
+quartileboxes(args...; kvs...) = quartileboxes(ghf(), args...; kvs...)
 
-function boxplot(p::FramedPlot, h::Matrix;kvs...)
+function quartileboxes(p::FramedPlot, h::Matrix;kvs...)
     for i=1:size(h,2)
-        b = Boxplot(h[:,i];kvs...)
+        b = QuartileBoxes(h[:,i];kvs...)
         b.position = 1.1*b.width*i
-        boxplot(p,b;kvs...)
+        quartileboxes(p,b;kvs...)
     end
     p
 end
 
-function boxplot(p::FramedPlot, h::Vector;kvs...)
-    b = Boxplot(h;kvs...)
-    boxplot(p,b;kvs...)
+function quartileboxes(p::FramedPlot, h::Vector;kvs...)
+    b = QuartileBoxes(h;kvs...)
+    quartileboxes(p,b;kvs...)
 end
 
-function boxplot(p::FramedPlot, h::(Float64,(Float64,Float64),Vector);kvs...)
-    b = Boxplot(h...;kvs...)
-    boxplot(p,b;kvs...)
+function quartileboxes(p::FramedPlot, h::(Float64,(Float64,Float64),Vector);kvs...)
+    b = QuartileBoxes(h...;kvs...)
+    quartileboxes(p,b;kvs...)
 end
 
-function boxplot(p::FramedPlot, b::Boxplot;kvs...)
+function quartileboxes(p::FramedPlot, b::QuartileBoxes;kvs...)
     #messy...
     dd = args2dict(kvs...)
     if :position in keys(dd)

From 7f0c4f6bb1b2bfe1850f823599be71b6a4515b97 Mon Sep 17 00:00:00 2001
From: Roger Herikstad <roger.herikstad@gmail.com>
Date: Fri, 9 May 2014 10:22:26 +0800
Subject: [PATCH 5/6] Add documentation for quartileboxes

---
 doc/fun/quartileboxes.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/fun/quartileboxes.rst

diff --git a/doc/fun/quartileboxes.rst b/doc/fun/quartileboxes.rst
new file mode 100644
index 0000000..42f9af8
--- /dev/null
+++ b/doc/fun/quartileboxes.rst
@@ -0,0 +1,14 @@
+quartileboxes
+=======
+
+.. function:: quartileboxes(x [;notch=false])
+
+    Visualize the distribution ``x``. If ``x`` is a matrix, visualize each column. The median of ``x`` is represented by a horizontal line inside a box extending from the 25th to the 75th percentile of ``x``. Vertical lines, called whiskers, span 1.5 times the inter-quartile range. Data outside of this range are represented as dots. If the keyword argument ``notch`` is set to ``true``, a notch is drawn around around the median to indicate the confidence of the median.
+
+Examples
+=======
+
+.. winston::
+
+    X = rand((200,10))
+    quartileboxes(X ;notch=true)

From dcfa706754c33f7616ec2c7a41f3efb35eedbd5f Mon Sep 17 00:00:00 2001
From: Roger Herikstad <roger.herikstad@gmail.com>
Date: Tue, 13 May 2014 16:03:14 +0800
Subject: [PATCH 6/6] Adds quartileboxes to NEWS

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 1b25b78..ad4a703 100644
--- a/NEWS
+++ b/NEWS
@@ -5,3 +5,5 @@ v0.11.0 (2014 Apr XX)
 
 * Added stem() function and Stems component.
 
+* Added quartileboxes() function and QuartileBoxes component
+