From c6ac9a27bb42b46a1aa3111a817c11d656074b01 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 25 Nov 2017 22:02:09 +0000
Subject: [PATCH 001/117] Added ops

---
 holoviews/plotting/bokeh/element.py |  7 +++
 holoviews/util/ops.py               | 83 +++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 holoviews/util/ops.py

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 35597202aa..10810e9089 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -26,6 +26,7 @@
 from ...core import util
 from ...element import Graph
 from ...streams import Buffer
+from ...util.ops import op
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import BokehPlot, TOOLS
@@ -664,6 +665,12 @@ def _init_glyph(self, plot, mapping, properties):
 
 
     def _glyph_properties(self, plot, element, source, ranges, style):
+        for k, v in style.items():
+            if not isinstance(v, op):
+                continue
+            source.data[k] = v.eval(element)
+            style[k] = k
+
         properties = dict(style, source=source)
         if self.show_legend:
             if self.overlay_dims:
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
new file mode 100644
index 0000000000..d0375bfc00
--- /dev/null
+++ b/holoviews/util/ops.py
@@ -0,0 +1,83 @@
+import operator
+import numpy as np
+
+from ..core.dimension import Dimension
+
+def norm_fn(values, min=None, max=None):
+    min = np.min(values) if min is None else min
+    max = np.max(values) if max is None else max
+    return (values - min) / (max-min)
+    
+class op(object):
+
+    _op_registry = {'norm': norm_fn}
+
+    def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
+        if isinstance(obj, (str, Dimension)):
+            self.dimension = obj
+            ops = []
+        else:
+            self.dimension = obj.dimension
+            ops = obj.ops
+        if isinstance(fn, str):
+            fn = self._op_registry.get(fn)
+            if fn is None:
+                raise ValueError('Operation function %s not found' % fn)
+        if fn is not None:
+            ops = ops + [{'other': other, 'fn': fn, 'kwargs': kwargs,
+                          'reverse': reverse}]
+        self.ops = ops
+
+    # Unary operators
+    def __abs__(self): return op(self, operator.abs)
+    def __neg__(self): return op(self, operator.neg)
+    def __pos__(self): return op(self, operator.pos)
+
+    # Binary operators
+    def __add__(self, other):       return op(self, operator.add, other)
+    def __div__(self, other):       return op(self, operator.div, other)
+    def __floordiv__(self, other):  return op(self, operator.floordiv, other)
+    def __pow__(self, other):       return op(self, operator.pow, other)
+    def __mod__(self, other):       return op(self, operator.mod, other)
+    def __mul__(self, other):       return op(self, operator.mul, other)
+    def __sub__(self, other):       return op(self, operator.sub, other)
+    def __truediv__(self, other):   return op(self, operator.truediv, other)
+
+    # Reverse binary operators
+    def __radd__(self, other):      return op(self, operator.add, other, True)
+    def __rdiv__(self, other):      return op(self, operator.div, other, True)
+    def __rfloordiv__(self, other): return op(self, operator.floordiv, other, True)
+    def __rmod__(self, other):      return op(self, operator.mod, other, True)
+    def __rmul__(self, other):      return op(self, operator.mul, other, True)
+    def __rsub__(self, other):      return op(self, operator.sub, other, True)
+    def __rtruediv__(self, other):  return op(self, operator.truediv, other, True)
+
+    def eval(self, dataset):
+        expanded = not (dataset.interface.gridded and self.dimension in dataset.kdims)
+        data = dataset.dimension_values(self.dimension, expanded=expanded, flat=False)
+        for o in self.ops:
+            other = o['other']
+            if other is not None:
+                if isinstance(other, op):
+                    other = other.eval(dataset)
+                args = (other, data) if o['reverse'] else (data, other)
+            else:
+                args = (data,)
+            data = o['fn'](*args, **o['kwargs'])
+        return data
+
+    def __repr__(self):
+        op_repr = "'%s'" % self.dimension
+        for o in self.ops:
+            arg = ', %r' % o['other'] if o['other'] else ''
+            kwargs = sorted(o['kwargs'].items(), key=operator.itemgetter(0))
+            kwargs = ', %s' % ', '.join(['%s=%s' % item for item in kwargs]) if kwargs else ''
+            op_repr = '{fn}({repr}{arg}{kwargs})'.format(fn=o['fn'].__name__, repr=op_repr,
+                                                         arg=arg, kwargs=kwargs)
+        return op_repr
+
+
+class norm(op):
+
+    def __init__(self, obj, **kwargs):
+        super(norm, self).__init__(obj, norm_fn, **kwargs)

From bc6c1d3b5a008932e863b0bc8e0d6d926449583e Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 25 Nov 2017 23:23:16 +0000
Subject: [PATCH 002/117] Implement NumPy support for ops

---
 holoviews/util/ops.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index d0375bfc00..85c01f8339 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -52,6 +52,19 @@ def __rmul__(self, other):      return op(self, operator.mul, other, True)
     def __rsub__(self, other):      return op(self, operator.sub, other, True)
     def __rtruediv__(self, other):  return op(self, operator.truediv, other, True)
 
+    ## NumPy operations
+    def __array_ufunc__(self, *args, **kwargs):
+        ufunc = getattr(args[0], args[1])
+        kwargs = {k: v for k, v in kwargs.items() if v is not None}
+        return op(self, ufunc, **kwargs)
+    def max(self, **kwargs): return op(self, np.max, **kwargs)
+    def mean(self, **kwargs): return op(self, np.mean, **kwargs)
+    def min(self, **kwargs): return op(self, np.min, **kwargs)
+    def sum(self, **kwargs): return op(self, np.sum, **kwargs)
+    def std(self, **kwargs): return op(self, np.std, **kwargs)
+    def std(self, **kwargs): return op(self, np.std, **kwargs)
+    def var(self, **kwargs): return op(self, np.var, **kwargs)
+
     def eval(self, dataset):
         expanded = not (dataset.interface.gridded and self.dimension in dataset.kdims)
         data = dataset.dimension_values(self.dimension, expanded=expanded, flat=False)

From 1a909df037df4960035102efa1b82180d2dd91bb Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 25 Nov 2017 23:26:51 +0000
Subject: [PATCH 003/117] Support scalar ops in plotting

---
 holoviews/plotting/bokeh/element.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 10810e9089..a6426cab65 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -668,8 +668,13 @@ def _glyph_properties(self, plot, element, source, ranges, style):
         for k, v in style.items():
             if not isinstance(v, op):
                 continue
-            source.data[k] = v.eval(element)
-            style[k] = k
+            val = v.eval(element)
+            if np.isscalar(val):
+                key = val
+            else:
+                key = k
+                source.data[k] = val
+            style[k] = key
 
         properties = dict(style, source=source)
         if self.show_legend:

From c503afb7c8299b964f0bac763537313ab568a202 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 3 Mar 2018 01:30:39 +0000
Subject: [PATCH 004/117] Various improvements for ops

---
 holoviews/plotting/bokeh/element.py | 29 ++++++++++++++++++++++++-----
 holoviews/plotting/mpl/element.py   | 23 ++++++++++++++++++++---
 holoviews/util/ops.py               | 21 +++++++++++++++------
 holoviews/util/parser.py            |  4 +++-
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index a6426cab65..18f0a62444 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -664,19 +664,38 @@ def _init_glyph(self, plot, mapping, properties):
         return renderer, renderer.glyph
 
 
-    def _glyph_properties(self, plot, element, source, ranges, style):
-        for k, v in style.items():
+    def _apply_ops(self, element, source, ranges, style):
+        new_style = dict(style)
+        for k, v in dict(style).items():
+            if isinstance(v, util.basestring) and v in element:
+                v = op(v)
             if not isinstance(v, op):
                 continue
-            val = v.eval(element)
+            dname = v.dimension.name
+            if dname not in element:
+                new_style.pop(k)
+                self.warning('Specified %s op %r could not be applied, %s dimension '
+                             'could not be found' % (k, v, v.dimension))
+                continue
+            vrange = ranges.get(dname)
+            val = v.eval(element, ranges)
             if np.isscalar(val):
                 key = val
             else:
                 key = k
                 source.data[k] = val
-            style[k] = key
+            if ('color' in k and isinstance(val, np.ndarray) and
+                val.dtype.kind in 'if'):
+                cmapper = self._get_colormapper(v.dimension, element, ranges,
+                                                style, name=dname+'_color_mapper')
+                key = {'field': k, 'transform': cmapper}
+            new_style[k] = key
+        return new_style
 
-        properties = dict(style, source=source)
+
+    def _glyph_properties(self, plot, element, source, ranges, style):
+        new_style = self._apply_ops(element, source, ranges, style)
+        properties = dict(new_style, source=source)
         if self.show_legend:
             if self.overlay_dims:
                 legend = ', '.join([d.pprint_value(v) for d, v in
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 88a6742edb..146019a2cf 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -13,6 +13,7 @@
                      CompositeOverlay, Element3D, Element)
 from ...core.options import abbreviated_exception
 from ...element import Graph
+from ...util.ops import op
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import MPLPlot, mpl_rc_context
@@ -476,6 +477,7 @@ def initialize_plot(self, ranges=None):
         if self.show_legend:
             style['label'] = element.label
 
+        style = self._apply_ops(element, ranges, style)
         plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, style)
 
         with abbreviated_exception():
@@ -503,13 +505,27 @@ def update_handles(self, key, axis, element, ranges, style):
         Update the elements of the plot.
         """
         self.teardown_handles()
-        plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, style)
+        new_style = self._apply_ops(element, range, style)
+        plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, new_style)
 
         with abbreviated_exception():
             handles = self.init_artists(axis, plot_data, plot_kwargs)
         self.handles.update(handles)
         return axis_kwargs
 
+
+    def _apply_ops(self, element, ranges, style):
+        new_style = dict(style)
+        for k, v in style.items():
+            if (isinstance(v, util.basestring) and v in element):
+                v = op(v)
+            if not isinstance(v, op):
+                continue
+            val = v.eval(element, ranges)
+            new_style[k] = val
+        return new_style
+
+
     def teardown_handles(self):
         """
         If no custom update_handles method is supplied this method
@@ -641,13 +657,14 @@ def _draw_colorbar(self, dim=None, redraw=True):
         ColorbarPlot._colorbars[id(axis)] = (ax_colorbars, (l, b, w, h))
 
 
-    def _norm_kwargs(self, element, ranges, opts, vdim, prefix=''):
+    def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
         """
         Returns valid color normalization kwargs
         to be passed to matplotlib plot function.
         """
         clim = opts.pop(prefix+'clims', None)
-        values = np.asarray(element.dimension_values(vdim))
+        if values is None:
+            values = np.asarray(element.dimension_values(vdim))
         if clim is None:
             if not len(values):
                 clim = (0, 0)
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 85c01f8339..6489d527f3 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -2,20 +2,24 @@
 import numpy as np
 
 from ..core.dimension import Dimension
+from ..core.util import basestring
+
 
 def norm_fn(values, min=None, max=None):
     min = np.min(values) if min is None else min
     max = np.max(values) if max is None else max
     return (values - min) / (max-min)
-    
+
 class op(object):
 
     _op_registry = {'norm': norm_fn}
 
     def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
-        if isinstance(obj, (str, Dimension)):
+        ops = []
+        if isinstance(obj, basestring):
+            self.dimension = Dimension(obj)
+        elif isinstance(obj, Dimension):
             self.dimension = obj
-            ops = []
         else:
             self.dimension = obj.dimension
             ops = obj.ops
@@ -57,6 +61,7 @@ def __array_ufunc__(self, *args, **kwargs):
         ufunc = getattr(args[0], args[1])
         kwargs = {k: v for k, v in kwargs.items() if v is not None}
         return op(self, ufunc, **kwargs)
+
     def max(self, **kwargs): return op(self, np.max, **kwargs)
     def mean(self, **kwargs): return op(self, np.mean, **kwargs)
     def min(self, **kwargs): return op(self, np.min, **kwargs)
@@ -65,18 +70,22 @@ def std(self, **kwargs): return op(self, np.std, **kwargs)
     def std(self, **kwargs): return op(self, np.std, **kwargs)
     def var(self, **kwargs): return op(self, np.var, **kwargs)
 
-    def eval(self, dataset):
+    def eval(self, dataset, ranges={}):
         expanded = not (dataset.interface.gridded and self.dimension in dataset.kdims)
         data = dataset.dimension_values(self.dimension, expanded=expanded, flat=False)
         for o in self.ops:
             other = o['other']
             if other is not None:
                 if isinstance(other, op):
-                    other = other.eval(dataset)
+                    other = other.eval(dataset, ranges)
                 args = (other, data) if o['reverse'] else (data, other)
             else:
                 args = (data,)
-            data = o['fn'](*args, **o['kwargs'])
+            drange = ranges.get(self.dimension.name)
+            if o['fn'] == norm_fn and drange is not None:
+                data = o['fn'](data, *drange)
+            else:
+                data = o['fn'](*args, **o['kwargs'])
         return data
 
     def __repr__(self):
diff --git a/holoviews/util/parser.py b/holoviews/util/parser.py
index 591f2f96fd..eab98653c9 100644
--- a/holoviews/util/parser.py
+++ b/holoviews/util/parser.py
@@ -17,6 +17,7 @@
 from ..core.options import Options, Cycle, Palette
 from ..core.util import merge_option_dicts
 from ..operation import Compositor
+from .ops import op, norm
 
 ascii_uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 allowed = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!#$%&\()*+,-./:;<=>?@\\^_`{|}~'
@@ -35,7 +36,8 @@ class Parser(object):
     """
 
     # Static namespace set in __init__.py of the extension
-    namespace = {'np': np, 'Cycle': Cycle, 'Palette': Palette}
+    namespace = {'np': np, 'Cycle': Cycle, 'Palette': Palette, 'op': op,
+                 'norm': norm}
     # If True, raise SyntaxError on eval error otherwise warn
     abort_on_eval_failure = False
 

From dc27124ac7724e72f63955989a4e0d68d7faf294 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 23 Jun 2018 15:34:56 +0100
Subject: [PATCH 005/117] Improved handling for op style mappings

---
 holoviews/plotting/bokeh/annotation.py |  3 ++-
 holoviews/plotting/bokeh/chart.py      |  5 ++++-
 holoviews/plotting/bokeh/element.py    |  4 ++++
 holoviews/plotting/mpl/chart.py        |  7 +++++--
 holoviews/plotting/mpl/element.py      | 10 ++++++++++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/holoviews/plotting/bokeh/annotation.py b/holoviews/plotting/bokeh/annotation.py
index a94490b4ba..4f4f31436f 100644
--- a/holoviews/plotting/bokeh/annotation.py
+++ b/holoviews/plotting/bokeh/annotation.py
@@ -88,7 +88,8 @@ class LabelsPlot(ColorbarPlot, AnnotationPlot):
 
     def get_data(self, element, ranges, style):
         style = self.style[self.cyclic_index]
-        style['angle'] = np.deg2rad(style.get('angle', 0))
+        if 'angle' in style and isinstance(style['angle'], (int, float)):
+            style['angle'] = np.deg2rad(style.get('angle', 0))
 
         dims = element.dimensions()
         coords = (1, 0) if self.invert_axes else (0, 1)
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index a92b9cc28f..40568ec052 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -43,7 +43,7 @@ class PointPlot(LegendPlot, ColorbarPlot):
       Function applied to size values before applying scaling,
       to remove values lower than zero.""")
 
-    style_opts = (['cmap', 'palette', 'marker', 'size'] +
+    style_opts = (['cmap', 'palette', 'marker', 'size', 'angle'] +
                   line_properties + fill_properties)
 
     _plot_methods = dict(single='scatter', batched='scatter')
@@ -92,6 +92,9 @@ def get_data(self, element, ranges, style):
         data.update(sdata)
         mapping.update(smapping)
 
+        if 'angle' in style and isinstance(style['angle'], (int, float)):
+            style['angle'] = np.deg2rad(style['angle'])
+
         if self.jitter:
             axrange = 'y_range' if self.invert_axes else 'x_range'
             mapping['x'] = jitter(dims[xidx], self.jitter,
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 18f0a62444..15e352b6d7 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -679,6 +679,10 @@ def _apply_ops(self, element, source, ranges, style):
                 continue
             vrange = ranges.get(dname)
             val = v.eval(element, ranges)
+            if len(np.unique(val)) == 1:
+                val = val if np.isscalar(val) else val[0]
+            if k == 'angle':
+                val = np.deg2rad(val)
             if np.isscalar(val):
                 key = val
             else:
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index bd82f89d76..7807122850 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -576,8 +576,11 @@ def _compute_styles(self, element, ranges, style):
                 ypos = np.searchsorted(categories, cs)
                 style['c'] = xsorted[ypos]
             self._norm_kwargs(element, ranges, style, cdim)
-        elif color:
-            style['c'] = color
+        elif color is not None:
+            if np.isscalar(color):
+                style['c'] = color
+            else:
+                style['color'] = color
         style['edgecolors'] = style.pop('edgecolors', style.pop('edgecolor', 'none'))
 
         sdim = element.get_dimension(self.size_index)
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 146019a2cf..8313deeb97 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -522,6 +522,16 @@ def _apply_ops(self, element, ranges, style):
             if not isinstance(v, op):
                 continue
             val = v.eval(element, ranges)
+            if len(np.unique(val)) == 1:
+                val = val if np.isscalar(val) else val[0]
+            if k == 'alpha' and not np.isscalar(val):
+                self.warning('The matplotlib backend currently does not '
+                             'support scaling the alpha by a dimension.')
+                continue
+            if k == 'marker':
+                self.warning('The matplotlib backend currently does not '
+                             'support mapping a dimension to the marker type.')
+                continue
             new_style[k] = val
         return new_style
 

From 073cbf407f92c06a5a828599c7f447df8f491a10 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 23 Jun 2018 17:43:06 +0100
Subject: [PATCH 006/117] Enabled op style mapping on Composite glyphs

---
 holoviews/plotting/bokeh/element.py | 14 ++++++++------
 holoviews/plotting/bokeh/graphs.py  |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 15e352b6d7..25ab688622 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -664,12 +664,12 @@ def _init_glyph(self, plot, mapping, properties):
         return renderer, renderer.glyph
 
 
-    def _apply_ops(self, element, source, ranges, style):
+    def _apply_ops(self, element, source, ranges, style, group=None):
         new_style = dict(style)
         for k, v in dict(style).items():
             if isinstance(v, util.basestring) and v in element:
                 v = op(v)
-            if not isinstance(v, op):
+            if not isinstance(v, op) or (group is not None and not k.startswith(group)):
                 continue
             dname = v.dimension.name
             if dname not in element:
@@ -697,8 +697,8 @@ def _apply_ops(self, element, source, ranges, style):
         return new_style
 
 
-    def _glyph_properties(self, plot, element, source, ranges, style):
-        new_style = self._apply_ops(element, source, ranges, style)
+    def _glyph_properties(self, plot, element, source, ranges, style, group=None):
+        new_style = self._apply_ops(element, source, ranges, style, group)
         properties = dict(new_style, source=source)
         if self.show_legend:
             if self.overlay_dims:
@@ -1020,7 +1020,8 @@ def _init_glyphs(self, plot, element, ranges, source, data=None, mapping=None, s
                 source = self._init_datasource(ds_data)
                 source_cache[id(ds_data)] = source
             self.handles[key+'_source'] = source
-            properties = self._glyph_properties(plot, element, source, ranges, style)
+            style_group = self._style_groups.get('_'.join(key.split('_')[:-1]))
+            properties = self._glyph_properties(plot, element, source, ranges, style, style_group)
             properties = self._process_properties(key, properties, mapping.get(key, {}))
             with abbreviated_exception():
                 renderer, glyph = self._init_glyph(plot, mapping.get(key, {}), properties, key)
@@ -1074,7 +1075,8 @@ def _update_glyphs(self, element, ranges):
             glyph = self.handles.get(key+'_glyph')
 
             if glyph:
-                properties = self._glyph_properties(plot, element, source, ranges, style)
+                style_group = self._style_groups.get('_'.join(key.split('_')[:-1]))
+                properties = self._glyph_properties(plot, element, source, ranges, style, style_group)
                 properties = self._process_properties(key, properties, mapping[key])
                 renderer = self.handles.get(key+'_glyph_renderer')
                 with abbreviated_exception():
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 133789a564..442a17caa0 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -246,7 +246,8 @@ def _init_glyphs(self, plot, element, ranges, source):
                 continue
             source = self._init_datasource(data.pop(key, {}))
             self.handles[key+'_source'] = source
-            glyph_props = self._glyph_properties(plot, element, source, ranges, style)
+            style_group = self._style_groups.get('_'.join(key.split('_')[:-1]))
+            glyph_props = self._glyph_properties(plot, element, source, ranges, style, style_group)
             properties.update(glyph_props)
             mappings.update(mapping.pop(key, {}))
         properties = {p: v for p, v in properties.items() if p not in ('legend', 'source')}

From 1f09d599908a754ef376ee1b0bd5bf68f25109f0 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 24 Jun 2018 11:27:36 +0100
Subject: [PATCH 007/117] Handle scalar values in ops mapping

---
 holoviews/plotting/bokeh/element.py | 6 ++++++
 holoviews/util/ops.py               | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 25ab688622..bd8769bb3a 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -678,9 +678,15 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                              'could not be found' % (k, v, v.dimension))
                 continue
             vrange = ranges.get(dname)
+
             val = v.eval(element, ranges)
+            length = [len(v) for v in source.data.values()][0]
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
+
+            if not np.isscalar(val) and len(val) != length:
+                continue
+
             if k == 'angle':
                 val = np.deg2rad(val)
             if np.isscalar(val):
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 6489d527f3..ea2cd1f23b 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -72,7 +72,8 @@ def var(self, **kwargs): return op(self, np.var, **kwargs)
 
     def eval(self, dataset, ranges={}):
         expanded = not (dataset.interface.gridded and self.dimension in dataset.kdims)
-        data = dataset.dimension_values(self.dimension, expanded=expanded, flat=False)
+        isscalar = dataset.interface.isscalar(dataset, self.dimension)
+        data = dataset.dimension_values(self.dimension, expanded=expanded and not isscalar, flat=False)
         for o in self.ops:
             other = o['other']
             if other is not None:

From ddd5a656a8cd2241e117be3f6a9bc904fd6e2b0d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 25 Jun 2018 12:52:49 +0100
Subject: [PATCH 008/117] Fixed handling of multi-interface in ops

---
 holoviews/util/ops.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index ea2cd1f23b..97d2db54b7 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -71,9 +71,9 @@ def std(self, **kwargs): return op(self, np.std, **kwargs)
     def var(self, **kwargs): return op(self, np.var, **kwargs)
 
     def eval(self, dataset, ranges={}):
-        expanded = not (dataset.interface.gridded and self.dimension in dataset.kdims)
-        isscalar = dataset.interface.isscalar(dataset, self.dimension)
-        data = dataset.dimension_values(self.dimension, expanded=expanded and not isscalar, flat=False)
+        expanded = not ((dataset.interface.gridded and self.dimension in dataset.kdims) or
+                        (dataset.interface.multi and dataset.interface.isscalar(dataset, self.dimension)))
+        data = dataset.dimension_values(self.dimension, expanded=expanded, flat=False)
         for o in self.ops:
             other = o['other']
             if other is not None:

From a076722ba77b78b3d9ee608106e0b0fcb733f026 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 25 Jun 2018 12:53:28 +0100
Subject: [PATCH 009/117] Enabled ops mapping for mpl Labels

---
 holoviews/plotting/mpl/annotation.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/holoviews/plotting/mpl/annotation.py b/holoviews/plotting/mpl/annotation.py
index 376c31ae1c..e3b9a7d041 100644
--- a/holoviews/plotting/mpl/annotation.py
+++ b/holoviews/plotting/mpl/annotation.py
@@ -99,7 +99,7 @@ class LabelsPlot(ColorbarPlot):
       Amount of offset to apply to labels along x-axis.""")
 
     style_opts = ['alpha', 'color', 'family', 'weight', 'size', 'visible',
-                  'horizontalalignment', 'verticalalignment', 'cmap']
+                  'horizontalalignment', 'verticalalignment', 'cmap', 'rotation']
 
     _plot_methods = dict(single='annotate')
 
@@ -131,8 +131,10 @@ def init_artists(self, ax, plot_args, plot_kwargs):
             cmap = None
             plot_args = plot_args[:-1]
 
+        vectorized = {k: v for k, v in plot_kwargs.items() if isinstance(v, np.ndarray)}
+
         texts = []
-        for item in zip(*plot_args):
+        for i, item in enumerate(zip(*plot_args)):
             x, y, text = item[:3]
             if len(item) == 4 and cmap is not None:
                 color = item[3]
@@ -142,7 +144,8 @@ def init_artists(self, ax, plot_args, plot_kwargs):
                 else:
                     color = colors.index(color) if color in colors else np.NaN
                     plot_kwargs['color'] = cmap(color)
-            texts.append(ax.text(x, y, text, **plot_kwargs))
+            kwargs = dict(plot_kwargs, **{k: v[i] for k, v in vectorized.items()})
+            texts.append(ax.text(x, y, text, **kwargs))
         return {'artist': texts}
 
     def teardown_handles(self):

From b2ec0220e941ce5135caf527fe969373d6dfa8ef Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 25 Jun 2018 12:53:55 +0100
Subject: [PATCH 010/117] Improved of unsupported matplotlib ops mapping

---
 holoviews/plotting/mpl/element.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 8313deeb97..3ebfb5acd7 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -524,13 +524,15 @@ def _apply_ops(self, element, ranges, style):
             val = v.eval(element, ranges)
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
-            if k == 'alpha' and not np.isscalar(val):
+            if k == 'alpha' and not np.isscalar(val) and not self._plot_methods.get('single') == 'annotate':
                 self.warning('The matplotlib backend currently does not '
                              'support scaling the alpha by a dimension.')
+                new_style.pop('alpha')
                 continue
             if k == 'marker':
                 self.warning('The matplotlib backend currently does not '
                              'support mapping a dimension to the marker type.')
+                new_style.pop('marker')
                 continue
             new_style[k] = val
         return new_style

From 93d1cbd023d8e06603b906f6d74f0c49d44061e9 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 23 Sep 2018 13:52:50 +0100
Subject: [PATCH 011/117] Add unit tests for bokeh PointPlot ops

---
 .../tests/plotting/bokeh/testpointplot.py     | 94 ++++++++++++++++++-
 1 file changed, 93 insertions(+), 1 deletion(-)

diff --git a/holoviews/tests/plotting/bokeh/testpointplot.py b/holoviews/tests/plotting/bokeh/testpointplot.py
index 8543bf7f38..6ba27f8ebf 100644
--- a/holoviews/tests/plotting/bokeh/testpointplot.py
+++ b/holoviews/tests/plotting/bokeh/testpointplot.py
@@ -4,7 +4,7 @@
 import numpy as np
 
 from holoviews.core import NdOverlay
-from holoviews.core.options import Cycle
+from holoviews.core.options import Cycle, AbbreviatedException
 from holoviews.core.util import pd
 from holoviews.element import Points
 
@@ -320,3 +320,95 @@ def test_points_datetime_hover(self):
         self.assertEqual(cds.data['date_dt_strings'], ['2017-01-01 00:00:00'])
         hover = plot.handles['hover']
         self.assertEqual(hover.tooltips, [('x', '@{x}'), ('y', '@{y}'), ('date', '@{date_dt_strings}')])
+
+    def test_point_color_op(self):
+        points = Points([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                        vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.fill_color, 'color')
+        self.assertEqual(glyph.line_color, 'color')
+
+    def test_point_line_color_op(self):
+        points = Points([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                        vdims='color').options(line_color='color')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertNotEqual(glyph.fill_color, 'line_color')
+        self.assertEqual(glyph.line_color, 'line_color')
+
+    def test_point_line_color_op(self):
+        points = Points([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                        vdims='color').options(fill_color='color')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['fill_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.fill_color, 'fill_color')
+        self.assertNotEqual(glyph.line_color, 'fill_color')
+
+    def test_point_angle_op(self):
+        points = Points([(0, 0, 0), (0, 1, 45), (0, 2, 90)],
+                        vdims='angle').options(angle='angle')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['angle'], np.array([0, 0.785398, 1.570796]))
+        self.assertEqual(glyph.angle, 'angle')
+
+    def test_point_alpha_op(self):
+        points = Points([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                        vdims='alpha').options(alpha='alpha')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.fill_alpha, 'alpha')
+
+    def test_point_line_alpha_op(self):
+        points = Points([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                        vdims='alpha').options(line_alpha='alpha')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.line_alpha, 'line_alpha')
+        self.assertNotEqual(glyph.fill_alpha, 'line_alpha')
+
+    def test_point_fill_alpha_op(self):
+        points = Points([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                        vdims='alpha').options(fill_alpha='alpha')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['fill_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertNotEqual(glyph.line_alpha, 'fill_alpha')
+        self.assertEqual(glyph.fill_alpha, 'fill_alpha')
+
+    def test_point_size_op(self):
+        points = Points([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                        vdims='size').options(size='size')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['size'], np.array([1, 4, 8]))
+        self.assertEqual(glyph.size, 'size')
+
+    def test_point_line_width_op(self):
+        points = Points([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                        vdims='line_width').options(line_width='line_width')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_width'], np.array([1, 4, 8]))
+        self.assertEqual(glyph.line_width, 'line_width')
+
+    def test_point_marker_op(self):
+        points = Points([(0, 0, 'circle'), (0, 1, 'triangle'), (0, 2, 'square')],
+                        vdims='marker').options(marker='marker')
+        with self.assertRaises(AbbreviatedException):
+            plot = bokeh_renderer.get_plot(points)

From a8d515a95dff87aa7d14737f584acf656b8e5c11 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 24 Sep 2018 04:00:01 +0100
Subject: [PATCH 012/117] Fixes and improvements for Point mappings

---
 holoviews/plotting/bokeh/element.py           | 51 ++++++++++++++-----
 holoviews/plotting/bokeh/util.py              | 18 +++++++
 .../tests/plotting/bokeh/testpointplot.py     | 40 +++++++++++++--
 3 files changed, 93 insertions(+), 16 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index bd8769bb3a..5e63562f95 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -5,6 +5,7 @@
 import numpy as np
 import bokeh
 import bokeh.plotting
+
 from bokeh.core.properties import value
 from bokeh.document.events import ModelChangedEvent
 from bokeh.models import (HoverTool, Renderer, Range1d, DataRange1d, Title,
@@ -30,10 +31,11 @@
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import BokehPlot, TOOLS
-from .util import (mpl_to_bokeh, get_tab_title,  py2js_tickformatter,
-                   rgba_tuple, recursive_model_update, glyph_order,
-                   decode_bytes, bokeh_version, theme_attr_json,
-                   cds_column_replace, hold_policy)
+from .util import (
+    mpl_to_bokeh, get_tab_title,  py2js_tickformatter, rgba_tuple,
+    recursive_model_update, glyph_order, decode_bytes, bokeh_version,
+    theme_attr_json, is_color, cds_column_replace, hold_policy
+)
 
 property_prefixes = ['selection', 'nonselection', 'muted', 'hover']
 
@@ -53,6 +55,8 @@
 legend_dimensions = ['label_standoff', 'label_width', 'label_height', 'glyph_width',
                      'glyph_height', 'legend_padding', 'legend_spacing', 'click_policy']
 
+no_op_styles = ['cmap', 'palette', 'marker']
+
 
 class ElementPlot(BokehPlot, GenericElementPlot):
 
@@ -667,25 +671,41 @@ def _init_glyph(self, plot, mapping, properties):
     def _apply_ops(self, element, source, ranges, style, group=None):
         new_style = dict(style)
         for k, v in dict(style).items():
-            if isinstance(v, util.basestring) and v in element:
-                v = op(v)
+            if isinstance(v, util.basestring):
+                if v in element:
+                    v = op(v)
+                elif any(d==v for d in self.overlay_dims):
+                    v = op([d for d in self.overlay_dims if d==v][0])
             if not isinstance(v, op) or (group is not None and not k.startswith(group)):
                 continue
             dname = v.dimension.name
-            if dname not in element:
+            print(v.dimension)
+            if dname not in element and v.dimension not in self.overlay_dims:
                 new_style.pop(k)
                 self.warning('Specified %s op %r could not be applied, %s dimension '
                              'could not be found' % (k, v, v.dimension))
                 continue
             vrange = ranges.get(dname)
 
-            val = v.eval(element, ranges)
-            length = [len(v) for v in source.data.values()][0]
+            if len(v.ops) == 0 and v.dimension in self.overlay_dims:
+                val = self.overlay_dims[v.dimension]
+            else:
+                val = v.eval(element, ranges)
+
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
 
-            if not np.isscalar(val) and len(val) != length:
-                continue
+            if not np.isscalar(val):
+                lengths = [len(v) for v in source.data.values()]
+                if k in no_op_styles:
+                    raise ValueError('Mapping the a dimension to the "{style}" '
+                                     'style option is not supported. To '
+                                     'map the {dim} dimension to the {style} '
+                                     'use a groupby operation to overlay '
+                                     'your data along the dimension.'.format(
+                                         style=k, dim=v.dimension))
+                elif source.data and len(val) != len(list(source.data.values())[0]):
+                    continue
 
             if k == 'angle':
                 val = np.deg2rad(val)
@@ -694,10 +714,15 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             else:
                 key = k
                 source.data[k] = val
+
+            numeric = isinstance(val, np.ndarray) and val.dtype.kind in 'uifMm'
             if ('color' in k and isinstance(val, np.ndarray) and
-                val.dtype.kind in 'if'):
+                (numeric or not all(is_color(v) for v in val))):
+                kwargs = {}
+                if val.dtype.kind not in 'if':
+                    kwargs['factors'] = np.unique(val)
                 cmapper = self._get_colormapper(v.dimension, element, ranges,
-                                                style, name=dname+'_color_mapper')
+                                                style, name=dname+'_color_mapper', **kwargs)
                 key = {'field': k, 'transform': cmapper}
             new_style[k] = key
         return new_style
diff --git a/holoviews/plotting/bokeh/util.py b/holoviews/plotting/bokeh/util.py
index f0e2768fec..298db80197 100644
--- a/holoviews/plotting/bokeh/util.py
+++ b/holoviews/plotting/bokeh/util.py
@@ -17,6 +17,7 @@
 
 bokeh_version = LooseVersion(bokeh.__version__)  # noqa
 
+from bokeh.colors.named import __all__ as named_colors
 from bokeh.core.enums import Palette
 from bokeh.core.json_encoder import serialize_json # noqa (API import)
 from bokeh.core.properties import value
@@ -57,6 +58,8 @@
            '3': {'marker': 'triangle', 'angle': np.pi},
            '4': {'marker': 'triangle', 'angle': np.pi/2}}
 
+RGB_HEX_REGEX = re.compile(r'^#(?:[0-9a-fA-F]{3}){1,2}$')
+
 
 def convert_timestamp(timestamp):
     """
@@ -76,6 +79,21 @@ def rgba_tuple(rgba):
         return COLOR_ALIASES.get(rgba, rgba)
 
 
+def is_color(color):
+    """
+    Checks if a color
+    """
+    if not isinstance(color, basestring):
+        return False
+    elif RGB_HEX_REGEX.match(color):
+        return True
+    elif color in COLOR_ALIASES:
+        return True
+    elif color in named_colors:
+        return True
+    return False
+
+
 def decode_bytes(array):
     """
     Decodes an array, list or tuple of bytestrings to avoid python 3
diff --git a/holoviews/tests/plotting/bokeh/testpointplot.py b/holoviews/tests/plotting/bokeh/testpointplot.py
index 6ba27f8ebf..aeafb74ea5 100644
--- a/holoviews/tests/plotting/bokeh/testpointplot.py
+++ b/holoviews/tests/plotting/bokeh/testpointplot.py
@@ -4,7 +4,7 @@
 import numpy as np
 
 from holoviews.core import NdOverlay
-from holoviews.core.options import Cycle, AbbreviatedException
+from holoviews.core.options import Cycle
 from holoviews.core.util import pd
 from holoviews.element import Points
 
@@ -12,7 +12,8 @@
 from ..utils import ParamLogStream
 
 try:
-    from bokeh.models import FactorRange, CategoricalColorMapper
+    from bokeh.models import FactorRange, LinearColorMapper, CategoricalColorMapper
+    from bokeh.models.glyphs import Circle, Triangle
 except:
     pass
 
@@ -331,6 +332,33 @@ def test_point_color_op(self):
         self.assertEqual(glyph.fill_color, 'color')
         self.assertEqual(glyph.line_color, 'color')
 
+    def test_point_linear_color_op(self):
+        points = Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 2)
+        self.assertEqual(cds.data['color'], np.array([0, 1, 2]))
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_point_categorical_color_op(self):
+        points = Points([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
+                        vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, np.array(['A', 'B', 'C']))
+        self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
     def test_point_line_color_op(self):
         points = Points([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
                         vdims='color').options(line_color='color')
@@ -410,5 +438,11 @@ def test_point_line_width_op(self):
     def test_point_marker_op(self):
         points = Points([(0, 0, 'circle'), (0, 1, 'triangle'), (0, 2, 'square')],
                         vdims='marker').options(marker='marker')
-        with self.assertRaises(AbbreviatedException):
+        with self.assertRaises(ValueError):
             plot = bokeh_renderer.get_plot(points)
+
+    def test_op_ndoverlay_value(self):
+        overlay = NdOverlay({marker: Points(np.arange(i)) for i, marker in enumerate(['circle', 'triangle'])}, 'Marker').options('Points', marker='Marker')
+        plot = bokeh_renderer.get_plot(overlay)
+        for subplot, glyph_type in zip(plot.subplots.values(), [Circle, Triangle]):
+            self.assertIsInstance(subplot.handles['glyph'], glyph_type)

From 5100e5e010951353b2f6626d9ca0454e0ee3c66b Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 24 Sep 2018 12:57:30 +0100
Subject: [PATCH 013/117] Fixed flakes and tests

---
 holoviews/plotting/bokeh/element.py           |  3 --
 holoviews/plotting/bokeh/stats.py             |  5 ++-
 holoviews/plotting/mpl/element.py             | 43 +++++++++++++------
 .../tests/plotting/bokeh/testpointplot.py     |  4 +-
 holoviews/util/ops.py                         |  1 -
 5 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 5e63562f95..c7c2102274 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -679,13 +679,11 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             if not isinstance(v, op) or (group is not None and not k.startswith(group)):
                 continue
             dname = v.dimension.name
-            print(v.dimension)
             if dname not in element and v.dimension not in self.overlay_dims:
                 new_style.pop(k)
                 self.warning('Specified %s op %r could not be applied, %s dimension '
                              'could not be found' % (k, v, v.dimension))
                 continue
-            vrange = ranges.get(dname)
 
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
                 val = self.overlay_dims[v.dimension]
@@ -696,7 +694,6 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 val = val if np.isscalar(val) else val[0]
 
             if not np.isscalar(val):
-                lengths = [len(v) for v in source.data.values()]
                 if k in no_op_styles:
                     raise ValueError('Mapping the a dimension to the "{style}" '
                                      'style option is not supported. To '
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index e44e7fe84e..033f36e5e8 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -93,8 +93,9 @@ def _get_axis_labels(self, *args, **kwargs):
         ylabel = element.vdims[0].pprint_label
         return xlabel, ylabel, None
 
-    def _glyph_properties(self, plot, element, source, ranges, style):
-        properties = dict(style, source=source)
+    def _glyph_properties(self, plot, element, source, ranges, style, group=None):
+        new_style = self._apply_ops(element, source, ranges, style, group)
+        properties = dict(new_style, source=source)
         if self.show_legend and not element.kdims:
             properties['legend'] = element.label
         return properties
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 3ebfb5acd7..0c2f973302 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -20,6 +20,8 @@
 from .util import wrap_formatter
 from distutils.version import LooseVersion
 
+no_op_styles = ['marker', 'alpha', 'cmap', 'angle']
+
 
 class ElementPlot(GenericElementPlot, MPLPlot):
 
@@ -517,23 +519,38 @@ def update_handles(self, key, axis, element, ranges, style):
     def _apply_ops(self, element, ranges, style):
         new_style = dict(style)
         for k, v in style.items():
-            if (isinstance(v, util.basestring) and v in element):
-                v = op(v)
+            if isinstance(v, util.basestring):
+                if v in element:
+                    v = op(v)
+                elif any(d==v for d in self.overlay_dims):
+                    v = op([d for d in self.overlay_dims if d==v][0])
+
             if not isinstance(v, op):
                 continue
-            val = v.eval(element, ranges)
+
+            dname = v.dimension.name
+            if dname not in element and v.dimension not in self.overlay_dims:
+                new_style.pop(k)
+                self.warning('Specified %s op %r could not be applied, %s dimension '
+                             'could not be found' % (k, v, v.dimension))
+                continue
+
+            if len(v.ops) == 0 and v.dimension in self.overlay_dims:
+                val = self.overlay_dims[v.dimension]
+            else:
+                val = v.eval(element, ranges)
+
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
-            if k == 'alpha' and not np.isscalar(val) and not self._plot_methods.get('single') == 'annotate':
-                self.warning('The matplotlib backend currently does not '
-                             'support scaling the alpha by a dimension.')
-                new_style.pop('alpha')
-                continue
-            if k == 'marker':
-                self.warning('The matplotlib backend currently does not '
-                             'support mapping a dimension to the marker type.')
-                new_style.pop('marker')
-                continue
+
+            if not np.isscalar(val) and k in no_op_styles:
+                    raise ValueError('Mapping the a dimension to the "{style}" '
+                                     'style option is not supported. To '
+                                     'map the {dim} dimension to the {style} '
+                                     'use a groupby operation to overlay '
+                                     'your data along the dimension.'.format(
+                                         style=k, dim=v.dimension))
+
             new_style[k] = val
         return new_style
 
diff --git a/holoviews/tests/plotting/bokeh/testpointplot.py b/holoviews/tests/plotting/bokeh/testpointplot.py
index aeafb74ea5..225671ddff 100644
--- a/holoviews/tests/plotting/bokeh/testpointplot.py
+++ b/holoviews/tests/plotting/bokeh/testpointplot.py
@@ -369,7 +369,7 @@ def test_point_line_color_op(self):
         self.assertNotEqual(glyph.fill_color, 'line_color')
         self.assertEqual(glyph.line_color, 'line_color')
 
-    def test_point_line_color_op(self):
+    def test_point_fill_color_op(self):
         points = Points([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
                         vdims='color').options(fill_color='color')
         plot = bokeh_renderer.get_plot(points)
@@ -439,7 +439,7 @@ def test_point_marker_op(self):
         points = Points([(0, 0, 'circle'), (0, 1, 'triangle'), (0, 2, 'square')],
                         vdims='marker').options(marker='marker')
         with self.assertRaises(ValueError):
-            plot = bokeh_renderer.get_plot(points)
+            bokeh_renderer.get_plot(points)
 
     def test_op_ndoverlay_value(self):
         overlay = NdOverlay({marker: Points(np.arange(i)) for i, marker in enumerate(['circle', 'triangle'])}, 'Marker').options('Points', marker='Marker')
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 97d2db54b7..3ee4e81609 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -67,7 +67,6 @@ def mean(self, **kwargs): return op(self, np.mean, **kwargs)
     def min(self, **kwargs): return op(self, np.min, **kwargs)
     def sum(self, **kwargs): return op(self, np.sum, **kwargs)
     def std(self, **kwargs): return op(self, np.std, **kwargs)
-    def std(self, **kwargs): return op(self, np.std, **kwargs)
     def var(self, **kwargs): return op(self, np.var, **kwargs)
 
     def eval(self, dataset, ranges={}):

From 09d6ab8c62931a7bbb52cc38d4bbae6c983db299 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 24 Sep 2018 14:03:16 +0100
Subject: [PATCH 014/117] Fixed op colormapping in matplotlib

---
 holoviews/plotting/bokeh/util.py  |  6 ++----
 holoviews/plotting/mpl/chart.py   |  6 ++----
 holoviews/plotting/mpl/element.py | 14 +++++++++++++-
 holoviews/plotting/mpl/util.py    | 29 +++++++++++++++++++++++++++++
 holoviews/plotting/util.py        |  3 +++
 5 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/holoviews/plotting/bokeh/util.py b/holoviews/plotting/bokeh/util.py
index 298db80197..0775647b05 100644
--- a/holoviews/plotting/bokeh/util.py
+++ b/holoviews/plotting/bokeh/util.py
@@ -43,7 +43,7 @@
                           dt64_to_dt, _getargspec)
 from ...core.spaces import get_nested_dmaps, DynamicMap
 
-from ..util import dim_axis_label, rgb2hex, COLOR_ALIASES
+from ..util import dim_axis_label, rgb2hex, COLOR_ALIASES, RGB_HEX_REGEX
 
 # Conversion between matplotlib and bokeh markers
 markers = {'s': {'marker': 'square'},
@@ -58,8 +58,6 @@
            '3': {'marker': 'triangle', 'angle': np.pi},
            '4': {'marker': 'triangle', 'angle': np.pi/2}}
 
-RGB_HEX_REGEX = re.compile(r'^#(?:[0-9a-fA-F]{3}){1,2}$')
-
 
 def convert_timestamp(timestamp):
     """
@@ -81,7 +79,7 @@ def rgba_tuple(rgba):
 
 def is_color(color):
     """
-    Checks if a color
+    Checks if the supplied value is a valid color spec.
     """
     if not isinstance(color, basestring):
         return False
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index 7807122850..cde40f53c9 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -25,6 +25,7 @@
 from .element import ElementPlot, ColorbarPlot, LegendPlot
 from .path  import PathPlot
 from .plot import AdjoinedPlot, mpl_rc_context
+from .util import categorize_colors
 
 
 class ChartPlot(ElementPlot):
@@ -571,10 +572,7 @@ def _compute_styles(self, element, ranges, style):
             if cs.dtype.kind in 'uif':
                 style['c'] = cs
             else:
-                categories = np.unique(cs)
-                xsorted = np.argsort(categories)
-                ypos = np.searchsorted(categories, cs)
-                style['c'] = xsorted[ypos]
+                style['c'] = categorize_colors(cs)
             self._norm_kwargs(element, ranges, style, cdim)
         elif color is not None:
             if np.isscalar(color):
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 0c2f973302..abd4f48abe 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -17,7 +17,7 @@
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import MPLPlot, mpl_rc_context
-from .util import wrap_formatter
+from .util import wrap_formatter, is_color, categorize_colors
 from distutils.version import LooseVersion
 
 no_op_styles = ['marker', 'alpha', 'cmap', 'angle']
@@ -551,7 +551,19 @@ def _apply_ops(self, element, ranges, style):
                                      'your data along the dimension.'.format(
                                          style=k, dim=v.dimension))
 
+            if 'color' == k and (isinstance(val, np.ndarray) and all(not is_color(c) for c in val)):
+                new_style.pop(k)
+                self._norm_kwargs(element, ranges, new_style, v.dimension, val)
+                if val.dtype.kind in 'OSUM':
+                    val = categorize_colors(val)
+                k = 'c'
+
+            if k == 'facecolors':
+                # Color overrides facecolors if defined
+                new_style.pop('color')
+
             new_style[k] = val
+
         return new_style
 
 
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index e87b397391..9b5479d628 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -5,6 +5,7 @@
 import numpy as np
 import matplotlib
 from matplotlib import ticker
+from matplotlib.colors import cnames
 from matplotlib.patches import Path, PathPatch
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 
@@ -12,6 +13,34 @@
 
 from ...core.util import basestring, _getargspec
 from ...element import Raster, RGB, Polygons
+from ...element import Raster, RGB
+from ..util import COLOR_ALIASES, RGB_HEX_REGEX
+
+
+def is_color(color):
+    """
+    Checks if supplied object is a valid color spec.
+    """
+    if not isinstance(color, basestring):
+        return False
+    elif RGB_HEX_REGEX.match(color):
+        return True
+    elif color in COLOR_ALIASES:
+        return True
+    elif color in cnames:
+        return True
+    return False
+
+
+def categorize_colors(colors, categories=None):
+    """
+    Takes a list of categorical values and turns them into integers
+    which can be colormapped.
+    """
+    categories = np.unique(colors) if categories is None else categories
+    sorted_colors = np.argsort(categories)
+    positions = np.searchsorted(categories, colors)
+    return sorted_colors[positions]
 
 
 def wrap_formatter(formatter):
diff --git a/holoviews/plotting/util.py b/holoviews/plotting/util.py
index 3934128f7d..aae0f50f42 100644
--- a/holoviews/plotting/util.py
+++ b/holoviews/plotting/util.py
@@ -2,6 +2,7 @@
 
 from collections import defaultdict, namedtuple
 
+import re
 import traceback
 import warnings
 import bisect
@@ -973,6 +974,8 @@ def hex2rgb(hex):
   return [int(hex[i:i+2], 16) for i in range(1,6,2)]
 
 
+RGB_HEX_REGEX = re.compile(r'^#(?:[0-9a-fA-F]{3}){1,2}$')
+
 COLOR_ALIASES = {
     'b': (0, 0, 1),
     'c': (0, 0.75, 0.75),

From bc2e1cdba38eac55b8ef47df3ad84d07ff7dc48c Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 24 Sep 2018 20:02:50 +0100
Subject: [PATCH 015/117] Added unit tests for matplotlib PointPlot op mapping

---
 .../plotting/matplotlib/testpointplot.py      | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/holoviews/tests/plotting/matplotlib/testpointplot.py b/holoviews/tests/plotting/matplotlib/testpointplot.py
index 4984a7ac00..af7438de36 100644
--- a/holoviews/tests/plotting/matplotlib/testpointplot.py
+++ b/holoviews/tests/plotting/matplotlib/testpointplot.py
@@ -1,5 +1,6 @@
 import numpy as np
 
+from holoviews.core.overlay import NdOverlay
 from holoviews.element import Points
 
 from .testplot import TestMPLPlot, mpl_renderer
@@ -150,3 +151,80 @@ def test_points_padding_datetime_nonsquare(self):
         self.assertEqual(x_range[1], 736057.09999999998)
         self.assertEqual(y_range[0], 0.8)
         self.assertEqual(y_range[1], 3.2)
+
+    def test_point_color_op(self):
+        points = Points([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                        vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_facecolors(),
+                         np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
+
+    def test_point_line_color_op(self):
+        points = Points([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                        vdims='color').options(edgecolors='color')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_edgecolors(),
+                         np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
+
+    def test_point_fill_color_op(self):
+        points = Points([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                        vdims='color').options(facecolors='color')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_facecolors(),
+                         np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
+
+    def test_point_linear_color_op(self):
+        points = Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(artist.get_clim(), (0, 2))
+
+    def test_point_categorical_color_op(self):
+        points = Points([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'A')],
+                        vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([0, 1, 0]))
+        self.assertEqual(artist.get_clim(), (0, 1))
+
+    def test_point_size_op(self):
+        points = Points([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                        vdims='size').options(s='size')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_sizes(), np.array([1, 4, 8]))
+
+    def test_point_line_width_op(self):
+        points = Points([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                        vdims='line_width').options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [1, 4, 8])
+
+    def test_point_marker_op(self):
+        points = Points([(0, 0, 'circle'), (0, 1, 'triangle'), (0, 2, 'square')],
+                        vdims='marker').options(marker='marker')
+        with self.assertRaises(ValueError):
+            mpl_renderer.get_plot(points)
+
+    def test_point_alpha_op(self):
+        points = Points([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                        vdims='alpha').options(alpha='alpha')
+        with self.assertRaises(ValueError):
+            mpl_renderer.get_plot(points)
+
+    def test_op_ndoverlay_value(self):
+        markers = ['d', 's']
+        overlay = NdOverlay({marker: Points(np.arange(i))
+                             for i, marker in enumerate(markers)},
+                            'Marker').options('Points', marker='Marker')
+        plot = mpl_renderer.get_plot(overlay)
+        for subplot, marker in zip(plot.subplots.values(), markers):
+            style = dict(subplot.style[subplot.cyclic_index])
+            style = subplot._apply_ops(subplot.current_frame, {}, style)
+            self.assertEqual(style['marker'], marker)

From b8fdc0bd96a1b8510a0aab105e040ef34a28e740 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 29 Oct 2018 00:02:53 +0000
Subject: [PATCH 016/117] Created new module for bokeh styles and utilities

---
 holoviews/plotting/bokeh/annotation.py        |   4 +-
 holoviews/plotting/bokeh/chart.py             |   7 +-
 holoviews/plotting/bokeh/element.py           |  31 +--
 holoviews/plotting/bokeh/graphs.py            |   7 +-
 holoviews/plotting/bokeh/heatmap.py           |   6 +-
 holoviews/plotting/bokeh/hex_tiles.py         |   3 +-
 holoviews/plotting/bokeh/path.py              |   5 +-
 holoviews/plotting/bokeh/raster.py            |   5 +-
 holoviews/plotting/bokeh/stats.py             |   6 +-
 holoviews/plotting/bokeh/styles.py            | 182 ++++++++++++++++++
 holoviews/plotting/bokeh/util.py              | 127 +-----------
 .../tests/plotting/bokeh/testpointplot.py     |  15 +-
 12 files changed, 224 insertions(+), 174 deletions(-)
 create mode 100644 holoviews/plotting/bokeh/styles.py

diff --git a/holoviews/plotting/bokeh/annotation.py b/holoviews/plotting/bokeh/annotation.py
index 4f4f31436f..7972a61abf 100644
--- a/holoviews/plotting/bokeh/annotation.py
+++ b/holoviews/plotting/bokeh/annotation.py
@@ -17,8 +17,8 @@
 from ...core.util import dimension_sanitizer, basestring
 from ...element import HLine
 from ..plot import GenericElementPlot
-from .element import (AnnotationPlot, CompositeElementPlot, ColorbarPlot,
-                      ElementPlot, text_properties, line_properties)
+from .element import AnnotationPlot, ElementPlot, CompositeElementPlot, ColorbarPlot
+from .styles import text_properties, line_properties
 from .plot import BokehPlot
 
 
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 40568ec052..7d4f6c6d36 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -11,9 +11,10 @@
 from ...element import Bars
 from ...operation import interpolate_curve
 from ..util import compute_sizes, get_min_distance, dim_axis_label, get_axis_padding
-from .element import (ElementPlot, ColorbarPlot, LegendPlot, line_properties,
-                      fill_properties)
-from .util import expand_batched_style, categorize_array, rgb2hex, mpl_to_bokeh
+from .element import ElementPlot, ColorbarPlot, LegendPlot
+from .styles import (expand_batched_style, line_properties, fill_properties,
+                     mpl_to_bokeh, rgb2hex)
+from .util import categorize_array
 
 
 class PointPlot(LegendPlot, ColorbarPlot):
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index c7c2102274..3a6075cf6a 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -31,31 +31,16 @@
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import BokehPlot, TOOLS
+from .styles import (
+    legend_dimensions, line_properties, mpl_to_bokeh, no_op_styles,
+    rgba_tuple, text_properties, validate
+)
 from .util import (
-    mpl_to_bokeh, get_tab_title,  py2js_tickformatter, rgba_tuple,
-    recursive_model_update, glyph_order, decode_bytes, bokeh_version,
-    theme_attr_json, is_color, cds_column_replace, hold_policy
+    bokeh_version, decode_bytes, get_tab_title, glyph_order,
+    py2js_tickformatter, recursive_model_update, theme_attr_json,
+    cds_column_replace, hold_policy
 )
 
-property_prefixes = ['selection', 'nonselection', 'muted', 'hover']
-
-# Define shared style properties for bokeh plots
-line_properties = ['line_color', 'line_alpha', 'color', 'alpha', 'line_width',
-                   'line_join', 'line_cap', 'line_dash']
-line_properties += ['_'.join([prefix, prop]) for prop in line_properties[:4]
-                    for prefix in property_prefixes]
-
-fill_properties = ['fill_color', 'fill_alpha']
-fill_properties += ['_'.join([prefix, prop]) for prop in fill_properties
-                    for prefix in property_prefixes]
-
-text_properties = ['text_font', 'text_font_size', 'text_font_style', 'text_color',
-                   'text_alpha', 'text_align', 'text_baseline']
-
-legend_dimensions = ['label_standoff', 'label_width', 'label_height', 'glyph_width',
-                     'glyph_height', 'legend_padding', 'legend_spacing', 'click_policy']
-
-no_op_styles = ['cmap', 'palette', 'marker']
 
 
 class ElementPlot(BokehPlot, GenericElementPlot):
@@ -714,7 +699,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
 
             numeric = isinstance(val, np.ndarray) and val.dtype.kind in 'uifMm'
             if ('color' in k and isinstance(val, np.ndarray) and
-                (numeric or not all(is_color(v) for v in val))):
+                (numeric or not validate('color', val))):
                 kwargs = {}
                 if val.dtype.kind not in 'if':
                     kwargs['factors'] = np.unique(val)
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 442a17caa0..7545d18cff 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -9,13 +9,14 @@
 from ...core.util import (basestring, dimension_sanitizer, unique_array,
                           max_range)
 from ...core.options import Cycle
-from .chart import ColorbarPlot, PointPlot
-from .element import (CompositeElementPlot, LegendPlot, line_properties,
-                      fill_properties, text_properties)
 from ..util import process_cmap
+from .chart import ColorbarPlot, PointPlot
+from .element import CompositeElementPlot, LegendPlot
+from .styles import line_properties, fill_properties, text_properties
 from .util import rgba_tuple
 
 
+
 class GraphPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
 
     color_index = param.ClassSelector(default=None, class_=(basestring, int),
diff --git a/holoviews/plotting/bokeh/heatmap.py b/holoviews/plotting/bokeh/heatmap.py
index eb33542db1..762b550466 100644
--- a/holoviews/plotting/bokeh/heatmap.py
+++ b/holoviews/plotting/bokeh/heatmap.py
@@ -6,10 +6,8 @@
 
 from ...core.util import is_nan, dimension_sanitizer
 from ...core.spaces import HoloMap
-from .element import (ColorbarPlot, CompositeElementPlot,
-                      line_properties, fill_properties, text_properties)
-from .util import mpl_to_bokeh
-
+from .element import ColorbarPlot, CompositeElementPlot
+from .styles import line_properties, fill_properties, mpl_to_bokeh, text_properties
 
 
 class HeatMapPlot(ColorbarPlot):
diff --git a/holoviews/plotting/bokeh/hex_tiles.py b/holoviews/plotting/bokeh/hex_tiles.py
index 3969a56ea8..7b90ce9223 100644
--- a/holoviews/plotting/bokeh/hex_tiles.py
+++ b/holoviews/plotting/bokeh/hex_tiles.py
@@ -12,7 +12,8 @@
 from ...core.options import Compositor, SkipRendering
 from ...core.util import basestring, isfinite
 from ...element import HexTiles
-from .element import ColorbarPlot, line_properties, fill_properties
+from .element import ColorbarPlot
+from .styles import line_properties, fill_properties
 from .util import bokeh_version
 
 
diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index 335b28171f..c956a6dc5f 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -5,8 +5,9 @@
 
 from ...core import util
 from ...element import Polygons
-from .element import ColorbarPlot, LegendPlot, line_properties, fill_properties
-from .util import expand_batched_style, mpl_to_bokeh, bokeh_version, multi_polygons_data
+from .element import ColorbarPlot, LegendPlot
+from .styles import expand_batched_style, line_properties, fill_properties, mpl_to_bokeh
+from .util import bokeh_version, multi_polygons_data
 
 
 class PathPlot(ColorbarPlot):
diff --git a/holoviews/plotting/bokeh/raster.py b/holoviews/plotting/bokeh/raster.py
index f92936313d..d560c9185f 100644
--- a/holoviews/plotting/bokeh/raster.py
+++ b/holoviews/plotting/bokeh/raster.py
@@ -3,8 +3,9 @@
 
 from ...core.util import cartesian_product, dimension_sanitizer, isfinite
 from ...element import Raster, RGB, HSV
-from .element import ElementPlot, ColorbarPlot, line_properties, fill_properties
-from .util import mpl_to_bokeh, colormesh, bokeh_version
+from .element import ElementPlot, ColorbarPlot
+from .styles import line_properties, fill_properties, mpl_to_bokeh
+from .util import bokeh_version, colormesh
 
 
 class RasterPlot(ColorbarPlot):
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index 033f36e5e8..2733fb7543 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -12,10 +12,10 @@
                           unique_iterator, isfinite)
 from ...operation.stats import univariate_kde
 from .chart import AreaPlot
-from .element import (CompositeElementPlot, ColorbarPlot, LegendPlot,
-                      fill_properties, line_properties)
+from .element import CompositeElementPlot, ColorbarPlot, LegendPlot
 from .path import PolygonPlot
-from .util import rgb2hex, decode_bytes
+from .styles import fill_properties, line_properties, rgb2hex
+from .util import decode_bytes
 
 
 class DistributionPlot(AreaPlot):
diff --git a/holoviews/plotting/bokeh/styles.py b/holoviews/plotting/bokeh/styles.py
new file mode 100644
index 0000000000..5c3fc93cb6
--- /dev/null
+++ b/holoviews/plotting/bokeh/styles.py
@@ -0,0 +1,182 @@
+"""
+Defines valid style options, validation and utilities
+"""
+
+import numpy as np
+
+from bokeh.core.properties import (
+    Angle, Color, DashPattern, FontSize, MarkerType, Size
+)
+
+try:
+    from matplotlib import colors
+    import matplotlib.cm as cm
+except ImportError:
+    cm, colors = None, None
+
+from ...core.options import abbreviated_exception
+from ...core.util import basestring
+from ..util import COLOR_ALIASES, RGB_HEX_REGEX, rgb2hex
+
+# Define shared style properties for bokeh plots
+
+property_prefixes = ['selection', 'nonselection', 'muted', 'hover']
+
+line_properties = ['line_color', 'line_alpha', 'color', 'alpha', 'line_width',
+                   'line_join', 'line_cap', 'line_dash']
+line_properties += ['_'.join([prefix, prop]) for prop in line_properties[:4]
+                    for prefix in property_prefixes]
+
+fill_properties = ['fill_color', 'fill_alpha']
+fill_properties += ['_'.join([prefix, prop]) for prop in fill_properties
+                    for prefix in property_prefixes]
+
+text_properties = ['text_font', 'text_font_size', 'text_font_style', 'text_color',
+                   'text_alpha', 'text_align', 'text_baseline']
+
+legend_dimensions = ['label_standoff', 'label_width', 'label_height', 'glyph_width',
+                     'glyph_height', 'legend_padding', 'legend_spacing', 'click_policy']
+
+no_op_styles = ['cmap', 'palette']
+
+# Conversion between matplotlib and bokeh markers
+
+markers = {
+    's': {'marker': 'square'},
+    'd': {'marker': 'diamond'},
+    '^': {'marker': 'triangle', 'angle': 0},
+    '>': {'marker': 'triangle', 'angle': -np.pi/2},
+    'v': {'marker': 'triangle', 'angle': np.pi},
+    '<': {'marker': 'triangle', 'angle': np.pi/2},
+    '1': {'marker': 'triangle', 'angle': 0},
+    '2': {'marker': 'triangle', 'angle': -np.pi/2},
+    '3': {'marker': 'triangle', 'angle': np.pi},
+    '4': {'marker': 'triangle', 'angle': np.pi/2}
+}
+
+
+def mpl_to_bokeh(properties):
+    """
+    Utility to process style properties converting any
+    matplotlib specific options to their nearest bokeh
+    equivalent.
+    """
+    new_properties = {}
+    for k, v in properties.items():
+        if k == 's':
+            new_properties['size'] = v
+        elif k == 'marker':
+            new_properties.update(markers.get(v, {'marker': v}))
+        elif (k == 'color' or k.endswith('_color')) and not isinstance(v, dict):
+            with abbreviated_exception():
+                v = COLOR_ALIASES.get(v, v)
+            if isinstance(v, tuple):
+                with abbreviated_exception():
+                    v = rgb2hex(v)
+            new_properties[k] = v
+        else:
+            new_properties[k] = v
+    new_properties.pop('cmap', None)
+    return new_properties
+
+# Validation
+
+angle     = Angle()
+color     = Color()
+dash_pattern = DashPattern()
+font_size = FontSize()
+marker    = MarkerType()
+size      = Size()
+
+validators = {
+    'angle'     : angle.is_valid,
+    'color'     : lambda x: (
+        color.is_valid(x) or (isinstance(x, basestring) and RGB_HEX_REGEX.match(x))
+    ),
+    'font_size' : font_size.is_valid,
+    'line_dash' : dash_pattern.is_valid,
+    'marker'    : marker.is_valid,
+    'size'      : size.is_valid,
+}
+
+def get_validator(style):
+    for k, v in validators.items():
+        if style.endswith(k):
+            return v
+
+
+def validate(style, value):
+    """
+    Validates a style and associated value.
+
+    Arguments
+    ---------
+    style: str
+       The style to validate (e.g. 'color', 'size' or 'marker')
+    value: 
+       The style value to validate
+
+    Returns
+    -------
+    valid: boolean or None
+       If validation is supported returns boolean, otherwise None
+    """
+    validator = get_validator(style)
+    if validator is None:
+        return None
+    if isinstance(value, (np.ndarray, list)):
+        return all(validator(v) for v in value)
+    return validator(value)
+
+# Utilities
+
+def rgba_tuple(rgba):
+    """
+    Ensures RGB(A) tuples in the range 0-1 are scaled to 0-255.
+    """
+    if isinstance(rgba, tuple):
+        return tuple(int(c*255) if i<3 else c for i, c in enumerate(rgba))
+    else:
+        return COLOR_ALIASES.get(rgba, rgba)
+
+
+def expand_batched_style(style, opts, mapping, nvals):
+    """
+    Computes styles applied to a batched plot by iterating over the
+    supplied list of style options and expanding any options found in
+    the supplied style dictionary returning a data and mapping defining
+    the data that should be added to the ColumnDataSource.
+    """
+    opts = sorted(opts, key=lambda x: x in ['color', 'alpha'])
+    applied_styles = set(mapping)
+    style_data, style_mapping = {}, {}
+    for opt in opts:
+        if 'color' in opt:
+            alias = 'color'
+        elif 'alpha' in opt:
+            alias = 'alpha'
+        else:
+            alias = None
+        if opt not in style or opt in mapping:
+            continue
+        elif opt == alias:
+            if alias in applied_styles:
+                continue
+            elif 'line_'+alias in applied_styles:
+                if 'fill_'+alias not in opts:
+                    continue
+                opt = 'fill_'+alias
+                val = style[alias]
+            elif 'fill_'+alias in applied_styles:
+                opt = 'line_'+alias
+                val = style[alias]
+            else:
+                val = style[alias]
+        else:
+            val = style[opt]
+        style_mapping[opt] = {'field': opt}
+        applied_styles.add(opt)
+        if 'color' in opt and isinstance(val, tuple):
+            val = rgb2hex(val)
+        style_data[opt] = [val]*nvals
+    return style_data, style_mapping
diff --git a/holoviews/plotting/bokeh/util.py b/holoviews/plotting/bokeh/util.py
index 0775647b05..299f0f83ee 100644
--- a/holoviews/plotting/bokeh/util.py
+++ b/holoviews/plotting/bokeh/util.py
@@ -6,19 +6,11 @@
 
 import numpy as np
 
-try:
-    from matplotlib import colors
-    import matplotlib.cm as cm
-except ImportError:
-    cm, colors = None, None
-
 import param
 import bokeh
 
 bokeh_version = LooseVersion(bokeh.__version__)  # noqa
 
-from bokeh.colors.named import __all__ as named_colors
-from bokeh.core.enums import Palette
 from bokeh.core.json_encoder import serialize_json # noqa (API import)
 from bokeh.core.properties import value
 from bokeh.layouts import WidgetBox, Row, Column
@@ -37,26 +29,12 @@
 except:
     Chart = type(None) # Create stub for isinstance check
 
-from ...core.options import abbreviated_exception
 from ...core.overlay import Overlay
 from ...core.util import (basestring, unique_array, callable_name, pd,
                           dt64_to_dt, _getargspec)
 from ...core.spaces import get_nested_dmaps, DynamicMap
+from ..util import dim_axis_label
 
-from ..util import dim_axis_label, rgb2hex, COLOR_ALIASES, RGB_HEX_REGEX
-
-# Conversion between matplotlib and bokeh markers
-markers = {'s': {'marker': 'square'},
-           'd': {'marker': 'diamond'},
-           '+': {'marker': 'cross'},
-           '^': {'marker': 'triangle', 'angle': 0},
-           '>': {'marker': 'triangle', 'angle': -np.pi/2},
-           'v': {'marker': 'triangle', 'angle': np.pi},
-           '<': {'marker': 'triangle', 'angle': np.pi/2},
-           '1': {'marker': 'triangle', 'angle': 0},
-           '2': {'marker': 'triangle', 'angle': -np.pi/2},
-           '3': {'marker': 'triangle', 'angle': np.pi},
-           '4': {'marker': 'triangle', 'angle': np.pi/2}}
 
 
 def convert_timestamp(timestamp):
@@ -67,31 +45,6 @@ def convert_timestamp(timestamp):
     return np.datetime64(datetime.replace(tzinfo=None))
 
 
-def rgba_tuple(rgba):
-    """
-    Ensures RGB(A) tuples in the range 0-1 are scaled to 0-255.
-    """
-    if isinstance(rgba, tuple):
-        return tuple(int(c*255) if i<3 else c for i, c in enumerate(rgba))
-    else:
-        return COLOR_ALIASES.get(rgba, rgba)
-
-
-def is_color(color):
-    """
-    Checks if the supplied value is a valid color spec.
-    """
-    if not isinstance(color, basestring):
-        return False
-    elif RGB_HEX_REGEX.match(color):
-        return True
-    elif color in COLOR_ALIASES:
-        return True
-    elif color in named_colors:
-        return True
-    return False
-
-
 def decode_bytes(array):
     """
     Decodes an array, list or tuple of bytestrings to avoid python 3
@@ -108,43 +61,6 @@ def decode_bytes(array):
     return decoded
 
 
-def get_cmap(cmap):
-    """
-    Returns matplotlib cmap generated from bokeh palette or
-    directly accessed from matplotlib.
-    """
-    with abbreviated_exception():
-        rgb_vals = getattr(Palette, cmap, None)
-        if rgb_vals:
-            return colors.ListedColormap(rgb_vals, name=cmap)
-        return cm.get_cmap(cmap)
-
-
-def mpl_to_bokeh(properties):
-    """
-    Utility to process style properties converting any
-    matplotlib specific options to their nearest bokeh
-    equivalent.
-    """
-    new_properties = {}
-    for k, v in properties.items():
-        if k == 's':
-            new_properties['size'] = v
-        elif k == 'marker':
-            new_properties.update(markers.get(v, {'marker': v}))
-        elif (k == 'color' or k.endswith('_color')) and not isinstance(v, dict):
-            with abbreviated_exception():
-                v = COLOR_ALIASES.get(v, v)
-            if isinstance(v, tuple):
-                with abbreviated_exception():
-                    v = rgb2hex(v)
-            new_properties[k] = v
-        else:
-            new_properties[k] = v
-    new_properties.pop('cmap', None)
-    return new_properties
-
-
 def layout_padding(plots, renderer):
     """
     Pads Nones in a list of lists of plots with empty plots.
@@ -434,47 +350,6 @@ def get_tab_title(key, frame, overlay):
     return title
 
 
-def expand_batched_style(style, opts, mapping, nvals):
-    """
-    Computes styles applied to a batched plot by iterating over the
-    supplied list of style options and expanding any options found in
-    the supplied style dictionary returning a data and mapping defining
-    the data that should be added to the ColumnDataSource.
-    """
-    opts = sorted(opts, key=lambda x: x in ['color', 'alpha'])
-    applied_styles = set(mapping)
-    style_data, style_mapping = {}, {}
-    for opt in opts:
-        if 'color' in opt:
-            alias = 'color'
-        elif 'alpha' in opt:
-            alias = 'alpha'
-        else:
-            alias = None
-        if opt not in style or opt in mapping:
-            continue
-        elif opt == alias:
-            if alias in applied_styles:
-                continue
-            elif 'line_'+alias in applied_styles:
-                if 'fill_'+alias not in opts:
-                    continue
-                opt = 'fill_'+alias
-                val = style[alias]
-            elif 'fill_'+alias in applied_styles:
-                opt = 'line_'+alias
-                val = style[alias]
-            else:
-                val = style[alias]
-        else:
-            val = style[opt]
-        style_mapping[opt] = {'field': opt}
-        applied_styles.add(opt)
-        if 'color' in opt and isinstance(val, tuple):
-            val = rgb2hex(val)
-        style_data[opt] = [val]*nvals
-    return style_data, style_mapping
-
 
 def filter_batched_data(data, mapping):
     """
diff --git a/holoviews/tests/plotting/bokeh/testpointplot.py b/holoviews/tests/plotting/bokeh/testpointplot.py
index 225671ddff..8820ab0b97 100644
--- a/holoviews/tests/plotting/bokeh/testpointplot.py
+++ b/holoviews/tests/plotting/bokeh/testpointplot.py
@@ -13,7 +13,7 @@
 
 try:
     from bokeh.models import FactorRange, LinearColorMapper, CategoricalColorMapper
-    from bokeh.models.glyphs import Circle, Triangle
+    from bokeh.models import Scatter
 except:
     pass
 
@@ -438,11 +438,16 @@ def test_point_line_width_op(self):
     def test_point_marker_op(self):
         points = Points([(0, 0, 'circle'), (0, 1, 'triangle'), (0, 2, 'square')],
                         vdims='marker').options(marker='marker')
-        with self.assertRaises(ValueError):
-            bokeh_renderer.get_plot(points)
+        plot = bokeh_renderer.get_plot(points)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['marker'], np.array(['circle', 'triangle', 'square']))
+        self.assertEqual(glyph.marker, 'marker')
 
     def test_op_ndoverlay_value(self):
-        overlay = NdOverlay({marker: Points(np.arange(i)) for i, marker in enumerate(['circle', 'triangle'])}, 'Marker').options('Points', marker='Marker')
+        markers = ['circle', 'triangle']
+        overlay = NdOverlay({marker: Points(np.arange(i)) for i, marker in enumerate(markers)}, 'Marker').options('Points', marker='Marker')
         plot = bokeh_renderer.get_plot(overlay)
-        for subplot, glyph_type in zip(plot.subplots.values(), [Circle, Triangle]):
+        for subplot, glyph_type, marker in zip(plot.subplots.values(), [Scatter, Scatter], markers):
             self.assertIsInstance(subplot.handles['glyph'], glyph_type)
+            self.assertEqual(subplot.handles['glyph'].marker, marker)

From b5c01911c7e0834d59b8ff8e21162285877f7220 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Fri, 9 Nov 2018 04:18:57 +0000
Subject: [PATCH 017/117] Improved validation of op mappings

---
 holoviews/plotting/bokeh/__init__.py |  2 +-
 holoviews/plotting/bokeh/chart.py    | 11 ++++++++++
 holoviews/plotting/bokeh/element.py  | 33 ++++++++++++++++++----------
 holoviews/plotting/bokeh/graphs.py   |  5 +++--
 holoviews/plotting/bokeh/stats.py    |  4 ++++
 holoviews/plotting/bokeh/styles.py   |  2 --
 holoviews/plotting/mpl/annotation.py |  2 ++
 holoviews/plotting/mpl/element.py    | 30 +++++++++++++++----------
 holoviews/plotting/mpl/graphs.py     |  4 ++++
 holoviews/plotting/mpl/stats.py      |  6 +++++
 holoviews/util/ops.py                |  3 +++
 11 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/holoviews/plotting/bokeh/__init__.py b/holoviews/plotting/bokeh/__init__.py
index 2c11930a6b..13fd9aa3ad 100644
--- a/holoviews/plotting/bokeh/__init__.py
+++ b/holoviews/plotting/bokeh/__init__.py
@@ -170,7 +170,7 @@ def colormap_generator(palette):
 options.Histogram = Options('style', line_color='black', fill_color=Cycle(), muted_alpha=0.2)
 options.ErrorBars = Options('style', color='black')
 options.Spread = Options('style', color=Cycle(), alpha=0.6, line_color='black', muted_alpha=0.2)
-options.Bars = Options('style', color=Cycle(), line_color='black', width=0.8, muted_alpha=0.2)
+options.Bars = Options('style', color=Cycle(), line_color='black', bar_width=0.8, muted_alpha=0.2)
 
 options.Spikes = Options('style', color='black', cmap='fire', muted_alpha=0.2)
 options.Area = Options('style', color=Cycle(), alpha=1, line_color='black', muted_alpha=0.2)
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 7d4f6c6d36..08899336a3 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -166,6 +166,9 @@ class VectorFieldPlot(ColorbarPlot):
        smallest non-zero distance between two vectors.""")
 
     style_opts = line_properties + ['scale', 'cmap']
+
+    _no_op_styles = ['scale', 'cmap']
+
     _plot_methods = dict(single='segment')
 
     def _get_lengths(self, element, ranges):
@@ -263,6 +266,8 @@ class CurvePlot(ElementPlot):
         'steps-pre' and 'steps-post'.""")
 
     style_opts = line_properties
+    _no_op_styles = line_properties
+    
     _plot_methods = dict(single='line', batched='multi_line')
     _batched_style_opts = line_properties
 
@@ -486,6 +491,8 @@ def _init_glyph(self, plot, mapping, properties):
 class SpreadPlot(ElementPlot):
 
     style_opts = line_properties + fill_properties
+    _no_op_style = style_opts
+
     _plot_methods = dict(single='patch')
 
     _stream_data = False # Plot does not support streaming data
@@ -697,6 +704,8 @@ class BarPlot(ColorbarPlot, LegendPlot):
 
     style_opts = line_properties + fill_properties + ['width', 'bar_width', 'cmap']
 
+    _no_op_styles = ['bar_width', 'cmap', 'width']
+
     _plot_methods = dict(single=('vbar', 'hbar'))
 
     # Declare that y-range should auto-range if not bounded
@@ -862,6 +871,8 @@ def get_data(self, element, ranges, style):
 
         # Define style information
         width = style.get('bar_width', style.get('width', 1))
+        if 'width' in style:
+            self.warning("BarPlot width option is deprecated use 'bar_width' instead.")
         cmap = style.get('cmap')
         hover = 'hover' in self.handles
 
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 3a6075cf6a..2d1c723c33 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -32,8 +32,8 @@
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import BokehPlot, TOOLS
 from .styles import (
-    legend_dimensions, line_properties, mpl_to_bokeh, no_op_styles,
-    rgba_tuple, text_properties, validate
+    legend_dimensions, line_properties, mpl_to_bokeh, rgba_tuple,
+    text_properties, validate
 )
 from .util import (
     bokeh_version, decode_bytes, get_tab_title, glyph_order,
@@ -116,6 +116,9 @@ class ElementPlot(BokehPlot, GenericElementPlot):
 
     _categorical = False
 
+    # Declare which styles cannot be mapped to a non-scalar dimension
+    _no_op_styles = []
+
     # Declares the default types for continuous x- and y-axes
     _x_range_type = Range1d
     _y_range_type = Range1d
@@ -664,7 +667,8 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             if not isinstance(v, op) or (group is not None and not k.startswith(group)):
                 continue
             dname = v.dimension.name
-            if dname not in element and v.dimension not in self.overlay_dims:
+            if (dname not in element and v.dimension not in self.overlay_dims and
+                not (isinstance(element, Graph) and v.dimension in element.nodes)):
                 new_style.pop(k)
                 self.warning('Specified %s op %r could not be applied, %s dimension '
                              'could not be found' % (k, v, v.dimension))
@@ -679,13 +683,17 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 val = val if np.isscalar(val) else val[0]
 
             if not np.isscalar(val):
-                if k in no_op_styles:
-                    raise ValueError('Mapping the a dimension to the "{style}" '
-                                     'style option is not supported. To '
-                                     'map the {dim} dimension to the {style} '
-                                     'use a groupby operation to overlay '
-                                     'your data along the dimension.'.format(
-                                         style=k, dim=v.dimension))
+                if k in self._no_op_styles:
+                    raise ValueError('Mapping a dimension to the "{style}" '
+                                     'style option is not supported by the '
+                                     '{backend} backend. To map the {dim} '
+                                     'dimension to the {style} use a '
+                                     'groupby operation to overlay your '
+                                     'data along the dimension.'.format(
+                                         style=k, dim=v.dimension,
+                                         backend=self.renderer.backend
+                                     )
+                    )
                 elif source.data and len(val) != len(list(source.data.values())[0]):
                     continue
 
@@ -711,7 +719,8 @@ def _apply_ops(self, element, source, ranges, style, group=None):
 
 
     def _glyph_properties(self, plot, element, source, ranges, style, group=None):
-        new_style = self._apply_ops(element, source, ranges, style, group)
+        with abbreviated_exception():
+            new_style = self._apply_ops(element, source, ranges, style, group)
         properties = dict(new_style, source=source)
         if self.show_legend:
             if self.overlay_dims:
@@ -1178,6 +1187,8 @@ class ColorbarPlot(ElementPlot):
 
     _default_nan = '#8b8b8b'
 
+    _no_op_styles = ['cmap', 'palette']
+
     def _draw_colorbar(self, plot, color_mapper):
         if CategoricalColorMapper and isinstance(color_mapper, CategoricalColorMapper):
             return
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 7545d18cff..d6093b0a51 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -12,8 +12,7 @@
 from ..util import process_cmap
 from .chart import ColorbarPlot, PointPlot
 from .element import CompositeElementPlot, LegendPlot
-from .styles import line_properties, fill_properties, text_properties
-from .util import rgba_tuple
+from .styles import line_properties, fill_properties, text_properties, rgba_tuple
 
 
 
@@ -45,6 +44,8 @@ class GraphPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
                   ['node_'+p for p in fill_properties+line_properties] +
                   ['node_size', 'cmap', 'edge_cmap'])
 
+    _no_op_styles =  ['cmap', 'edge_cmap']
+
     # Filled is only supported for subclasses
     filled = False
 
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index 2733fb7543..c92972ab76 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -77,6 +77,8 @@ class BoxWhiskerPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
                   ['outlier_'+p for p in fill_properties+line_properties] +
                   ['width', 'box_width', 'cmap'])
 
+    _no_op_styles = ['box_width', 'width', 'cmap']
+
     _stream_data = False # Plot does not support streaming data
 
     def get_extents(self, element, ranges, range_type='combined'):
@@ -134,6 +136,8 @@ def get_data(self, element, ranges, style):
 
         # Define glyph-data mapping
         width = style.get('box_width', style.get('width', 0.7))
+        if 'width' in style:
+            self.warning("BoxWhisker width option is deprecated use 'box_width' instead.")
         if self.invert_axes:
             vbar_map = {'y': 'index', 'left': 'top', 'right': 'bottom', 'height': width}
             seg_map = {'y0': 'x0', 'y1': 'x1', 'x0': 'y0', 'x1': 'y1'}
diff --git a/holoviews/plotting/bokeh/styles.py b/holoviews/plotting/bokeh/styles.py
index 5c3fc93cb6..12b7627c81 100644
--- a/holoviews/plotting/bokeh/styles.py
+++ b/holoviews/plotting/bokeh/styles.py
@@ -37,8 +37,6 @@
 legend_dimensions = ['label_standoff', 'label_width', 'label_height', 'glyph_width',
                      'glyph_height', 'legend_padding', 'legend_spacing', 'click_policy']
 
-no_op_styles = ['cmap', 'palette']
-
 # Conversion between matplotlib and bokeh markers
 
 markers = {
diff --git a/holoviews/plotting/mpl/annotation.py b/holoviews/plotting/mpl/annotation.py
index e3b9a7d041..328a26516a 100644
--- a/holoviews/plotting/mpl/annotation.py
+++ b/holoviews/plotting/mpl/annotation.py
@@ -101,6 +101,8 @@ class LabelsPlot(ColorbarPlot):
     style_opts = ['alpha', 'color', 'family', 'weight', 'size', 'visible',
                   'horizontalalignment', 'verticalalignment', 'cmap', 'rotation']
 
+    _no_op_styles = []
+
     _plot_methods = dict(single='annotate')
 
     def get_data(self, element, ranges, style):
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index abd4f48abe..55035f41ac 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -20,8 +20,6 @@
 from .util import wrap_formatter, is_color, categorize_colors
 from distutils.version import LooseVersion
 
-no_op_styles = ['marker', 'alpha', 'cmap', 'angle']
-
 
 class ElementPlot(GenericElementPlot, MPLPlot):
 
@@ -76,6 +74,9 @@ class ElementPlot(GenericElementPlot, MPLPlot):
     # Element Plots should declare the valid style options for matplotlib call
     style_opts = []
 
+    # Declare which styles cannot be mapped to a non-scalar dimension
+    _no_op_styles = ['marker', 'alpha', 'cmap', 'angle']
+
     # Whether plot has axes, disables setting axis limits, labels and ticks
     _has_axes = True
 
@@ -479,7 +480,8 @@ def initialize_plot(self, ranges=None):
         if self.show_legend:
             style['label'] = element.label
 
-        style = self._apply_ops(element, ranges, style)
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
         plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, style)
 
         with abbreviated_exception():
@@ -507,7 +509,8 @@ def update_handles(self, key, axis, element, ranges, style):
         Update the elements of the plot.
         """
         self.teardown_handles()
-        new_style = self._apply_ops(element, range, style)
+        with abbreviated_exception():
+            new_style = self._apply_ops(element, range, style)
         plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, new_style)
 
         with abbreviated_exception():
@@ -543,14 +546,17 @@ def _apply_ops(self, element, ranges, style):
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
 
-            if not np.isscalar(val) and k in no_op_styles:
-                    raise ValueError('Mapping the a dimension to the "{style}" '
-                                     'style option is not supported. To '
-                                     'map the {dim} dimension to the {style} '
-                                     'use a groupby operation to overlay '
-                                     'your data along the dimension.'.format(
-                                         style=k, dim=v.dimension))
-
+            if not np.isscalar(val) and k in self._no_op_styles:
+                raise ValueError('Mapping a dimension to the "{style}" '
+                                 'style option is not supported by the '
+                                 '{backend} backend. To map the "{dim}" '
+                                 'dimension to the {style} use a '
+                                 'groupby operation to overlay your '
+                                 'data along the dimension.'.format(
+                                     style=k, dim=v.dimension,
+                                     backend=self.renderer.backend
+                                 )
+                )
             if 'color' == k and (isinstance(val, np.ndarray) and all(not is_color(c) for c in val)):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v.dimension, val)
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 92e7242a3d..3af764db21 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -27,6 +27,9 @@ class GraphPlot(ColorbarPlot):
 
     _style_groups = ['node', 'edge']
 
+    _no_op_styles = ['edge_alpha', 'edge_linestyle', 'edge_cmap', 'cmap',
+                     'visible', 'node_marker']
+
     filled = False
 
     def _compute_styles(self, element, ranges, style):
@@ -124,6 +127,7 @@ def init_artists(self, ax, plot_args, plot_kwargs):
                 edge_opts['facecolors'] = edge_opts.pop('colors')
         else:
             coll = LineCollection
+        print(edge_opts)
         edges = coll(paths, **edge_opts)
         ax.add_collection(edges)
 
diff --git a/holoviews/plotting/mpl/stats.py b/holoviews/plotting/mpl/stats.py
index 25ba56c1c1..449621bc2f 100644
--- a/holoviews/plotting/mpl/stats.py
+++ b/holoviews/plotting/mpl/stats.py
@@ -56,6 +56,9 @@ class BoxPlot(ChartPlot):
                   'whiskerprops', 'capprops', 'flierprops',
                   'medianprops', 'meanprops', 'meanline']
 
+    _no_op_styles = [s for s in style_opts
+                     if s not in ('conf_intervals', 'widths')] 
+
     _plot_methods = dict(single='boxplot')
 
     def get_extents(self, element, ranges, range_type='combined'):
@@ -150,6 +153,9 @@ class ViolinPlot(BoxPlot):
     style_opts = ['showmeans', 'facecolors', 'showextrema', 'bw_method',
                   'widths', 'stats_color', 'box_color', 'alpha', 'edgecolors']
 
+    _no_op_styles = [s for s in style_opts
+                     if s not in ('facecolors', 'edgecolors', 'widths')] 
+
     def init_artists(self, ax, plot_args, plot_kwargs):
         box_color = plot_kwargs.pop('box_color', 'black')
         stats_color = plot_kwargs.pop('stats_color', 'black')
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 3ee4e81609..7e442b14b6 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -3,6 +3,7 @@
 
 from ..core.dimension import Dimension
 from ..core.util import basestring
+from ..element import Graph
 
 
 def norm_fn(values, min=None, max=None):
@@ -72,6 +73,8 @@ def var(self, **kwargs): return op(self, np.var, **kwargs)
     def eval(self, dataset, ranges={}):
         expanded = not ((dataset.interface.gridded and self.dimension in dataset.kdims) or
                         (dataset.interface.multi and dataset.interface.isscalar(dataset, self.dimension)))
+        if isinstance(dataset, Graph):
+            dataset = dataset if self.dimension in dataset else dataset.nodes
         data = dataset.dimension_values(self.dimension, expanded=expanded, flat=False)
         for o in self.ops:
             other = o['other']

From 8f6defa745ce4e30e744e7afab4e17b7f53013c6 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Fri, 9 Nov 2018 16:17:12 +0000
Subject: [PATCH 018/117] Improved ops validation and added tests

---
 holoviews/element/chart.py                    |   4 +-
 holoviews/plotting/bokeh/annotation.py        |   2 +
 holoviews/plotting/bokeh/chart.py             |  10 +-
 holoviews/plotting/bokeh/element.py           |  28 +++--
 holoviews/plotting/mpl/chart.py               |  33 +++++-
 holoviews/plotting/mpl/element.py             |  28 +++--
 .../tests/plotting/bokeh/testcurveplot.py     |  41 +++++++
 .../tests/plotting/bokeh/testhistogramplot.py | 109 +++++++++++++++++-
 holoviews/tests/plotting/bokeh/testlabels.py  |  71 ++++++++++++
 .../tests/plotting/bokeh/testpointplot.py     |   4 +
 .../plotting/matplotlib/testcurveplot.py      |  41 +++++++
 .../plotting/matplotlib/testhistogramplot.py  |  61 ++++++++++
 .../tests/plotting/matplotlib/testlabels.py   |  47 ++++++++
 .../plotting/matplotlib/testpointplot.py      |   8 +-
 14 files changed, 458 insertions(+), 29 deletions(-)

diff --git a/holoviews/element/chart.py b/holoviews/element/chart.py
index 7c59e7fbfc..e635bbacc6 100644
--- a/holoviews/element/chart.py
+++ b/holoviews/element/chart.py
@@ -88,7 +88,7 @@ class ErrorBars(Chart):
         the error bars.""")
 
     vdims = param.List(default=[Dimension('y'), Dimension('yerror')],
-                       bounds=(1, 3), constant=True)
+                       bounds=(1, None), constant=True)
 
 
     def range(self, dim, data_range=True, dimension_range=True):
@@ -155,7 +155,7 @@ class Histogram(Chart):
         Dimensions on Element2Ds determine the number of indexable
         dimensions.""")
 
-    vdims = param.List(default=[Dimension('Frequency')], bounds=(1,1))
+    vdims = param.List(default=[Dimension('Frequency')], bounds=(1, None))
 
     _binned = True
 
diff --git a/holoviews/plotting/bokeh/annotation.py b/holoviews/plotting/bokeh/annotation.py
index 7972a61abf..d1ce62a5a1 100644
--- a/holoviews/plotting/bokeh/annotation.py
+++ b/holoviews/plotting/bokeh/annotation.py
@@ -83,6 +83,8 @@ class LabelsPlot(ColorbarPlot, AnnotationPlot):
 
     style_opts = text_properties + ['cmap', 'angle']
 
+    _no_op_styles = ['cmap']
+
     _plot_methods = dict(single='text', batched='text')
     _batched_style_opts = text_properties
 
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 08899336a3..72a067e846 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -330,9 +330,9 @@ def get_batched_data(self, overlay, ranges):
 
 
 
-class HistogramPlot(ElementPlot):
+class HistogramPlot(ColorbarPlot):
 
-    style_opts = line_properties + fill_properties
+    style_opts = line_properties + fill_properties + ['cmap']
     _plot_methods = dict(single='quad')
 
     def get_data(self, element, ranges, style):
@@ -360,7 +360,7 @@ def get_extents(self, element, ranges, range_type='combined'):
 
 
 
-class SideHistogramPlot(ColorbarPlot, HistogramPlot):
+class SideHistogramPlot(HistogramPlot):
 
     style_opts = HistogramPlot.style_opts + ['cmap']
 
@@ -434,10 +434,12 @@ def _init_glyph(self, plot, mapping, properties):
 
 
 
-class ErrorPlot(ElementPlot):
+class ErrorPlot(ColorbarPlot):
 
     style_opts = line_properties + ['lower_head', 'upper_head']
 
+    _no_op_styles = ['line_dash']
+
     _mapping = dict(base="base", upper="upper", lower="lower")
 
     _plot_methods = dict(single=Whisker)
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 2d1c723c33..caf8a1a65f 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -677,22 +677,23 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
                 val = self.overlay_dims[v.dimension]
             else:
-                val = v.eval(element, ranges)
+                val = v.eval(element, ranges['combined'])
 
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
 
             if not np.isscalar(val):
                 if k in self._no_op_styles:
+                    element = type(element).__name__
                     raise ValueError('Mapping a dimension to the "{style}" '
                                      'style option is not supported by the '
-                                     '{backend} backend. To map the {dim} '
-                                     'dimension to the {style} use a '
-                                     'groupby operation to overlay your '
-                                     'data along the dimension.'.format(
-                                         style=k, dim=v.dimension,
+                                     '{element} element using the {backend} '
+                                     'backend. To map the "{dim}" dimension '
+                                     'to the {style} use a groupby operation '
+                                     'to overlay your data along the dimension.'.format(
+                                         style=k, dim=v.dimension, element=element,
                                          backend=self.renderer.backend
-                                     )
+                                 )
                     )
                 elif source.data and len(val) != len(list(source.data.values())[0]):
                     continue
@@ -705,6 +706,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 key = k
                 source.data[k] = val
 
+            # If color is not valid colorspec add colormapper
             numeric = isinstance(val, np.ndarray) and val.dtype.kind in 'uifMm'
             if ('color' in k and isinstance(val, np.ndarray) and
                 (numeric or not validate('color', val))):
@@ -714,6 +716,18 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 cmapper = self._get_colormapper(v.dimension, element, ranges,
                                                 style, name=dname+'_color_mapper', **kwargs)
                 key = {'field': k, 'transform': cmapper}
+
+            # If mapped to color/alpha override static fill/line style
+            for s in ('alpha', 'color'):
+                if s != k or k not in source.data:
+                    continue
+                fill_style = new_style.get('fill_'+s)
+                if fill_style and validate(s, fill_style):
+                    new_style.pop('fill_'+s)
+                line_style = new_style.get('line_'+s)
+                if line_style and validate(s, line_style):
+                    new_style.pop('line_'+s)
+
             new_style[k] = key
         return new_style
 
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index cde40f53c9..f17679019e 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -13,7 +13,8 @@
 
 import param
 
-from ...core import OrderedDict, Dimension, Store
+from ...core import OrderedDict, Dimension
+from ...core.options import Store, abbreviated_exception
 from ...core.util import (
     match_spec, unique_iterator, basestring, max_range, isfinite,
     datetime_types, dt_to_int, dt64_to_dt
@@ -68,6 +69,8 @@ class CurvePlot(ChartPlot):
 
     style_opts = ['alpha', 'color', 'visible', 'linewidth', 'linestyle', 'marker', 'ms']
 
+    _no_op_styles = style_opts
+
     _plot_methods = dict(single='plot')
 
     def get_data(self, element, ranges, style):
@@ -262,7 +265,7 @@ def get_extents(self, element, ranges, range_type='combined'):
 
 
 
-class HistogramPlot(ChartPlot):
+class HistogramPlot(ColorbarPlot):
     """
     HistogramPlot can plot DataHistograms and ViewMaps of
     DataHistograms, which can be displayed as a single frame or
@@ -273,6 +276,8 @@ class HistogramPlot(ChartPlot):
                   'edgecolor', 'log', 'capsize', 'error_kw', 'hatch',
                   'linewidth']
 
+    _no_op_styles = ['alpha', 'log', 'error_kw', 'hatch', 'visible', 'align']
+
     def __init__(self, histograms, **params):
         self.center = False
         self.cyclic = False
@@ -310,6 +315,18 @@ def initialize_plot(self, ranges=None):
             self.offset_linefn = self.handles['axis'].axhline
             self.plotfn = self.handles['axis'].bar
 
+        with abbreviated_exception():
+            style = self._apply_ops(hist, ranges, style)
+            if 'vmin' in style:
+                raise ValueError('Mapping a continuous dimension to a '
+                                 'color on a HistogramPlot is not '
+                                 'supported by the {backend} backend. '
+                                 'To map a dimension to a color supply '
+                                 'an explicit list of rgba colors.'.format(
+                                     backend=self.renderer.backend
+                                 )
+                )
+
         # Plot bars and make any adjustments
         legend = hist.label if self.show_legend else ''
         bars = self.plotfn(edges, hvals, widths, zorder=self.zorder, label=legend, align='edge', **style)
@@ -553,6 +570,9 @@ class PointPlot(ChartPlot, ColorbarPlot):
                   'linewidth', 'marker', 'size', 'visible',
                   'cmap', 'vmin', 'vmax', 'norm']
 
+    _no_ops_styles = ['alpha', 'marker', 'cmap', 'vmin', 'vmax',
+                      'norm', 'visible']
+
     _disabled_opts = ['size']
     _plot_methods = dict(single='scatter')
 
@@ -745,6 +765,8 @@ class BarPlot(LegendPlot):
     style_opts = ['alpha', 'color', 'align', 'visible', 'edgecolor',
                   'log', 'facecolor', 'capsize', 'error_kw', 'hatch']
 
+    _no_op_styles = style_opts
+
     legend_specs = dict(LegendPlot.legend_specs, **{
         'top':    dict(bbox_to_anchor=(0., 1.02, 1., .102),
                        ncol=3, loc=3, mode="expand", borderaxespad=0.),
@@ -801,6 +823,7 @@ def _compute_styles(self, element, style_groups):
         wrapped_style = self.lookup_options(element, 'style').max_cycles(len(style_product))
         color_groups = {k:tuple(wrapped_style[n][sopt] for sopt in sopts)
                         for n,k in enumerate(style_product)}
+        
         return style, color_groups, sopts
 
 
@@ -906,6 +929,8 @@ def _create_bars(self, axis, element):
                     label = ', '.join(label_key)
                     style = dict(style_opts, label='' if label in labels else label,
                                  **dict(zip(sopts, color_groups[tuple(style_key)])))
+                    with abbreviated_exception():
+                        style = self._apply_ops(element, {}, style)
                     bar = axis.bar([xpos], [val], width=width, bottom=prev,
                                    **style)
 
@@ -1000,10 +1025,10 @@ def get_data(self, element, ranges, style):
 
         pos = self.position
         if ndims > 1:
-            data = [[(x, pos), (x, pos+y)] for x, y in element.array()]
+            data = [[(x, pos), (x, pos+y)] for x, y in element.array([0, 1])]
         else:
             height = self.spike_length
-            data = [[(x[0], pos), (x[0], pos+height)] for x in element.array()]
+            data = [[(x[0], pos), (x[0], pos+height)] for x in element.array([0])]
 
         if self.invert_axes:
             data = [(line[0][::-1], line[1][::-1]) for line in data]
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 55035f41ac..d8183905c1 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -510,7 +510,7 @@ def update_handles(self, key, axis, element, ranges, style):
         """
         self.teardown_handles()
         with abbreviated_exception():
-            new_style = self._apply_ops(element, range, style)
+            new_style = self._apply_ops(element, ranges, style)
         plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, new_style)
 
         with abbreviated_exception():
@@ -541,22 +541,24 @@ def _apply_ops(self, element, ranges, style):
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
                 val = self.overlay_dims[v.dimension]
             else:
-                val = v.eval(element, ranges)
+                val = v.eval(element, ranges['combined'])
 
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
 
             if not np.isscalar(val) and k in self._no_op_styles:
+                element = type(element).__name__
                 raise ValueError('Mapping a dimension to the "{style}" '
                                  'style option is not supported by the '
-                                 '{backend} backend. To map the "{dim}" '
-                                 'dimension to the {style} use a '
-                                 'groupby operation to overlay your '
-                                 'data along the dimension.'.format(
-                                     style=k, dim=v.dimension,
+                                 '{element} element using the {backend} '
+                                 'backend. To map the "{dim}" dimension '
+                                 'to the {style} use a groupby operation '
+                                 'to overlay your data along the dimension.'.format(
+                                     style=k, dim=v.dimension, element=element,
                                      backend=self.renderer.backend
                                  )
                 )
+
             if 'color' == k and (isinstance(val, np.ndarray) and all(not is_color(c) for c in val)):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v.dimension, val)
@@ -564,9 +566,17 @@ def _apply_ops(self, element, ranges, style):
                     val = categorize_colors(val)
                 k = 'c'
 
-            if k == 'facecolors':
+            # If mapped to color/alpha override static fill/line style
+            if k == 'c' or (k == 'color' and isinstance(val, np.ndarray)):
+                fill_style = new_style.get('facecolor')
+                if fill_style and is_color(fill_style):
+                    new_style.pop('facecolor')
+                line_style = new_style.get('edgecolor')
+                if line_style and is_color(line_style):
+                    new_style.pop('edgecolor')
+            elif k == 'facecolors':
                 # Color overrides facecolors if defined
-                new_style.pop('color')
+                new_style.pop('color', None)
 
             new_style[k] = val
 
diff --git a/holoviews/tests/plotting/bokeh/testcurveplot.py b/holoviews/tests/plotting/bokeh/testcurveplot.py
index a50cc94457..eda7801b50 100644
--- a/holoviews/tests/plotting/bokeh/testcurveplot.py
+++ b/holoviews/tests/plotting/bokeh/testcurveplot.py
@@ -337,3 +337,44 @@ def test_curve_padding_datetime_nonsquare(self):
         self.assertEqual(x_range.end, np.datetime64('2016-04-03T02:24:00.000000000'))
         self.assertEqual(y_range.start, 0.8)
         self.assertEqual(y_range.end, 3.2)
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_curve_scalar_color_op(self):
+        curve = Curve([(0, 0, 'red'), (0, 1, 'red'), (0, 2, 'red')],
+                       vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(curve)
+        glyph = plot.handles['glyph']
+        self.assertEqual(glyph.line_color, 'red')
+
+    def test_op_ndoverlay_color_value(self):
+        colors = ['blue', 'red']
+        overlay = NdOverlay({color: Curve(np.arange(i))
+                             for i, color in enumerate(colors)},
+                            'color').options('Curve', color='color')
+        plot = bokeh_renderer.get_plot(overlay)
+        for subplot, color in zip(plot.subplots.values(), colors):
+            style = dict(subplot.style[subplot.cyclic_index])
+            cds = subplot.handles['cds']
+            style = subplot._apply_ops(subplot.current_frame, cds, {}, style)
+            self.assertEqual(style['color'], color)
+
+    def test_curve_color_op(self):
+        curve = Curve([(0, 0, 'red'), (0, 1, 'blue'), (0, 2, 'red')],
+                       vdims=['y', 'color']).options(color='color')
+        with self.assertRaises(Exception):
+            bokeh_renderer.get_plot(curve)
+
+    def test_curve_alpha_op(self):
+        curve = Curve([(0, 0, 0.1), (0, 1, 0.3), (0, 2, 1)],
+                       vdims=['y', 'alpha']).options(alpha='alpha')
+        with self.assertRaises(Exception):
+            bokeh_renderer.get_plot(curve)
+
+    def test_curve_line_width_op(self):
+        curve = Curve([(0, 0, 0.1), (0, 1, 0.3), (0, 2, 1)],
+                       vdims=['y', 'linewidth']).options(line_width='linewidth')
+        with self.assertRaises(Exception):
+            bokeh_renderer.get_plot(curve)
diff --git a/holoviews/tests/plotting/bokeh/testhistogramplot.py b/holoviews/tests/plotting/bokeh/testhistogramplot.py
index 4ef525d4b2..bd36451f1b 100644
--- a/holoviews/tests/plotting/bokeh/testhistogramplot.py
+++ b/holoviews/tests/plotting/bokeh/testhistogramplot.py
@@ -2,10 +2,11 @@
 
 import numpy as np
 
+from holoviews.core.overlay import NdOverlay
 from holoviews.element import Image, Points, Dataset, Histogram
 from holoviews.operation import histogram
 
-from bokeh.models import DatetimeAxis
+from bokeh.models import DatetimeAxis, CategoricalColorMapper, LinearColorMapper
 
 from .testplot import TestBokehPlot, bokeh_renderer
 
@@ -148,3 +149,109 @@ def test_histogram_padding_datetime_nonsquare(self):
         self.assertEqual(x_range.end, np.datetime64('2016-04-03T15:36:00.000000000'))
         self.assertEqual(y_range.start, 0)
         self.assertEqual(y_range.end, 3.2)
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_histogram_color_op(self):
+        histogram = Histogram([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.fill_color, 'color')
+        self.assertEqual(glyph.line_color, 'color')
+
+    def test_histogram_linear_color_op(self):
+        histogram = Histogram([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 2)
+        self.assertEqual(cds.data['color'], np.array([0, 1, 2]))
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_histogram_categorical_color_op(self):
+        histogram = Histogram([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, np.array(['A', 'B', 'C']))
+        self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_histogram_line_color_op(self):
+        histogram = Histogram([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(line_color='color')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertNotEqual(glyph.fill_color, 'line_color')
+        self.assertEqual(glyph.line_color, 'line_color')
+
+    def test_histogram_fill_color_op(self):
+        histogram = Histogram([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(fill_color='color')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['fill_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.fill_color, 'fill_color')
+        self.assertNotEqual(glyph.line_color, 'fill_color')
+
+    def test_histogram_alpha_op(self):
+        histogram = Histogram([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(alpha='alpha')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.fill_alpha, 'alpha')
+
+    def test_histogram_line_alpha_op(self):
+        histogram = Histogram([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(line_alpha='alpha')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.line_alpha, 'line_alpha')
+        self.assertNotEqual(glyph.fill_alpha, 'line_alpha')
+
+    def test_histogram_fill_alpha_op(self):
+        histogram = Histogram([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(fill_alpha='alpha')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['fill_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertNotEqual(glyph.line_alpha, 'fill_alpha')
+        self.assertEqual(glyph.fill_alpha, 'fill_alpha')
+
+    def test_histogram_line_width_op(self):
+        histogram = Histogram([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                              vdims=['y', 'line_width']).options(line_width='line_width')
+        plot = bokeh_renderer.get_plot(histogram)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_width'], np.array([1, 4, 8]))
+        self.assertEqual(glyph.line_width, 'line_width')
+
+    def test_op_ndoverlay_value(self):
+        colors = ['blue', 'red']
+        overlay = NdOverlay({color: Histogram(np.arange(i+2)) for i, color in enumerate(colors)}, 'Color').options('Histogram', fill_color='Color')
+        plot = bokeh_renderer.get_plot(overlay)
+        for subplot, color in zip(plot.subplots.values(),  colors):
+            self.assertEqual(subplot.handles['glyph'].fill_color, color)
diff --git a/holoviews/tests/plotting/bokeh/testlabels.py b/holoviews/tests/plotting/bokeh/testlabels.py
index a94577027e..224dd6ee99 100644
--- a/holoviews/tests/plotting/bokeh/testlabels.py
+++ b/holoviews/tests/plotting/bokeh/testlabels.py
@@ -3,6 +3,12 @@
 from holoviews.core.dimension import Dimension
 from holoviews.element import Labels
 
+try:
+    from bokeh.models import LinearColorMapper, CategoricalColorMapper
+except:
+    pass
+
+
 from .testplot import TestBokehPlot, bokeh_renderer
 
 
@@ -94,3 +100,68 @@ def test_labels_color_mapped(self):
         self.assertEqual(glyph.text_color, {'field': 'color', 'transform': cmapper})
         self.assertEqual(cmapper.low, 1)
         self.assertEqual(cmapper.high, 2)
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_label_color_op(self):
+        labels = Labels([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                        vdims='color').options(text_color='color')
+        plot = bokeh_renderer.get_plot(labels)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['text_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.text_color, 'text_color')
+
+    def test_label_linear_color_op(self):
+        labels = Labels([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(text_color='color')
+        plot = bokeh_renderer.get_plot(labels)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 2)
+        self.assertEqual(cds.data['text_color'], np.array([0, 1, 2]))
+        self.assertEqual(glyph.text_color, {'field': 'text_color', 'transform': cmapper})
+
+    def test_label_categorical_color_op(self):
+        labels = Labels([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
+                        vdims='color').options(text_color='color')
+        plot = bokeh_renderer.get_plot(labels)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, np.array(['A', 'B', 'C']))
+        self.assertEqual(cds.data['text_color'], np.array(['A', 'B', 'C']))
+        self.assertEqual(glyph.text_color, {'field': 'text_color', 'transform': cmapper})
+
+    def test_label_angle_op(self):
+        labels = Labels([(0, 0, 0), (0, 1, 45), (0, 2, 90)],
+                        vdims='angle').options(angle='angle')
+        plot = bokeh_renderer.get_plot(labels)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['angle'], np.array([0, 0.785398, 1.570796]))
+        self.assertEqual(glyph.angle, 'angle')
+
+    def test_label_alpha_op(self):
+        labels = Labels([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                        vdims='alpha').options(text_alpha='alpha')
+        plot = bokeh_renderer.get_plot(labels)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['text_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.text_alpha, 'text_alpha')
+
+    def test_label_size_op(self):
+        labels = Labels([(0, 0, '10pt'), (0, 1, '4pt'), (0, 2, '8pt')],
+                        vdims='size').options(text_font_size='size')
+        plot = bokeh_renderer.get_plot(labels)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['size'], ['10pt', '4pt', '8pt'])
+        self.assertEqual(glyph.text_font_size, 'text_font_size')
diff --git a/holoviews/tests/plotting/bokeh/testpointplot.py b/holoviews/tests/plotting/bokeh/testpointplot.py
index 8820ab0b97..cc1ff2b5ae 100644
--- a/holoviews/tests/plotting/bokeh/testpointplot.py
+++ b/holoviews/tests/plotting/bokeh/testpointplot.py
@@ -322,6 +322,10 @@ def test_points_datetime_hover(self):
         hover = plot.handles['hover']
         self.assertEqual(hover.tooltips, [('x', '@{x}'), ('y', '@{y}'), ('date', '@{date_dt_strings}')])
 
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
     def test_point_color_op(self):
         points = Points([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
                         vdims='color').options(color='color')
diff --git a/holoviews/tests/plotting/matplotlib/testcurveplot.py b/holoviews/tests/plotting/matplotlib/testcurveplot.py
index 3b0100a1c6..1eba50e40f 100644
--- a/holoviews/tests/plotting/matplotlib/testcurveplot.py
+++ b/holoviews/tests/plotting/matplotlib/testcurveplot.py
@@ -3,6 +3,7 @@
 
 import numpy as np
 
+from holoviews.core.overlay import NdOverlay
 from holoviews.core.util import pd
 from holoviews.element import Curve
 
@@ -144,3 +145,43 @@ def test_curve_padding_datetime_nonsquare(self):
         self.assertEqual(x_range[1], 736057.09999999998)
         self.assertEqual(y_range[0], 0.8)
         self.assertEqual(y_range[1], 3.2)
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_curve_scalar_color_op(self):
+        curve = Curve([(0, 0, 'red'), (0, 1, 'red'), (0, 2, 'red')],
+                       vdims=['y', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(curve)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_color(), 'red')
+
+    def test_op_ndoverlay_color_value(self):
+        colors = ['blue', 'red']
+        overlay = NdOverlay({color: Curve(np.arange(i))
+                             for i, color in enumerate(colors)},
+                            'color').options('Curve', color='color')
+        plot = mpl_renderer.get_plot(overlay)
+        for subplot, color in zip(plot.subplots.values(), colors):
+            style = dict(subplot.style[subplot.cyclic_index])
+            style = subplot._apply_ops(subplot.current_frame, {}, style)
+            self.assertEqual(style['color'], color)
+
+    def test_curve_color_op(self):
+        curve = Curve([(0, 0, 'red'), (0, 1, 'blue'), (0, 2, 'red')],
+                       vdims=['y', 'color']).options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(curve)
+
+    def test_curve_alpha_op(self):
+        curve = Curve([(0, 0, 0.1), (0, 1, 0.3), (0, 2, 1)],
+                       vdims=['y', 'alpha']).options(alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(curve)
+
+    def test_curve_linewidth_op(self):
+        curve = Curve([(0, 0, 0.1), (0, 1, 0.3), (0, 2, 1)],
+                       vdims=['y', 'linewidth']).options(linewidth='linewidth')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(curve)
diff --git a/holoviews/tests/plotting/matplotlib/testhistogramplot.py b/holoviews/tests/plotting/matplotlib/testhistogramplot.py
index 63b8f3d652..f06ef118ef 100644
--- a/holoviews/tests/plotting/matplotlib/testhistogramplot.py
+++ b/holoviews/tests/plotting/matplotlib/testhistogramplot.py
@@ -2,8 +2,10 @@
 
 import numpy as np
 
+from holoviews.core.overlay import NdOverlay
 from holoviews.element import Dataset, Histogram
 from holoviews.operation import histogram
+from holoviews.plotting.util import hex2rgb
 
 from .testplot import TestMPLPlot, mpl_renderer
 
@@ -95,3 +97,62 @@ def test_histogram_padding_datetime_nonsquare(self):
         self.assertEqual(x_range[1], 736057.65000000002)
         self.assertEqual(y_range[0], 0)
         self.assertEqual(y_range[1], 3.2)
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_histogram_color_op(self):
+        histogram = Histogram([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                              vdims=['y', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(histogram)
+        artist = plot.handles['artist']
+        children = artist.get_children()
+        for c, w in zip(children, ['#000000', '#FF0000', '#00FF00']):
+            self.assertEqual(c.get_facecolor(), tuple(c/255. for c in hex2rgb(w))+(1,))
+
+    def test_histogram_linear_color_op(self):
+        histogram = Histogram([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                              vdims=['y', 'color']).options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(histogram)
+
+    def test_histogram_categorical_color_op(self):
+        histogram = Histogram([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
+                              vdims=['y', 'color']).options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(histogram)
+        
+    def test_histogram_line_color_op(self):
+        histogram = Histogram([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(edgecolor='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(histogram)
+
+    def test_histogram_alpha_op(self):
+        histogram = Histogram([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(histogram)
+
+    def test_histogram_line_width_op(self):
+        histogram = Histogram([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                              vdims=['y', 'line_width']).options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(histogram)
+        artist = plot.handles['artist']
+        children = artist.get_children()
+        for c, w in zip(children, np.array([1, 4, 8])):
+            self.assertEqual(c.get_linewidth(), w)
+
+    def test_op_ndoverlay_value(self):
+        colors = ['blue', 'red']
+        overlay = NdOverlay({color: Histogram(np.arange(i+2))
+                             for i, color in enumerate(colors)}, 'Color').options(
+                                     'Histogram', facecolor='Color'
+                             )
+        plot = mpl_renderer.get_plot(overlay)
+        colors = [(0, 0, 1, 1), (1, 0, 0, 1)]
+        for subplot, color in zip(plot.subplots.values(),  colors):
+            children = subplot.handles['artist'].get_children()
+            for c in children:
+                self.assertEqual(c.get_facecolor(), color)
diff --git a/holoviews/tests/plotting/matplotlib/testlabels.py b/holoviews/tests/plotting/matplotlib/testlabels.py
index 676ac24877..d509a1ae77 100644
--- a/holoviews/tests/plotting/matplotlib/testlabels.py
+++ b/holoviews/tests/plotting/matplotlib/testlabels.py
@@ -60,3 +60,50 @@ def test_labels_color_mapped(self):
             self.assertEqual(text._y, expected['y'][i])
             self.assertEqual(text.get_text(), expected['Label'][i])
             self.assertEqual(text.get_color(), colors[i])
+    
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_label_color_op(self):
+        labels = Labels([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                        vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(labels)
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_color() for a in artist],
+                         ['#000000', '#FF0000', '#00FF00'])
+
+    def test_label_linear_color_op(self):
+        labels = Labels([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(labels)
+
+    def test_label_categorical_color_op(self):
+        labels = Labels([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'A')],
+                        vdims='color').options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(labels)
+
+    def test_label_size_op(self):
+        labels = Labels([(0, 0, 8), (0, 1, 12), (0, 2, 6)],
+                        vdims='size').options(size='size')
+        plot = mpl_renderer.get_plot(labels)
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_fontsize() for a in artist], [8, 12, 6])
+
+    def test_label_alpha_op(self):
+        labels = Labels([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                        vdims='alpha').options(alpha='alpha')
+        plot = mpl_renderer.get_plot(labels)
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_alpha() for a in artist],
+                         [0, 0.2, 0.7])
+
+    def test_label_rotation_op(self):
+        labels = Labels([(0, 0, 90), (0, 1, 180), (0, 2, 270)],
+                        vdims='rotation').options(rotation='rotation')
+        plot = mpl_renderer.get_plot(labels)
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_rotation() for a in artist],
+                         [90, 180, 270])
diff --git a/holoviews/tests/plotting/matplotlib/testpointplot.py b/holoviews/tests/plotting/matplotlib/testpointplot.py
index af7438de36..7c238b4519 100644
--- a/holoviews/tests/plotting/matplotlib/testpointplot.py
+++ b/holoviews/tests/plotting/matplotlib/testpointplot.py
@@ -152,6 +152,10 @@ def test_points_padding_datetime_nonsquare(self):
         self.assertEqual(y_range[0], 0.8)
         self.assertEqual(y_range[1], 3.2)
 
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
     def test_point_color_op(self):
         points = Points([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
                         vdims='color').options(color='color')
@@ -209,13 +213,13 @@ def test_point_line_width_op(self):
     def test_point_marker_op(self):
         points = Points([(0, 0, 'circle'), (0, 1, 'triangle'), (0, 2, 'square')],
                         vdims='marker').options(marker='marker')
-        with self.assertRaises(ValueError):
+        with self.assertRaises(Exception):
             mpl_renderer.get_plot(points)
 
     def test_point_alpha_op(self):
         points = Points([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
                         vdims='alpha').options(alpha='alpha')
-        with self.assertRaises(ValueError):
+        with self.assertRaises(Exception):
             mpl_renderer.get_plot(points)
 
     def test_op_ndoverlay_value(self):

From df80c26452ff9b698ca20034cfae93d2709f7208 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 17:13:14 +0000
Subject: [PATCH 019/117] Fixes for op ranges

---
 holoviews/plotting/bokeh/element.py | 2 +-
 holoviews/plotting/mpl/element.py   | 2 +-
 holoviews/util/ops.py               | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index caf8a1a65f..eb20ec7a31 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -677,7 +677,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
                 val = self.overlay_dims[v.dimension]
             else:
-                val = v.eval(element, ranges['combined'])
+                val = v.eval(element, ranges)
 
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index d8183905c1..3c31bb2f0d 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -541,7 +541,7 @@ def _apply_ops(self, element, ranges, style):
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
                 val = self.overlay_dims[v.dimension]
             else:
-                val = v.eval(element, ranges['combined'])
+                val = v.eval(element, ranges)
 
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 7e442b14b6..16445b12e5 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -85,6 +85,7 @@ def eval(self, dataset, ranges={}):
             else:
                 args = (data,)
             drange = ranges.get(self.dimension.name)
+            drange = drange.get('combined', drange)
             if o['fn'] == norm_fn and drange is not None:
                 data = o['fn'](data, *drange)
             else:

From a8276a677e5c0fd54551bd0e8a38e62a4794d204 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 17:13:35 +0000
Subject: [PATCH 020/117] Add style mapping tests for SpikePlot

---
 .../tests/plotting/bokeh/testspikesplot.py    | 83 +++++++++++++++++++
 .../plotting/matplotlib/testspikeplot.py      | 54 ++++++++++++
 2 files changed, 137 insertions(+)

diff --git a/holoviews/tests/plotting/bokeh/testspikesplot.py b/holoviews/tests/plotting/bokeh/testspikesplot.py
index a95ad02995..9929a37d0b 100644
--- a/holoviews/tests/plotting/bokeh/testspikesplot.py
+++ b/holoviews/tests/plotting/bokeh/testspikesplot.py
@@ -4,6 +4,8 @@
 from holoviews.core import NdOverlay
 from holoviews.element import Spikes
 
+from bokeh.models import CategoricalColorMapper, LinearColorMapper
+
 from .testplot import TestBokehPlot, bokeh_renderer
 
 
@@ -127,3 +129,84 @@ def test_spikes_datetime_kdim_hover(self):
         self.assertEqual(cds.data['x_dt_strings'], ['2017-01-01 00:00:00'])
         hover = plot.handles['hover']
         self.assertEqual(hover.tooltips, [('x', '@{x_dt_strings}'), ('y', '@{y}')])
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_spikes_color_op(self):
+        spikes = Spikes([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(spikes)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.line_color, 'color')
+
+    def test_spikes_linear_color_op(self):
+        spikes = Spikes([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(spikes)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 2)
+        self.assertEqual(cds.data['color'], np.array([0, 1, 2]))
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_spikes_categorical_color_op(self):
+        spikes = Spikes([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(spikes)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, np.array(['A', 'B', 'C']))
+        self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_spikes_line_color_op(self):
+        spikes = Spikes([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(line_color='color')
+        plot = bokeh_renderer.get_plot(spikes)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.line_color, 'line_color')
+
+    def test_spikes_alpha_op(self):
+        spikes = Spikes([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(alpha='alpha')
+        plot = bokeh_renderer.get_plot(spikes)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.line_alpha, 'alpha')
+
+    def test_spikes_line_alpha_op(self):
+        spikes = Spikes([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(line_alpha='alpha')
+        plot = bokeh_renderer.get_plot(spikes)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.line_alpha, 'line_alpha')
+
+    def test_spikes_line_width_op(self):
+        spikes = Spikes([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                              vdims=['y', 'line_width']).options(line_width='line_width')
+        plot = bokeh_renderer.get_plot(spikes)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_width'], np.array([1, 4, 8]))
+        self.assertEqual(glyph.line_width, 'line_width')
+
+    def test_op_ndoverlay_value(self):
+        colors = ['blue', 'red']
+        overlay = NdOverlay({color: Spikes(np.arange(i+2)) for i, color in enumerate(colors)}, 'Color').options('Spikes', color='Color')
+        plot = bokeh_renderer.get_plot(overlay)
+        for subplot, color in zip(plot.subplots.values(),  colors):
+            self.assertEqual(subplot.handles['glyph'].line_color, color)
diff --git a/holoviews/tests/plotting/matplotlib/testspikeplot.py b/holoviews/tests/plotting/matplotlib/testspikeplot.py
index e14872a5f5..d72bafc6a9 100644
--- a/holoviews/tests/plotting/matplotlib/testspikeplot.py
+++ b/holoviews/tests/plotting/matplotlib/testspikeplot.py
@@ -1,5 +1,6 @@
 import numpy as np
 
+from holoviews.core.overlay import NdOverlay
 from holoviews.element import Spikes
 
 from .testplot import TestMPLPlot, mpl_renderer
@@ -86,3 +87,56 @@ def test_spikes_padding_datetime_nonsquare(self):
         x_range = plot.handles['axis'].get_xlim()
         self.assertEqual(x_range[0], 736054.90000000002)
         self.assertEqual(x_range[1], 736057.09999999998)
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_spikes_color_op(self):
+        spikes = Spikes([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                              vdims=['y', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(spikes)
+        artist = plot.handles['artist']
+        children = artist.get_children()
+        for c, w in zip(children, ['#000000', '#FF0000', '#00FF00']):
+            self.assertEqual(c.get_facecolor(), tuple(c/255. for c in hex2rgb(w))+(1,))
+
+    def test_spikes_linear_color_op(self):
+        spikes = Spikes([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                              vdims=['y', 'color']).options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(spikes)
+
+    def test_spikes_categorical_color_op(self):
+        spikes = Spikes([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
+                              vdims=['y', 'color']).options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(spikes)
+
+    def test_spikes_alpha_op(self):
+        spikes = Spikes([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(spikes)
+
+    def test_spikes_line_width_op(self):
+        spikes = Spikes([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                              vdims=['y', 'line_width']).options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(spikes)
+        artist = plot.handles['artist']
+        children = artist.get_children()
+        for c, w in zip(children, np.array([1, 4, 8])):
+            self.assertEqual(c.get_linewidth(), w)
+
+    def test_op_ndoverlay_value(self):
+        colors = ['blue', 'red']
+        overlay = NdOverlay({color: Spikes(np.arange(i+2))
+                             for i, color in enumerate(colors)}, 'Color').options(
+                                     'Spikes', color='Color'
+                             )
+        plot = mpl_renderer.get_plot(overlay)
+        colors = [(0, 0, 1, 1), (1, 0, 0, 1)]
+        for subplot, color in zip(plot.subplots.values(),  colors):
+            children = subplot.handles['artist'].get_children()
+            for c in children:
+                self.assertEqual(c.get_facecolor(), color)

From f96674f3de184c5667f82b3e9d8c7ce2f56607b0 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 20:12:37 +0000
Subject: [PATCH 021/117] Various smaller fixes

---
 holoviews/__init__.py               | 6 ++++--
 holoviews/plotting/bokeh/element.py | 8 +++++---
 holoviews/plotting/bokeh/path.py    | 7 ++++++-
 holoviews/plotting/bokeh/styles.py  | 2 ++
 holoviews/plotting/mpl/chart.py     | 2 ++
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/holoviews/__init__.py b/holoviews/__init__.py
index 4fbf4a7c4b..c789fc02b2 100644
--- a/holoviews/__init__.py
+++ b/holoviews/__init__.py
@@ -9,6 +9,7 @@
 __version__ = str(param.version.Version(fpath=__file__, archive_commit="$Format:%h$",
                                         reponame="holoviews"))
 
+from . import util # noqa (API import)
 from .core import archive, config                        # noqa (API import)
 from .core.boundingregion import BoundingBox             # noqa (API import)
 from .core.dimension import OrderedDict, Dimension       # noqa (API import)
@@ -26,8 +27,9 @@
 from .operation import ElementOperation                  # noqa (Deprecated API import)
 from .element import *                                   # noqa (API import)
 from .element import __all__ as elements_list
-from . import util # noqa (API import)
-from .util import extension, renderer, output, opts, render, save # noqa (API import)
+from .util import (extension, renderer, output, opts,    # noqa (API import)
+                   render, save)
+from .util.ops import dim                                # noqa (API import)
 
 # Suppress warnings generated by NumPy in matplotlib
 # Expected to be fixed in next matplotlib release
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index eb20ec7a31..da427acd98 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -32,7 +32,7 @@
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import BokehPlot, TOOLS
 from .styles import (
-    legend_dimensions, line_properties, mpl_to_bokeh, rgba_tuple,
+    legend_dimensions, line_properties, markers, mpl_to_bokeh, rgba_tuple,
     text_properties, validate
 )
 from .util import (
@@ -667,7 +667,9 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             if not isinstance(v, op) or (group is not None and not k.startswith(group)):
                 continue
             dname = v.dimension.name
-            if (dname not in element and v.dimension not in self.overlay_dims and
+            if k == 'marker' and dname in markers:
+                continue
+            elif (dname not in element and v.dimension not in self.overlay_dims and
                 not (isinstance(element, Graph) and v.dimension in element.nodes)):
                 new_style.pop(k)
                 self.warning('Specified %s op %r could not be applied, %s dimension '
@@ -1257,7 +1259,7 @@ def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=Non
         cmap = colors or style.pop('cmap', 'viridis')
         nan_colors = {k: rgba_tuple(v) for k, v in self.clipping_colors.items()}
         if isinstance(cmap, dict):
-            if not factors:
+            if factors is None:
                 factors = list(cmap)
             palette = [cmap.get(f, nan_colors.get('NaN', self._default_nan)) for f in factors]
             factors = [dim.pprint_value(f) for f in factors]
diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index c956a6dc5f..39539c4f0b 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -49,7 +49,12 @@ def _get_hover_data(self, data, element):
 
 
     def get_data(self, element, ranges, style):
-        cdim = element.get_dimension(self.color_index)
+        color = style.get('color', None)
+        cdim = None
+        if isinstance(color, util.basestring):
+            cdim = element.get_dimension(color)
+        if cdim is None:
+            cdim = element.get_dimension(self.color_index)
         inds = (1, 0) if self.invert_axes else (0, 1)
         mapping = dict(self._mapping)
         if not cdim:
diff --git a/holoviews/plotting/bokeh/styles.py b/holoviews/plotting/bokeh/styles.py
index 12b7627c81..938b06f900 100644
--- a/holoviews/plotting/bokeh/styles.py
+++ b/holoviews/plotting/bokeh/styles.py
@@ -40,6 +40,8 @@
 # Conversion between matplotlib and bokeh markers
 
 markers = {
+    '+': {'marker': 'cross'},
+    'x': {'marker': 'cross', 'angle': np.pi/4},
     's': {'marker': 'square'},
     'd': {'marker': 'diamond'},
     '^': {'marker': 'triangle', 'angle': 0},
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index f17679019e..82aa2a0b96 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -187,6 +187,8 @@ class AreaPlot(ChartPlot):
                   'hatch', 'linestyle', 'joinstyle',
                   'fill', 'capstyle', 'interpolate']
 
+    _no_op_styles = style_opts
+
     _plot_methods = dict(single='fill_between')
 
     def get_data(self, element, ranges, style):

From d19ca7f4376b0fd1aa496caa49e6b57b2b2f8246 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 20:14:35 +0000
Subject: [PATCH 022/117] Updated Styling_Plots user guide

---
 examples/user_guide/Styling_Plots.ipynb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/examples/user_guide/Styling_Plots.ipynb b/examples/user_guide/Styling_Plots.ipynb
index 5288963369..9a7add522e 100644
--- a/examples/user_guide/Styling_Plots.ipynb
+++ b/examples/user_guide/Styling_Plots.ipynb
@@ -179,8 +179,7 @@
     "\n",
     "## Colormapping\n",
     "\n",
-    "Color cycles and styles are useful for categorical plots and when overlaying multiple subsets, but when we want to map data values to a color it is better to use HoloViews' facilities for color mapping. Certain image-like types will apply colormapping automatically; e.g. for ``Image``, ``QuadMesh`` or ``HeatMap`` types the first value dimension is automatically mapped to the color. In other cases the values to colormap can be declared through the ``color_index``, which may reference any dimension by name or by numerical index.\n",
-    "\n",
+    "Color cycles and styles are useful for categorical plots and when overlaying multiple subsets, but when we want to map data values to a color it is better to use HoloViews' facilities for color mapping. Certain image-like types will apply colormapping automatically; e.g. for ``Image``, ``QuadMesh`` or ``HeatMap`` types the first value dimension is automatically mapped to the color. In other cases the values to colormap can be declared by mapping a ``color`` style option to an existing dimension.\n",
     "\n",
     "#### Named colormaps\n",
     "\n",
@@ -286,7 +285,7 @@
     "]\n",
     "\n",
     "hv.Path([path], vdims='Wind Speed').options(\n",
-    "    color_index='Wind Speed', color_levels=levels, cmap=colors, line_width=8, colorbar=True, width=450\n",
+    "    color='Wind Speed', color_levels=levels, cmap=colors, line_width=8, colorbar=True, width=450\n",
     ")"
    ]
   },
@@ -335,13 +334,13 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Using color_index\n",
+    "### Colormapping\n",
     "\n",
-    "As mentioned above, when plotting elements that do not automatically map colors to certain dimensions, we can use the ``color_index`` option to do so explicitly. This allows colormapping both continuously valued and categorical values.\n",
+    "As mentioned above, when plotting elements that do not automatically map colors to certain dimensions (e.g. an Image), we can use ``color`` options to do so explicitly. This allows colormapping both continuously valued and categorical values.\n",
     "\n",
     "#### Continuous values\n",
     "\n",
-    "If we provide a continuous value for the ``color_index``, we have a continuous colormap and can enable a ``colorbar``:"
+    "If we provide a continuous value for the ``color`` style option along with a continuous colormap, we can also enable a ``colorbar``:"
    ]
   },
   {
@@ -352,7 +351,7 @@
    "source": [
     "polygons = hv.Polygons([{('x', 'y'): hv.Ellipse(0, 0, (i, i)).array(), 'z': i} for i in range(1, 10)[::-1]], vdims='z')\n",
     "\n",
-    "polygons.options(color_index='z', colorbar=True, width=380)"
+    "polygons.options(color='z', colorbar=True, width=380)"
    ]
   },
   {
@@ -379,7 +378,7 @@
     "                                np.random.rand(100), \n",
     "                                np.random.choice(list('ABCD'), 100)), vdims='Category')\n",
     "\n",
-    "categorical_points.sort('Category').options(color_index='Category', cmap='Category20', size=5)"
+    "categorical_points.sort('Category').options(color='Category', cmap='Category20', size=5)"
    ]
   },
   {
@@ -399,7 +398,7 @@
    "source": [
     "explicit_mapping = {'A': 'blue', 'B': 'red', 'C': 'green', 'D': 'purple'}\n",
     "\n",
-    "categorical_points.sort('Category').options(color_index='Category', cmap=explicit_mapping, size=5)"
+    "categorical_points.sort('Category').options(color='Category', cmap=explicit_mapping, size=5)"
    ]
   },
   {

From 5db683a90e5cf01e72f16190cee5cb583f2501b3 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 20:16:26 +0000
Subject: [PATCH 023/117] Updated Geometry Data notebook

---
 examples/user_guide/Geometry_Data.ipynb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/user_guide/Geometry_Data.ipynb b/examples/user_guide/Geometry_Data.ipynb
index a70ee7abea..ef200b99f5 100644
--- a/examples/user_guide/Geometry_Data.ipynb
+++ b/examples/user_guide/Geometry_Data.ipynb
@@ -55,7 +55,7 @@
    "outputs": [],
    "source": [
     "hv.Path([{'x': [1, 2, 3, 4, 5], 'y': [0, 0, 1, 1, 2], 'value': 0},\n",
-    "         {'x': [5, 4, 3, 2, 1], 'y': [2, 2, 1, 1, 0], 'value': 1}], vdims='value').options(padding=0.1, color_index='value')"
+    "         {'x': [5, 4, 3, 2, 1], 'y': [2, 2, 1, 1, 0], 'value': 1}], vdims='value').options(padding=0.1, color='value')"
    ]
   },
   {
@@ -80,7 +80,7 @@
    "source": [
     "hv.Path([{'x': [1, 2, 3, 4, 5, np.nan, 5, 4, 3, 2, 1],\n",
     "          'y': [0, 0, 1, 1, 2, np.nan, 2, 2, 1, 1, 0], 'value': 0}],\n",
-    "        vdims='value').options(padding=0.1, color_index='value')"
+    "        vdims='value').options(padding=0.1, color='value')"
    ]
   },
   {
@@ -107,7 +107,7 @@
     "ys = np.sin(b * vs)\n",
     "\n",
     "hv.Path([{'x': xs, 'y': ys, 'value': vs}], vdims='value').options(\n",
-    "    color_index='value', padding=0.1, cmap='hsv'\n",
+    "    color='value', padding=0.1, cmap='hsv'\n",
     ")"
    ]
   },
@@ -125,7 +125,7 @@
    "outputs": [],
    "source": [
     "hv.Contours([{'x': xs, 'y': ys, 'value': np.ones(200)}], vdims='value').options(\n",
-    "    color_index='value', padding=0.1\n",
+    "    color='value', padding=0.1\n",
     ")"
    ]
   },

From 5459a168a91b280534e1d643c5f04fb3a1b17ee1 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 20:22:43 +0000
Subject: [PATCH 024/117] Added bin and cat op functions

---
 holoviews/util/ops.py | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 16445b12e5..4b9705b0bb 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 from ..core.dimension import Dimension
-from ..core.util import basestring
+from ..core.util import basestring, unique_iterator, isfinite
 from ..element import Graph
 
 
@@ -11,9 +11,40 @@ def norm_fn(values, min=None, max=None):
     max = np.max(values) if max is None else max
     return (values - min) / (max-min)
 
+
+def bin_fn(values, bins, labels=None):
+    bins = np.asarray(bins)
+    if labels is None:
+        labels = (bins[:-1] + np.diff(bins)/2.)
+    else:
+        labels = np.asarray(labels)
+    dtype = 'float' if labels.dtype.kind == 'f' else 'O'
+    binned = np.full_like(values, (np.nan if dtype == 'f' else None), dtype=dtype)
+    for lower, upper, label in zip(bins[:-1], bins[1:], labels):
+        condition = (values > lower) & (values <= upper)
+        binned[np.where(condition)[0]] = label
+    return binned
+
+
+def cat_fn(values, categories, empty=None):
+    uniq_cats = list(unique_iterator(values))
+    cats = []
+    for c in values:
+        if isinstance(categories, list):
+            cat_ind = uniq_cats.index(c)
+            if cat_ind < len(categories):
+                cat = categories[cat_ind]
+            else:
+                cat = empty
+        else:
+            cat = categories.get(c, empty)
+        cats.append(cat)
+    return np.asarray(cats)
+
+
 class op(object):
 
-    _op_registry = {'norm': norm_fn}
+    _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn}
 
     def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
         ops = []

From 2e9c2166667db5ad1ac1c23599f739312f5999d5 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 20:22:57 +0000
Subject: [PATCH 025/117] Fixed op range resolution

---
 holoviews/util/ops.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 4b9705b0bb..e9c5cf385e 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -115,9 +115,9 @@ def eval(self, dataset, ranges={}):
                 args = (other, data) if o['reverse'] else (data, other)
             else:
                 args = (data,)
-            drange = ranges.get(self.dimension.name)
+            drange = ranges.get(self.dimension.name, {})
             drange = drange.get('combined', drange)
-            if o['fn'] == norm_fn and drange is not None:
+            if o['fn'] == norm_fn and drange != {}:
                 data = o['fn'](data, *drange)
             else:
                 data = o['fn'](*args, **o['kwargs'])

From 24873f6688dd340b55468ca081dd2282d3208604 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 22:51:34 +0000
Subject: [PATCH 026/117] Fixes for CompositeElementPlot

---
 holoviews/plotting/bokeh/element.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index da427acd98..c355c1a713 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -658,6 +658,7 @@ def _init_glyph(self, plot, mapping, properties):
 
     def _apply_ops(self, element, source, ranges, style, group=None):
         new_style = dict(style)
+        prefix = group+'_' if group else ''
         for k, v in dict(style).items():
             if isinstance(v, util.basestring):
                 if v in element:
@@ -705,7 +706,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             if np.isscalar(val):
                 key = val
             else:
-                key = k
+                key = {'field': k}
                 source.data[k] = val
 
             # If color is not valid colorspec add colormapper
@@ -719,18 +720,19 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                                                 style, name=dname+'_color_mapper', **kwargs)
                 key = {'field': k, 'transform': cmapper}
 
+            new_style[k] = key
+
+        for style, value in list(new_style.items()):
             # If mapped to color/alpha override static fill/line style
             for s in ('alpha', 'color'):
-                if s != k or k not in source.data:
+                if prefix+s != style or style not in source.data:
                     continue
-                fill_style = new_style.get('fill_'+s)
+                fill_style = new_style.get(prefix+'fill_'+s)
                 if fill_style and validate(s, fill_style):
-                    new_style.pop('fill_'+s)
-                line_style = new_style.get('line_'+s)
+                    new_style.pop(prefix+'fill_'+s)
+                line_style = new_style.get(prefix+'line_'+s)
                 if line_style and validate(s, line_style):
-                    new_style.pop('line_'+s)
-
-            new_style[k] = key
+                    new_style.pop(prefix+'line_'+s)
         return new_style
 
 
@@ -1061,6 +1063,7 @@ def _init_glyphs(self, plot, element, ranges, source, data=None, mapping=None, s
             style_group = self._style_groups.get('_'.join(key.split('_')[:-1]))
             properties = self._glyph_properties(plot, element, source, ranges, style, style_group)
             properties = self._process_properties(key, properties, mapping.get(key, {}))
+
             with abbreviated_exception():
                 renderer, glyph = self._init_glyph(plot, mapping.get(key, {}), properties, key)
             self.handles[key+'_glyph'] = glyph
@@ -1340,7 +1343,7 @@ def _get_cmapper_opts(self, low, high, factors, colors):
         else:
             colormapper = CategoricalColorMapper
             factors = decode_bytes(factors)
-            opts = dict(factors=factors)
+            opts = dict(factors=list(factors))
             if 'NaN' in colors:
                 opts['nan_color'] = colors['NaN']
         return colormapper, opts

From 3484fa72434976c621d46ae92fd32579f43071e4 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 22:51:48 +0000
Subject: [PATCH 027/117] Disabled style mapping for Rasters

---
 holoviews/plotting/bokeh/raster.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/holoviews/plotting/bokeh/raster.py b/holoviews/plotting/bokeh/raster.py
index d560c9185f..a9e94e57c4 100644
--- a/holoviews/plotting/bokeh/raster.py
+++ b/holoviews/plotting/bokeh/raster.py
@@ -16,6 +16,9 @@ class RasterPlot(ColorbarPlot):
         Whether to show legend for the plot.""")
 
     style_opts = ['cmap', 'alpha']
+
+    _no_op_styles = style_opts
+
     _plot_methods = dict(single='image')
 
     def _hover_opts(self, element):
@@ -74,6 +77,9 @@ def get_data(self, element, ranges, style):
 class RGBPlot(ElementPlot):
 
     style_opts = ['alpha']
+
+    _no_op_styles = style_opts
+
     _plot_methods = dict(single='image_rgba')
 
     def get_data(self, element, ranges, style):
@@ -130,9 +136,12 @@ class QuadMeshPlot(ColorbarPlot):
     show_legend = param.Boolean(default=False, doc="""
         Whether to show legend for the plot.""")
 
-    _plot_methods = dict(single='quad')
     style_opts = ['cmap', 'color'] + line_properties + fill_properties
 
+    _no_op_styles = style_opts
+
+    _plot_methods = dict(single='quad')
+
     def get_data(self, element, ranges, style):
         x, y, z = element.dimensions()[:3]
         if self.invert_axes: x, y = y, x
@@ -182,7 +191,7 @@ def get_data(self, element, ranges, style):
         else:
             xc, yc = (element.interface.coords(element, x, edges=True, ordered=True),
                       element.interface.coords(element, y, edges=True, ordered=True))
-            
+
             x0, y0 = cartesian_product([xc[:-1], yc[:-1]], copy=True)
             x1, y1 = cartesian_product([xc[1:], yc[1:]], copy=True)
             zvals = zdata.flatten() if self.invert_axes else zdata.T.flatten()

From f287c5ff0f2239981a93b96058bbc13dc706ac48 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 22:52:30 +0000
Subject: [PATCH 028/117] Enabled style mapping for stats plots

---
 holoviews/plotting/bokeh/stats.py | 45 ++++++++++++-------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index c92972ab76..37674a5f6e 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -8,6 +8,7 @@
 
 from ...core.dimension import Dimension
 from ...core.ndmapping import sorted_context
+from ...core.options import abbreviated_exception
 from ...core.util import (basestring, dimension_sanitizer, wrap_tuple,
                           unique_iterator, isfinite)
 from ...operation.stats import univariate_kde
@@ -96,7 +97,9 @@ def _get_axis_labels(self, *args, **kwargs):
         return xlabel, ylabel, None
 
     def _glyph_properties(self, plot, element, source, ranges, style, group=None):
-        new_style = self._apply_ops(element, source, ranges, style, group)
+        element = element.aggregate(function=np.mean)
+        with abbreviated_exception():
+            new_style = self._apply_ops(element, source, ranges, style, group)
         properties = dict(new_style, source=source)
         if self.show_legend and not element.kdims:
             properties['legend'] = element.label
@@ -259,20 +262,6 @@ def get_data(self, element, ranges, style):
             r2_data[dimension_sanitizer(cdim.name)] = factors
             factors = list(unique_iterator(factors))
 
-        # Get colors and define categorical colormapper
-        cname = dimension_sanitizer(cdim.name)
-        cmap = style.get('cmap')
-        if cmap is None:
-            cycle_style = self.lookup_options(element, 'style')
-            styles = cycle_style.max_cycles(len(factors))
-            colors = [styles[i].get('box_color', styles[i]['box_fill_color'])
-                      for i in range(len(factors))]
-            colors = [rgb2hex(c) if isinstance(c, tuple) else c for c in colors]
-        else:
-            colors = None
-        mapper = self._get_colormapper(cdim, element, ranges, style, factors, colors)
-        vbar_map['fill_color'] = {'field': cname, 'transform': mapper}
-        vbar2_map['fill_color'] = {'field': cname, 'transform': mapper}
         if self.show_legend:
             vbar_map['legend'] = cdim.name
 
@@ -305,16 +294,17 @@ class ViolinPlot(BoxWhiskerPlot):
        Relative width of the violin""")
 
     # Map each glyph to a style group
-    _style_groups = {'patch': 'violin', 'segment': 'stats', 'vbar': 'box',
+    _style_groups = {'patches': 'violin', 'segment': 'stats', 'vbar': 'box',
                      'scatter': 'median', 'hbar': 'box'}
 
-    _draw_order = ['patch', 'segment', 'vbar', 'hbar', 'circle', 'scatter']
+    _draw_order = ['patches', 'segment', 'vbar', 'hbar', 'circle', 'scatter']
 
     style_opts = ([glyph+p for p in fill_properties+line_properties
                    for glyph in ('violin_', 'box_')] +
                   ['stats_'+p for p in line_properties] +
                   ['_'.join([glyph, p]) for p in ('color', 'alpha')
-                   for glyph in ('box', 'violin', 'stats', 'median')])
+                   for glyph in ('box', 'violin', 'stats', 'median')] +
+                  ['cmap'])
 
     _stat_fns = [partial(np.percentile, q=q) for q in [25, 50, 75]]
 
@@ -331,7 +321,7 @@ def _kde_data(self, el, key, **kwargs):
         ys = (ys/ys.max())*(self.violin_width/2.) if len(ys) else []
         ys = [key+(sign*y,) for sign, vs in ((-1, ys), (1, ys[::-1])) for y in vs]
         xs = np.concatenate([xs, xs[::-1]])
-        kde =  {'x': xs, 'y': ys}
+        kde =  {'ys': xs, 'xs': ys}
 
         bars, segments, scatter = defaultdict(list), defaultdict(list), {}
         values = el.dimension_values(vdim)
@@ -382,7 +372,7 @@ def get_data(self, element, ranges, style):
         if self.invert_axes:
             bar_map = {'y': 'x', 'left': 'bottom',
                        'right': 'top', 'height': 0.1}
-            kde_map = {'x': 'x', 'y': 'y'}
+            kde_map = {'xs': 'ys', 'ys': 'xs'}
             if self.inner == 'box':
                 seg_map = {'x0': 'y0', 'x1': 'y1', 'y0': 'x', 'y1': 'x'}
             else:
@@ -392,7 +382,7 @@ def get_data(self, element, ranges, style):
         else:
             bar_map = {'x': 'x', 'bottom': 'bottom',
                        'top': 'top', 'width': 0.1}
-            kde_map = {'x': 'y', 'y': 'x'}
+            kde_map = {'xs': 'xs', 'ys': 'ys'}
             if self.inner == 'box':
                 seg_map = {'x0': 'x', 'x1': 'x', 'y0': 'y0', 'y1': 'y1'}
             else:
@@ -403,11 +393,10 @@ def get_data(self, element, ranges, style):
         elstyle = self.lookup_options(element, 'style')
         kwargs = {'bandwidth': self.bandwidth, 'cut': self.cut}
 
-        data, mapping = {}, {}
-        seg_data, bar_data, scatter_data = (defaultdict(list) for i in range(3))
+        mapping, data = {}, {}
+        patches_data, seg_data, bar_data, scatter_data = (defaultdict(list) for i in range(4))
         for i, (key, g) in enumerate(groups.items()):
             key = decode_bytes(key)
-            gkey = 'patch_%d'%i
             kde, segs, bars, scatter = self._kde_data(g, key, **kwargs)
             for k, v in segs.items():
                 seg_data[k] += v
@@ -415,11 +404,11 @@ def get_data(self, element, ranges, style):
                 bar_data[k] += v
             for k, v in scatter.items():
                 scatter_data[k].append(v)
-            data[gkey] = kde
-            patch_style = {k[7:]: v for k, v in elstyle[i].items()
-                           if k.startswith('violin')}
-            mapping[gkey] = dict(kde_map, **patch_style)
+            for k, v in kde.items():
+                patches_data[k].append(v)
 
+        data['patches_1'] = patches_data
+        mapping['patches_1'] = kde_map
         if seg_data:
             data['segment_1'] = {k: v if isinstance(v[0], tuple) else np.array(v)
                                  for k, v in seg_data.items()}

From 4b6cc372b6b9a89a60fd8988fb9000deb487d30c Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 10 Nov 2018 22:57:41 +0000
Subject: [PATCH 029/117] Improved op transforms to allow construction from
 tuple

---
 holoviews/util/ops.py | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index e9c5cf385e..77fea3a519 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -1,4 +1,6 @@
 import operator
+from itertools import zip_longest
+
 import numpy as np
 
 from ..core.dimension import Dimension
@@ -42,9 +44,18 @@ def cat_fn(values, categories, empty=None):
     return np.asarray(cats)
 
 
+def str_fn(values):
+    return np.asarray([str(v) for v in values])
+
+
+def int_fn(values):
+    return values.astype(int)
+
+
 class op(object):
 
-    _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn}
+    _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn,
+                    str: str_fn, int: int_fn}
 
     def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
         ops = []
@@ -55,7 +66,7 @@ def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
         else:
             self.dimension = obj.dimension
             ops = obj.ops
-        if isinstance(fn, str):
+        if isinstance(fn, str) or fn in self._op_registry:
             fn = self._op_registry.get(fn)
             if fn is None:
                 raise ValueError('Operation function %s not found' % fn)
@@ -64,6 +75,30 @@ def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
                           'reverse': reverse}]
         self.ops = ops
 
+    @classmethod
+    def resolve_spec(cls, op_spec):
+        """
+        Converts an op spec, i.e. a string or tuple declaring an op
+        or a nested spec of ops into an op instance.
+        """
+        if isinstance(op_spec, basestring):
+            return cls(op_spec)
+        elif isinstance(op_spec, tuple):
+            combined = zip_longest(op_spec, (None, None, None, {}))
+            obj, fn, other, kwargs = (o2 if o1 is None else o1 for o1, o2 in combined)
+            if isinstance(obj, tuple):
+                obj = cls.resolve_spec(obj)
+            return cls(obj, fn, other, **kwargs)
+        return op_spec
+
+    @classmethod
+    def register(cls, key, function):
+        """
+        Register a custom op transform function which can from then
+        on be referenced by the key.
+        """
+        self._op_registry[name] = function
+
     # Unary operators
     def __abs__(self): return op(self, operator.abs)
     def __neg__(self): return op(self, operator.neg)

From 92927ea09d47a8b75259cdcd656ea7a9cb3eda0e Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 15:11:03 +0000
Subject: [PATCH 030/117] Finished cleaning up bokeh Scatter/Point plots,
 tests, docs

---
 .../reference/elements/bokeh/Points.ipynb     | 10 +--
 .../reference/elements/bokeh/Scatter.ipynb    | 10 +--
 holoviews/plotting/bokeh/chart.py             |  8 ++-
 holoviews/plotting/bokeh/element.py           | 12 +++-
 holoviews/plotting/bokeh/styles.py            |  4 +-
 .../tests/plotting/bokeh/testpointplot.py     | 64 ++++++++++++++-----
 6 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/examples/reference/elements/bokeh/Points.ipynb b/examples/reference/elements/bokeh/Points.ipynb
index c6fc7da8e6..6b6037eba0 100644
--- a/examples/reference/elements/bokeh/Points.ipynb
+++ b/examples/reference/elements/bokeh/Points.ipynb
@@ -28,7 +28,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The ``Points`` element visualizes as markers placed in a space of two independent variables, traditionally denoted *x* and *y*. In HoloViews, the names ``'x'`` and ``'y'`` are used as the default ``key_dimensions`` of the element.  We can see this from the default axis labels when visualizing a simple ``Points`` element:"
+    "The ``Points`` element visualizes as markers placed in a space of two independent variables, traditionally denoted *x* and *y*. In HoloViews, the names ``'x'`` and ``'y'`` are used as the default key dimensions (``kdims``) of the element.  We can see this from the default axis labels when visualizing a simple ``Points`` element:"
    ]
   },
   {
@@ -47,7 +47,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Here both the random *x* values and random *y* values are *both* considered to be the 'data' with no dependency between them (compare this to how [``Scatter``](./Scatter.ipynb) elements are defined). You can think of ``Points`` as simply marking positions in some two-dimensional space that can be sliced by specifying a 2D region-of-interest:"
+    "Here the random *x* values and random *y* values are *both* considered to be the 'data' with no dependency between them (compare this to how [``Scatter``](./Scatter.ipynb) elements are defined). You can think of ``Points`` as simply marking positions in some two-dimensional space that can be sliced by specifying a 2D region-of-interest:"
    ]
   },
   {
@@ -64,7 +64,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Although the simplest ``Points`` element simply mark positions in a two-dimensional space without any associated value this doesn't mean value dimensions aren't supported. Here is an example with two additional quantities for each point, declared as the ``value_dimension``s *z* and &alpha; visualized as the color and size of the dots, respectively:"
+    "Although the simplest ``Points`` element simply mark positions in a two-dimensional space without any associated value this doesn't mean value dimensions (``vdims``) aren't supported. Here is an example with two additional quantities for each point, declared as the ``vdims`` ``'z'`` and ``'size'`` visualized as the color and size of the dots, respectively:"
    ]
   },
   {
@@ -73,12 +73,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Points [color_index=2 size_index=3 scaling_factor=50]\n",
+    "%%opts Points (color='z' size=op('size')*20)\n",
     "np.random.seed(10)\n",
     "data = np.random.rand(100,4)\n",
     "\n",
     "points = hv.Points(data, vdims=['z', 'size'])\n",
-    "points + points[0.3:0.7, 0.3:0.7].hist()"
+    "points + points[0.3:0.7, 0.3:0.7].hist('z')"
    ]
   },
   {
diff --git a/examples/reference/elements/bokeh/Scatter.ipynb b/examples/reference/elements/bokeh/Scatter.ipynb
index 5ae411083b..ccb9e2b129 100644
--- a/examples/reference/elements/bokeh/Scatter.ipynb
+++ b/examples/reference/elements/bokeh/Scatter.ipynb
@@ -28,7 +28,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The ``Scatter`` element visualizes as markers placed in a space of one independent variable, traditionally denoted as *x*, against a dependent variable, traditonally denoted as *y*. In HoloViews, the name ``'x'`` is the default dimension name used in the ``key_dimensions`` and ``'y'`` is the default dimension name used in the ``value_dimensions``. We can see this from the default axis labels when visualizing a simple ``Scatter`` element:"
+    "The ``Scatter`` element visualizes as markers placed in a space of one independent variable, traditionally denoted as *x*, against a dependent variable, traditionally denoted as *y*. In HoloViews, the name ``'x'`` is the default dimension name used in the key dimensions (``kdims``) and ``'y'`` is the default dimension name used in the value dimensions (``vdims``). We can see this from the default axis labels when visualizing a simple ``Scatter`` element:"
    ]
   },
   {
@@ -64,7 +64,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "A ``Scatter`` element must always have at least one value dimension but that doesn't mean additional value dimensions aren't supported. Here is an example with two additional quantities for each point, declared as the ``value_dimension``s *z* and &alpha; visualized as the color and size of the dots, respectively:"
+    "A ``Scatter`` element must always have at least one value dimension but that doesn't mean additional value dimensions aren't supported. Here is an example with two additional quantities for each point, declared as the ``vdims`` ``'z'`` and ``'size'`` visualized as the color and size of the dots, respectively:"
    ]
   },
   {
@@ -73,19 +73,19 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Scatter [color_index=2 size_index=3 scaling_factor=50]\n",
+    "%%opts Scatter (color='z' size=op('size')*20)\n",
     "np.random.seed(10)\n",
     "data = np.random.rand(100,4)\n",
     "\n",
     "scatter = hv.Scatter(data, vdims=['y', 'z', 'size'])\n",
-    "scatter + scatter[0.3:0.7, 0.3:0.7].hist()"
+    "scatter + scatter[0.3:0.7, 0.3:0.7].hist('z')"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In the right subplot, the ``hist`` method is used to show the distribution of samples along our first value dimension, (*y*)."
+    "In the right subplot, the ``hist`` method is used to show the distribution of samples along our first value dimension, (``'y'``)."
    ]
   },
   {
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 72a067e846..0fcb6f6a4a 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -10,6 +10,7 @@
 from ...core.util import max_range, basestring, dimension_sanitizer, isfinite, range_pad
 from ...element import Bars
 from ...operation import interpolate_curve
+from ...util.ops import op
 from ..util import compute_sizes, get_min_distance, dim_axis_label, get_axis_padding
 from .element import ElementPlot, ColorbarPlot, LegendPlot
 from .styles import (expand_batched_style, line_properties, fill_properties,
@@ -53,11 +54,16 @@ class PointPlot(LegendPlot, ColorbarPlot):
     def _get_size_data(self, element, ranges, style):
         data, mapping = {}, {}
         sdim = element.get_dimension(self.size_index)
+        ms = style.get('size', np.sqrt(6))
+        if sdim and ((isinstance(ms, basestring) and ms in element) or isinstance(ms, op)):
+            self.warning("Cannot declare style mapping for 'size' option "
+                         "and declare a size_index, ignoring the size_index.")
+            sdim = None
         if not sdim or self.static_source:
             return data, mapping
 
         map_key = 'size_' + sdim.name
-        ms = style.get('size', np.sqrt(6))**2
+        ms = ms**2
         sizes = element.dimension_values(self.size_index)
         sizes = compute_sizes(sizes, self.size_fn,
                               self.scaling_factor,
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index c355c1a713..806f594410 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -719,7 +719,6 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 cmapper = self._get_colormapper(v.dimension, element, ranges,
                                                 style, name=dname+'_color_mapper', **kwargs)
                 key = {'field': k, 'transform': cmapper}
-
             new_style[k] = key
 
         for style, value in list(new_style.items()):
@@ -1236,9 +1235,12 @@ def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=Non
         # and then only updated
         if dim is None and colors is None:
             return None
+
+        # Attempt to find matching colormapper on the adjoined plot
         if self.adjoined:
+            dim_name = dim.name+'_'+name
             cmappers = self.adjoined.traverse(lambda x: (x.handles.get('color_dim'),
-                                                         x.handles.get(name)))
+                                                         x.handles.get(name, x.handles.get(dim_name))))
             cmappers = [cmap for cdim, cmap in cmappers if cdim == dim]
             if cmappers:
                 cmapper = cmappers[0]
@@ -1301,6 +1303,12 @@ def _get_color_data(self, element, ranges, style, name='color', factors=None, co
                         int_categories=False):
         data, mapping = {}, {}
         cdim = element.get_dimension(self.color_index)
+        color = style.get(name, None)
+        if cdim and ((isinstance(color, util.basestring) and color in element) or isinstance(color, op)):
+            self.warning("Cannot declare style mapping for '%s' option "
+                         "and declare a color_index, ignoring the color_index."
+                         % name)
+            cdim = None
         if not cdim:
             return data, mapping
 
diff --git a/holoviews/plotting/bokeh/styles.py b/holoviews/plotting/bokeh/styles.py
index 938b06f900..a86a5c5552 100644
--- a/holoviews/plotting/bokeh/styles.py
+++ b/holoviews/plotting/bokeh/styles.py
@@ -63,7 +63,9 @@ def mpl_to_bokeh(properties):
     """
     new_properties = {}
     for k, v in properties.items():
-        if k == 's':
+        if isinstance(v, dict):
+            new_properties[k] = v
+        elif k == 's':
             new_properties['size'] = v
         elif k == 'marker':
             new_properties.update(markers.get(v, {'marker': v}))
diff --git a/holoviews/tests/plotting/bokeh/testpointplot.py b/holoviews/tests/plotting/bokeh/testpointplot.py
index cc1ff2b5ae..524ad8e3fa 100644
--- a/holoviews/tests/plotting/bokeh/testpointplot.py
+++ b/holoviews/tests/plotting/bokeh/testpointplot.py
@@ -333,8 +333,8 @@ def test_point_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertEqual(glyph.fill_color, 'color')
-        self.assertEqual(glyph.line_color, 'color')
+        self.assertEqual(glyph.fill_color, {'field': 'color'})
+        self.assertEqual(glyph.line_color, {'field': 'color'})
 
     def test_point_linear_color_op(self):
         points = Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
@@ -358,7 +358,7 @@ def test_point_categorical_color_op(self):
         glyph = plot.handles['glyph']
         cmapper = plot.handles['color_color_mapper']
         self.assertTrue(cmapper, CategoricalColorMapper)
-        self.assertEqual(cmapper.factors, np.array(['A', 'B', 'C']))
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
         self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
         self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
         self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
@@ -370,8 +370,8 @@ def test_point_line_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertNotEqual(glyph.fill_color, 'line_color')
-        self.assertEqual(glyph.line_color, 'line_color')
+        self.assertNotEqual(glyph.fill_color, {'field': 'line_color'})
+        self.assertEqual(glyph.line_color, {'field': 'line_color'})
 
     def test_point_fill_color_op(self):
         points = Points([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
@@ -380,8 +380,8 @@ def test_point_fill_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['fill_color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertEqual(glyph.fill_color, 'fill_color')
-        self.assertNotEqual(glyph.line_color, 'fill_color')
+        self.assertEqual(glyph.fill_color, {'field': 'fill_color'})
+        self.assertNotEqual(glyph.line_color, {'field': 'fill_color'})
 
     def test_point_angle_op(self):
         points = Points([(0, 0, 0), (0, 1, 45), (0, 2, 90)],
@@ -390,7 +390,7 @@ def test_point_angle_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['angle'], np.array([0, 0.785398, 1.570796]))
-        self.assertEqual(glyph.angle, 'angle')
+        self.assertEqual(glyph.angle, {'field': 'angle'})
 
     def test_point_alpha_op(self):
         points = Points([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -399,7 +399,7 @@ def test_point_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7]))
-        self.assertEqual(glyph.fill_alpha, 'alpha')
+        self.assertEqual(glyph.fill_alpha, {'field': 'alpha'})
 
     def test_point_line_alpha_op(self):
         points = Points([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -408,8 +408,8 @@ def test_point_line_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_alpha'], np.array([0, 0.2, 0.7]))
-        self.assertEqual(glyph.line_alpha, 'line_alpha')
-        self.assertNotEqual(glyph.fill_alpha, 'line_alpha')
+        self.assertEqual(glyph.line_alpha, {'field': 'line_alpha'})
+        self.assertNotEqual(glyph.fill_alpha, {'field': 'line_alpha'})
 
     def test_point_fill_alpha_op(self):
         points = Points([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -418,8 +418,8 @@ def test_point_fill_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['fill_alpha'], np.array([0, 0.2, 0.7]))
-        self.assertNotEqual(glyph.line_alpha, 'fill_alpha')
-        self.assertEqual(glyph.fill_alpha, 'fill_alpha')
+        self.assertNotEqual(glyph.line_alpha, {'field': 'fill_alpha'})
+        self.assertEqual(glyph.fill_alpha, {'field': 'fill_alpha'})
 
     def test_point_size_op(self):
         points = Points([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
@@ -428,7 +428,7 @@ def test_point_size_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['size'], np.array([1, 4, 8]))
-        self.assertEqual(glyph.size, 'size')
+        self.assertEqual(glyph.size, {'field': 'size'})
 
     def test_point_line_width_op(self):
         points = Points([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
@@ -437,7 +437,7 @@ def test_point_line_width_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_width'], np.array([1, 4, 8]))
-        self.assertEqual(glyph.line_width, 'line_width')
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
 
     def test_point_marker_op(self):
         points = Points([(0, 0, 'circle'), (0, 1, 'triangle'), (0, 2, 'square')],
@@ -446,7 +446,7 @@ def test_point_marker_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['marker'], np.array(['circle', 'triangle', 'square']))
-        self.assertEqual(glyph.marker, 'marker')
+        self.assertEqual(glyph.marker, {'field': 'marker'})
 
     def test_op_ndoverlay_value(self):
         markers = ['circle', 'triangle']
@@ -455,3 +455,35 @@ def test_op_ndoverlay_value(self):
         for subplot, glyph_type, marker in zip(plot.subplots.values(), [Scatter, Scatter], markers):
             self.assertIsInstance(subplot.handles['glyph'], glyph_type)
             self.assertEqual(subplot.handles['glyph'].marker, marker)
+
+    def test_point_color_index_color_clash(self):
+        points = Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(color='color', color_index='color')        
+        with ParamLogStream() as log:
+            plot = bokeh_renderer.get_plot(points)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'color' option "
+                   "and declare a color_index, ignoring the color_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)
+
+    def test_point_color_index_color_no_clash(self):
+        points = Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(fill_color='color', color_index='color')        
+        plot = bokeh_renderer.get_plot(points)
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        cmapper2 = plot.handles['color_mapper']
+        self.assertEqual(glyph.fill_color, {'field': 'fill_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper2})
+
+    def test_point_size_index_size_clash(self):
+        points = Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='size').options(size='size', size_index='size')        
+        with ParamLogStream() as log:
+            plot = bokeh_renderer.get_plot(points)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'size' option "
+                   "and declare a size_index, ignoring the size_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)

From 637b8e1c2a06f36608235d40950b94da35db98de Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 15:32:05 +0000
Subject: [PATCH 031/117] Finished cleaning up bokeh Histogram plot, tests, doc

---
 .../reference/elements/bokeh/Histogram.ipynb  | 18 ++++++++++++-
 .../elements/matplotlib/Histogram.ipynb       | 16 ++++++++++++
 .../tests/plotting/bokeh/testhistogramplot.py | 26 +++++++++----------
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/examples/reference/elements/bokeh/Histogram.ipynb b/examples/reference/elements/bokeh/Histogram.ipynb
index 8f2ff4f887..d612d9e5cc 100644
--- a/examples/reference/elements/bokeh/Histogram.ipynb
+++ b/examples/reference/elements/bokeh/Histogram.ipynb
@@ -48,7 +48,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The ``Histogram`` Element will also expand evenly sampled bin centers, therefore we can easily cast between a linearly sampled Curve or Scatter and a Histogram."
+    "The ``Histogram`` Element will also expand evenly sampled bin centers, therefore we can easily cast between a linearly sampled ``Curve`` or ``Scatter`` and a ``Histogram``."
    ]
   },
   {
@@ -63,6 +63,22 @@
     "curve + hv.Histogram(curve)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Like most other elements a ``Histogram`` also supports using ``op`` transforms to map dimensions to visual attributes. To demonstrate this we will use the ``bin`` op to bin the 'y' values into positive and negative values and map those to a 'blue' and 'red' ``fill_color``:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "hv.Histogram(curve).options(fill_color=hv.op('y', 'bin', bins=[-1, 0, 1], labels=['red', 'blue']))"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/examples/reference/elements/matplotlib/Histogram.ipynb b/examples/reference/elements/matplotlib/Histogram.ipynb
index e072e4748f..4d3271547f 100644
--- a/examples/reference/elements/matplotlib/Histogram.ipynb
+++ b/examples/reference/elements/matplotlib/Histogram.ipynb
@@ -63,6 +63,22 @@
     "curve + hv.Histogram(curve)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Like most other elements a ``Histogram`` also supports using ``op`` transforms to map dimensions to visual attributes. To demonstrate this we will use the ``bin`` op to bin the 'y' values into positive and negative values and map those to a 'blue' and 'red' ``fill_color``:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "hv.Histogram(curve).options(color=hv.op('y', 'bin', bins=[-1, 0, 1], labels=['red', 'blue']))"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/holoviews/tests/plotting/bokeh/testhistogramplot.py b/holoviews/tests/plotting/bokeh/testhistogramplot.py
index bd36451f1b..655642c6e1 100644
--- a/holoviews/tests/plotting/bokeh/testhistogramplot.py
+++ b/holoviews/tests/plotting/bokeh/testhistogramplot.py
@@ -161,8 +161,8 @@ def test_histogram_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertEqual(glyph.fill_color, 'color')
-        self.assertEqual(glyph.line_color, 'color')
+        self.assertEqual(glyph.fill_color, {'field': 'color'})
+        self.assertEqual(glyph.line_color, {'field': 'color'})
 
     def test_histogram_linear_color_op(self):
         histogram = Histogram([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
@@ -186,7 +186,7 @@ def test_histogram_categorical_color_op(self):
         glyph = plot.handles['glyph']
         cmapper = plot.handles['color_color_mapper']
         self.assertTrue(cmapper, CategoricalColorMapper)
-        self.assertEqual(cmapper.factors, np.array(['A', 'B', 'C']))
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
         self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
         self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
         self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
@@ -198,8 +198,8 @@ def test_histogram_line_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertNotEqual(glyph.fill_color, 'line_color')
-        self.assertEqual(glyph.line_color, 'line_color')
+        self.assertNotEqual(glyph.fill_color, {'field': 'line_color'})
+        self.assertEqual(glyph.line_color, {'field': 'line_color'})
 
     def test_histogram_fill_color_op(self):
         histogram = Histogram([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
@@ -208,8 +208,8 @@ def test_histogram_fill_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['fill_color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertEqual(glyph.fill_color, 'fill_color')
-        self.assertNotEqual(glyph.line_color, 'fill_color')
+        self.assertEqual(glyph.fill_color, {'field': 'fill_color'})
+        self.assertNotEqual(glyph.line_color, {'field': 'fill_color'})
 
     def test_histogram_alpha_op(self):
         histogram = Histogram([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -218,7 +218,7 @@ def test_histogram_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7]))
-        self.assertEqual(glyph.fill_alpha, 'alpha')
+        self.assertEqual(glyph.fill_alpha, {'field': 'alpha'})
 
     def test_histogram_line_alpha_op(self):
         histogram = Histogram([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -227,8 +227,8 @@ def test_histogram_line_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_alpha'], np.array([0, 0.2, 0.7]))
-        self.assertEqual(glyph.line_alpha, 'line_alpha')
-        self.assertNotEqual(glyph.fill_alpha, 'line_alpha')
+        self.assertEqual(glyph.line_alpha, {'field': 'line_alpha'})
+        self.assertNotEqual(glyph.fill_alpha, {'field': 'line_alpha'})
 
     def test_histogram_fill_alpha_op(self):
         histogram = Histogram([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -237,8 +237,8 @@ def test_histogram_fill_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['fill_alpha'], np.array([0, 0.2, 0.7]))
-        self.assertNotEqual(glyph.line_alpha, 'fill_alpha')
-        self.assertEqual(glyph.fill_alpha, 'fill_alpha')
+        self.assertNotEqual(glyph.line_alpha, {'field': 'fill_alpha'})
+        self.assertEqual(glyph.fill_alpha, {'field': 'fill_alpha'})
 
     def test_histogram_line_width_op(self):
         histogram = Histogram([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
@@ -247,7 +247,7 @@ def test_histogram_line_width_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_width'], np.array([1, 4, 8]))
-        self.assertEqual(glyph.line_width, 'line_width')
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
 
     def test_op_ndoverlay_value(self):
         colors = ['blue', 'red']

From a7055748da45df7c0f5ebe8f5fd9db1cb49668df Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 16:07:12 +0000
Subject: [PATCH 032/117] Overhauled bokeh BarPlot code, tests, docs

---
 .../gallery/demos/bokeh/bars_economic.ipynb   |   4 +-
 examples/reference/elements/bokeh/Bars.ipynb  |   6 +-
 holoviews/plotting/bokeh/chart.py             |  61 ++++----
 holoviews/tests/plotting/bokeh/testbarplot.py | 130 ++++++++++++++++++
 4 files changed, 173 insertions(+), 28 deletions(-)

diff --git a/examples/gallery/demos/bokeh/bars_economic.ipynb b/examples/gallery/demos/bokeh/bars_economic.ipynb
index 6801997738..25a0fd2fef 100644
--- a/examples/gallery/demos/bokeh/bars_economic.ipynb
+++ b/examples/gallery/demos/bokeh/bars_economic.ipynb
@@ -53,9 +53,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Bars [stack_index=1 xrotation=90 width=600 show_legend=False tools=['hover']]\n",
+    "%%opts Bars [stacked=True xrotation=90 width=600 show_legend=False tools=['hover']]\n",
     "%%opts Bars (color=Cycle('Category20'))\n",
-    "macro.to.bars([ 'Year', 'Country'], 'Trade', [])"
+    "macro.to.bars(['Year', 'Country'], 'Trade', [])"
    ]
   }
  ],
diff --git a/examples/reference/elements/bokeh/Bars.ipynb b/examples/reference/elements/bokeh/Bars.ipynb
index 8ef60f0955..145bcf1c65 100644
--- a/examples/reference/elements/bokeh/Bars.ipynb
+++ b/examples/reference/elements/bokeh/Bars.ipynb
@@ -30,7 +30,7 @@
    "source": [
     "The ``Bars`` Element uses bars to show discrete, numerical comparisons across categories. One axis of the chart shows the specific categories being compared and the other axis represents a continuous value.\n",
     "\n",
-    "Bars may also be stacked by supplying a second key dimensions representing sub-categories. Therefore the ``Bars`` Element expects a tabular data format with one or two key dimensions and one value dimension. See the [Tabular Datasets](../../../user_guide/07-Tabular_Datasets.ipynb) user guide for supported data formats, which include arrays, pandas dataframes and dictionaries of arrays."
+    "Bars may also be grouped or stacked by supplying a second key dimension representing sub-categories. Therefore the ``Bars`` Element expects a tabular data format with one or two key dimensions (``kdims``) and one or more value dimensions (``vdims``). See the [Tabular Datasets](../../../user_guide/07-Tabular_Datasets.ipynb) user guide for supported data formats, which include arrays, pandas dataframes and dictionaries of arrays."
    ]
   },
   {
@@ -64,7 +64,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "``Bars`` support stacking just like the ``Area`` element as well as grouping by a second key dimension. To activate grouping and stacking set the ``group_index`` or ``stack_index`` to the dimension name or dimension index:"
+    "``Bars`` support nested categorical grouping as well as stacking if more than one key dimension is defined, to switch between the two set ``stacked=True/False``:"
    ]
   },
   {
@@ -73,7 +73,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Bars.Grouped [group_index='Group'] Bars.Stacked [stack_index='Group']\n",
+    "%%opts Bars.Stacked [stacked=True]\n",
     "from itertools import product\n",
     "np.random.seed(3)\n",
     "index, groups = ['A', 'B'], ['a', 'b']\n",
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 0fcb6f6a4a..227ad7f04b 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -700,15 +700,16 @@ class BarPlot(ColorbarPlot, LegendPlot):
                                       allow_None=True, doc="""
        Index of the dimension from which the color will the drawn""")
 
+    stacked = param.Boolean(default=False, doc="""
+       Whether the bars should be stacked or grouped.""")
+
     group_index = param.ClassSelector(default=1, class_=(basestring, int),
                                       allow_None=True, doc="""
-       Index of the dimension in the supplied Bars
-       Element, which will be laid out into groups.""")
+       Deprecated; use stacked option instead.""")
 
     stack_index = param.ClassSelector(default=None, class_=(basestring, int),
                                       allow_None=True, doc="""
-       Index of the dimension in the supplied Bars
-       Element, which will stacked.""")
+       Deprecated; use stacked option instead.""")
 
     style_opts = line_properties + fill_properties + ['width', 'bar_width', 'cmap']
 
@@ -732,13 +733,12 @@ def get_extents(self, element, ranges, range_type='combined'):
             for kd in overlay.kdims:
                 ranges[kd.name]['combined'] = overlay.range(kd)
 
-        stacked = element.get_dimension(self.stack_index)
         extents = super(BarPlot, self).get_extents(element, ranges, range_type)
         xdim = element.kdims[0]
         ydim = element.vdims[0]
 
         # Compute stack heights
-        if stacked:
+        if self.stacked:
             ds = Dataset(element)
             pos_range = ds.select(**{ydim.name: (0, None)}).aggregate(xdim, function=np.sum).range(ydim)
             neg_range = ds.select(**{ydim.name: (None, 0)}).aggregate(xdim, function=np.sum).range(ydim)
@@ -768,12 +768,14 @@ def _get_factors(self, element):
         """
         Get factors for categorical axes.
         """
-        gdim = element.get_dimension(self.group_index)
-        if gdim not in element.kdims:
-            gdim = None
-        sdim = element.get_dimension(self.stack_index)
-        if sdim not in element.kdims:
-            sdim = None
+        gdim = None
+        sdim = None
+        if element.ndims == 1:
+            pass
+        elif not self.stacked:
+            gdim = element.get_dimension(1)
+        else:
+            sdim = element.get_dimension(1)
 
         xdim, ydim = element.dimensions()[:2]
         xvals = element.dimension_values(0, False)
@@ -797,7 +799,10 @@ def _get_axis_labels(self, *args, **kwargs):
         if self.batched:
             element = element.last
         xlabel = dim_axis_label(element.kdims[0])
-        gdim = element.get_dimension(self.group_index)
+        if element.ndims > 1 and not self.stacked:
+            gdim = element.get_dimension(1)
+        else:
+            gdim = None
         if gdim and gdim in element.kdims:
             xlabel = ', '.join([xlabel, dim_axis_label(gdim)])
         return (xlabel, dim_axis_label(element.vdims[0]), None)
@@ -843,6 +848,10 @@ def _add_color_data(self, ds, ranges, style, cdim, data, mapping, factors, color
             isinstance(cmapper, CategoricalColorMapper)):
             mapping['legend'] = cdim.name
 
+        if not self.stacked and ds.ndims > 1:
+            cmapping.pop('legend', None)
+            mapping.pop('legend', None)
+
         # Merge data and mappings
         mapping.update(cmapping)
         for k, cd in cdata.items():
@@ -855,19 +864,25 @@ def _add_color_data(self, ds, ranges, style, cdim, data, mapping, factors, color
 
 
     def get_data(self, element, ranges, style):
+        if self.stack_index is not None:
+            self.warning('Bars stack_index plot option is deprecated '
+                         'and will be ignored, set stacked=True/False '
+                         'instead.')
+        if self.group_index not in (None, 1):
+            self.warning('Bars group_index plot option is deprecated '
+                         'and will be ignored, set stacked=True/False '
+                         'instead.')
+
         # Get x, y, group, stack and color dimensions
-        grouping = None
-        group_dim = element.get_dimension(self.group_index)
-        if group_dim not in element.kdims:
-            group_dim = None
+        group_dim, stack_dim = None, None
+        if element.ndims == 1:
+            grouping = None
+        elif self.stacked:
+            grouping = 'stacked'
+            stack_dim = element.get_dimension(1)
         else:
             grouping = 'grouped'
-        stack_dim = element.get_dimension(self.stack_index)
-        if stack_dim not in element.kdims:
-            stack_dim = None
-        else:
-            grouping = 'stacked'
-            group_dim = None
+            group_dim = element.get_dimension(1)
 
         xdim = element.get_dimension(0)
         ydim = element.vdims[0]
diff --git a/holoviews/tests/plotting/bokeh/testbarplot.py b/holoviews/tests/plotting/bokeh/testbarplot.py
index d1a9d60d88..d3ba4d35c9 100644
--- a/holoviews/tests/plotting/bokeh/testbarplot.py
+++ b/holoviews/tests/plotting/bokeh/testbarplot.py
@@ -1,7 +1,11 @@
 import numpy as np
 
+from holoviews.core.overlay import NdOverlay
 from holoviews.element import Bars
 
+from bokeh.models import CategoricalColorMapper, LinearColorMapper
+
+from ..utils import ParamLogStream
 from .testplot import TestBokehPlot, bokeh_renderer
 
 
@@ -122,3 +126,129 @@ def test_bars_padding_logy(self):
         self.assertEqual(y_range.start, 0.033483695221017122)
         self.assertEqual(y_range.end, 3.3483695221017129)
 
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_bars_color_op(self):
+        bars = Bars([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.fill_color, {'field': 'color'})
+        self.assertEqual(glyph.line_color, {'field': 'color'})
+
+    def test_bars_linear_color_op(self):
+        bars = Bars([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 2)
+        self.assertEqual(cds.data['color'], np.array([0, 1, 2]))
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_bars_categorical_color_op(self):
+        bars = Bars([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
+                              vdims=['y', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
+        self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_bars_line_color_op(self):
+        bars = Bars([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(line_color='color')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertNotEqual(glyph.fill_color, {'field': 'line_color'})
+        self.assertEqual(glyph.line_color, {'field': 'line_color'})
+
+    def test_bars_fill_color_op(self):
+        bars = Bars([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
+                              vdims=['y', 'color']).options(fill_color='color')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['fill_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.fill_color, {'field': 'fill_color'})
+        self.assertNotEqual(glyph.line_color, {'field': 'fill_color'})
+
+    def test_bars_alpha_op(self):
+        bars = Bars([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(alpha='alpha')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.fill_alpha, {'field': 'alpha'})
+
+    def test_bars_line_alpha_op(self):
+        bars = Bars([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(line_alpha='alpha')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.line_alpha, {'field': 'line_alpha'})
+        self.assertNotEqual(glyph.fill_alpha, {'field': 'line_alpha'})
+
+    def test_bars_fill_alpha_op(self):
+        bars = Bars([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(fill_alpha='alpha')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['fill_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertNotEqual(glyph.line_alpha, {'field': 'fill_alpha'})
+        self.assertEqual(glyph.fill_alpha, {'field': 'fill_alpha'})
+
+    def test_bars_line_width_op(self):
+        bars = Bars([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
+                              vdims=['y', 'line_width']).options(line_width='line_width')
+        plot = bokeh_renderer.get_plot(bars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_width'], np.array([1, 4, 8]))
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
+
+    def test_op_ndoverlay_value(self):
+        colors = ['blue', 'red']
+        overlay = NdOverlay({color: Bars(np.arange(i+2)) for i, color in enumerate(colors)}, 'Color').options('Bars', fill_color='Color')
+        plot = bokeh_renderer.get_plot(overlay)
+        for subplot, color in zip(plot.subplots.values(),  colors):
+            self.assertEqual(subplot.handles['glyph'].fill_color, color)
+
+    def test_bars_color_index_color_clash(self):
+        bars = Bars([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                    vdims=['y', 'color']).options(color='color', color_index='color')        
+        with ParamLogStream() as log:
+            plot = bokeh_renderer.get_plot(bars)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'color' option "
+                   "and declare a color_index, ignoring the color_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)
+
+    def test_bars_color_index_color_no_clash(self):
+        bars = Bars([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                    vdims=['y', 'color']).options(fill_color='color', color_index='color')        
+        plot = bokeh_renderer.get_plot(bars)
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        cmapper2 = plot.handles['color_mapper']
+        self.assertEqual(glyph.fill_color, {'field': 'fill_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper2})

From 2c4709d80166d539f9f4589e2ea23dbd4ce88e63 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 16:28:05 +0000
Subject: [PATCH 033/117] Finished off mpl PointPlot code, tests, docs

---
 holoviews/plotting/mpl/chart.py               | 13 +++++++++-
 holoviews/plotting/mpl/element.py             | 16 ++++++-------
 .../plotting/matplotlib/testpointplot.py      | 24 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index 82aa2a0b96..56f665b9b7 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -581,6 +581,8 @@ class PointPlot(ChartPlot, ColorbarPlot):
     def get_data(self, element, ranges, style):
         xs, ys = (element.dimension_values(i) for i in range(2))
         self._compute_styles(element, ranges, style)
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
         return (ys, xs) if self.invert_axes else (xs, ys), style, {}
 
 
@@ -588,6 +590,11 @@ def _compute_styles(self, element, ranges, style):
         cdim = element.get_dimension(self.color_index)
         color = style.pop('color', None)
         cmap = style.get('cmap', None)
+
+        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, op)):
+            self.warning("Cannot declare style mapping for 'color' option "
+                         "and declare a color_index, ignoring the color_index.")
+            cdim = None
         if cdim and cmap:
             cs = element.dimension_values(self.color_index)
             # Check if numeric otherwise treat as categorical
@@ -603,10 +610,14 @@ def _compute_styles(self, element, ranges, style):
                 style['color'] = color
         style['edgecolors'] = style.pop('edgecolors', style.pop('edgecolor', 'none'))
 
+        ms = style.get('s', mpl.rcParams['lines.markersize'])
         sdim = element.get_dimension(self.size_index)
+        if sdim and ((isinstance(ms, basestring) and ms in element) or isinstance(ms, op)):
+            self.warning("Cannot declare style mapping for 's' option "
+                         "and declare a size_index, ignoring the size_index.")
+            sdim = None
         if sdim:
             sizes = element.dimension_values(self.size_index)
-            ms = style['s'] if 's' in style else mpl.rcParams['lines.markersize']
             sizes = compute_sizes(sizes, self.size_fn, self.scaling_factor,
                                   self.scaling_method, ms)
             if sizes is None:
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 3c31bb2f0d..96338dd28a 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -480,8 +480,6 @@ def initialize_plot(self, ranges=None):
         if self.show_legend:
             style['label'] = element.label
 
-        with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
         plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, style)
 
         with abbreviated_exception():
@@ -509,9 +507,7 @@ def update_handles(self, key, axis, element, ranges, style):
         Update the elements of the plot.
         """
         self.teardown_handles()
-        with abbreviated_exception():
-            new_style = self._apply_ops(element, ranges, style)
-        plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, new_style)
+        plot_data, plot_kwargs, axis_kwargs = self.get_data(element, ranges, style)
 
         with abbreviated_exception():
             handles = self.init_artists(axis, plot_data, plot_kwargs)
@@ -559,13 +555,16 @@ def _apply_ops(self, element, ranges, style):
                                  )
                 )
 
-            if 'color' == k and (isinstance(val, np.ndarray) and all(not is_color(c) for c in val)):
+            if k in ('color', 'c') and isinstance(val, np.ndarray) and all(not is_color(c) for c in val):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v.dimension, val)
                 if val.dtype.kind in 'OSUM':
                     val = categorize_colors(val)
                 k = 'c'
 
+            new_style[k] = val
+
+        for k, val in list(new_style.items()):
             # If mapped to color/alpha override static fill/line style
             if k == 'c' or (k == 'color' and isinstance(val, np.ndarray)):
                 fill_style = new_style.get('facecolor')
@@ -574,11 +573,10 @@ def _apply_ops(self, element, ranges, style):
                 line_style = new_style.get('edgecolor')
                 if line_style and is_color(line_style):
                     new_style.pop('edgecolor')
-            elif k == 'facecolors':
+            elif k == 'facecolors' and not isinstance(new_style.get('color', new_style.get('c')), np.ndarray):
                 # Color overrides facecolors if defined
                 new_style.pop('color', None)
-
-            new_style[k] = val
+                new_style.pop('c', None)
 
         return new_style
 
diff --git a/holoviews/tests/plotting/matplotlib/testpointplot.py b/holoviews/tests/plotting/matplotlib/testpointplot.py
index 7c238b4519..93477ed971 100644
--- a/holoviews/tests/plotting/matplotlib/testpointplot.py
+++ b/holoviews/tests/plotting/matplotlib/testpointplot.py
@@ -57,7 +57,7 @@ def test_points_rcparams_used(self):
         ax = plot.state.axes[0]
         lines = ax.get_xgridlines()
         self.assertEqual(lines[0].get_color(), 'red')
-    
+
     def test_points_padding_square(self):
         points = Points([1, 2, 3]).options(padding=0.1)
         plot = mpl_renderer.get_plot(points)
@@ -232,3 +232,25 @@ def test_op_ndoverlay_value(self):
             style = dict(subplot.style[subplot.cyclic_index])
             style = subplot._apply_ops(subplot.current_frame, {}, style)
             self.assertEqual(style['marker'], marker)
+
+    def test_point_color_index_color_clash(self):
+        points = Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(color='color', color_index='color')
+        with ParamLogStream() as log:
+            plot = mpl_renderer.get_plot(points)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'color' option "
+                   "and declare a color_index, ignoring the color_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)
+
+    def test_point_size_index_size_clash(self):
+        points = Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='size').options(s='size', size_index='size')
+        with ParamLogStream() as log:
+            plot = mpl_renderer.get_plot(points)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 's' option "
+                   "and declare a size_index, ignoring the size_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)

From 15b769bb515bcd8735f18cbf44ec0948da5e6868 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 17:01:33 +0000
Subject: [PATCH 034/117] Finalized handling of SpikesPlot across backends

---
 holoviews/plotting/bokeh/chart.py             | 11 +++----
 holoviews/plotting/mpl/chart.py               | 17 ++++++++--
 holoviews/plotting/mpl/element.py             |  6 ++--
 .../tests/plotting/bokeh/testspikesplot.py    | 24 ++++++++++----
 .../plotting/matplotlib/testspikeplot.py      | 31 ++++++++++++++-----
 5 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 227ad7f04b..449db85e83 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -341,6 +341,8 @@ class HistogramPlot(ColorbarPlot):
     style_opts = line_properties + fill_properties + ['cmap']
     _plot_methods = dict(single='quad')
 
+    _no_op_styles = ['line_dash']
+
     def get_data(self, element, ranges, style):
         if self.invert_axes:
             mapping = dict(top='right', bottom='left', left=0, right='top')
@@ -650,13 +652,10 @@ def get_data(self, element, ranges, style):
             mapping = {'x0': 'y0', 'x1': 'y1', 'y0': 'x', 'y1': 'x'}
         else:
             mapping = {'x0': 'x', 'x1': 'x', 'y0': 'y0', 'y1': 'y1'}
-        cdim = element.get_dimension(self.color_index)
-        if cdim:
-            cmapper = self._get_colormapper(cdim, element, ranges, style)
-            data[cdim.name] = [] if self.static_source else element.dimension_values(cdim)
-            mapping['color'] = {'field': cdim.name,
-                                'transform': cmapper}
 
+        cdata, cmapping = self._get_color_data(element, ranges, dict(style))
+        data.update(cdata)
+        mapping.update(cmapping)
         self._get_hover_data(data, element)
 
         return data, mapping, style
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index 56f665b9b7..dc76e1e7c5 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -1003,6 +1003,10 @@ class SpikesPlot(PathPlot, ColorbarPlot):
     style_opts = PathPlot.style_opts + ['cmap']
 
     def init_artists(self, ax, plot_args, plot_kwargs):
+        if 'c' in plot_kwargs:
+            plot_kwargs['array'] = plot_kwargs.pop('c')
+        if 'vmin' in plot_kwargs and 'vmax' in plot_kwargs:
+            plot_kwargs['clim'] = plot_kwargs.pop('vmin'), plot_kwargs.pop('vmax')
         line_segments = LineCollection(*plot_args, **plot_kwargs)
         ax.add_collection(line_segments)
         return {'artist': line_segments}
@@ -1061,10 +1065,17 @@ def get_data(self, element, ranges, style):
             clean_spikes.append(np.column_stack(cols))
 
         cdim = element.get_dimension(self.color_index)
+        color = style.get('color', None)
+        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, op)):
+            self.warning("Cannot declare style mapping for 'color' option "
+                         "and declare a color_index, ignoring the color_index.")
+            cdim = None
         if cdim:
             style['array'] = element.dimension_values(cdim)
             self._norm_kwargs(element, ranges, style, cdim)
-            style['clim'] = style.pop('vmin'), style.pop('vmax')
+
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
         return (clean_spikes,), style, {'dimensions': dims}
 
 
@@ -1073,9 +1084,9 @@ def update_handles(self, key, axis, element, ranges, style):
         (data,), kwargs, axis_kwargs = self.get_data(element, ranges, style)
         artist.set_paths(data)
         artist.set_visible(style.get('visible', True))
-        if 'array' in kwargs:
+        if 'array' in kwargs or 'c' in kwargs:
             artist.set_clim((kwargs['vmin'], kwargs['vmax']))
-            artist.set_array(kwargs['array'])
+            artist.set_array(kwargs.get('array', kwargs.get('c')))
             if 'norm' in kwargs:
                 artist.norm = kwargs['norm']
         return axis_kwargs
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 96338dd28a..b3f5b9fedf 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -555,7 +555,7 @@ def _apply_ops(self, element, ranges, style):
                                  )
                 )
 
-            if k in ('color', 'c') and isinstance(val, np.ndarray) and all(not is_color(c) for c in val):
+            if k in ('c', 'color') and isinstance(val, np.ndarray) and all(not is_color(c) for c in val):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v.dimension, val)
                 if val.dtype.kind in 'OSUM':
@@ -566,7 +566,9 @@ def _apply_ops(self, element, ranges, style):
 
         for k, val in list(new_style.items()):
             # If mapped to color/alpha override static fill/line style
-            if k == 'c' or (k == 'color' and isinstance(val, np.ndarray)):
+            if k == 'c':
+                new_style.pop('color', None)
+            if k in ('c', 'color') and isinstance(val, np.ndarray):
                 fill_style = new_style.get('facecolor')
                 if fill_style and is_color(fill_style):
                     new_style.pop('facecolor')
diff --git a/holoviews/tests/plotting/bokeh/testspikesplot.py b/holoviews/tests/plotting/bokeh/testspikesplot.py
index 9929a37d0b..f794d4ecb2 100644
--- a/holoviews/tests/plotting/bokeh/testspikesplot.py
+++ b/holoviews/tests/plotting/bokeh/testspikesplot.py
@@ -6,6 +6,7 @@
 
 from bokeh.models import CategoricalColorMapper, LinearColorMapper
 
+from ..utils import ParamLogStream
 from .testplot import TestBokehPlot, bokeh_renderer
 
 
@@ -141,7 +142,7 @@ def test_spikes_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertEqual(glyph.line_color, 'color')
+        self.assertEqual(glyph.line_color, {'field': 'color'})
 
     def test_spikes_linear_color_op(self):
         spikes = Spikes([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
@@ -164,7 +165,7 @@ def test_spikes_categorical_color_op(self):
         glyph = plot.handles['glyph']
         cmapper = plot.handles['color_color_mapper']
         self.assertTrue(cmapper, CategoricalColorMapper)
-        self.assertEqual(cmapper.factors, np.array(['A', 'B', 'C']))
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
         self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
         self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
 
@@ -175,7 +176,7 @@ def test_spikes_line_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertEqual(glyph.line_color, 'line_color')
+        self.assertEqual(glyph.line_color, {'field': 'line_color'})
 
     def test_spikes_alpha_op(self):
         spikes = Spikes([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -184,7 +185,7 @@ def test_spikes_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7]))
-        self.assertEqual(glyph.line_alpha, 'alpha')
+        self.assertEqual(glyph.line_alpha, {'field': 'alpha'})
 
     def test_spikes_line_alpha_op(self):
         spikes = Spikes([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -193,7 +194,7 @@ def test_spikes_line_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_alpha'], np.array([0, 0.2, 0.7]))
-        self.assertEqual(glyph.line_alpha, 'line_alpha')
+        self.assertEqual(glyph.line_alpha, {'field': 'line_alpha'})
 
     def test_spikes_line_width_op(self):
         spikes = Spikes([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
@@ -202,7 +203,7 @@ def test_spikes_line_width_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['line_width'], np.array([1, 4, 8]))
-        self.assertEqual(glyph.line_width, 'line_width')
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
 
     def test_op_ndoverlay_value(self):
         colors = ['blue', 'red']
@@ -210,3 +211,14 @@ def test_op_ndoverlay_value(self):
         plot = bokeh_renderer.get_plot(overlay)
         for subplot, color in zip(plot.subplots.values(),  colors):
             self.assertEqual(subplot.handles['glyph'].line_color, color)
+
+    def test_spikes_color_index_color_clash(self):
+        spikes = Spikes([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                    vdims=['y', 'color']).options(color='color', color_index='color')
+        with ParamLogStream() as log:
+            plot = bokeh_renderer.get_plot(spikes)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'color' option "
+                   "and declare a color_index, ignoring the color_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)
diff --git a/holoviews/tests/plotting/matplotlib/testspikeplot.py b/holoviews/tests/plotting/matplotlib/testspikeplot.py
index d72bafc6a9..f0f45bd0eb 100644
--- a/holoviews/tests/plotting/matplotlib/testspikeplot.py
+++ b/holoviews/tests/plotting/matplotlib/testspikeplot.py
@@ -3,6 +3,7 @@
 from holoviews.core.overlay import NdOverlay
 from holoviews.element import Spikes
 
+from ..utils import ParamLogStream
 from .testplot import TestMPLPlot, mpl_renderer
 
 
@@ -103,15 +104,19 @@ def test_spikes_color_op(self):
 
     def test_spikes_linear_color_op(self):
         spikes = Spikes([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
-                              vdims=['y', 'color']).options(color='color')
-        with self.assertRaises(Exception):
-            mpl_renderer.get_plot(spikes)
+                        vdims=['y', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(spikes)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(artist.get_clim(), (0, 2))
 
     def test_spikes_categorical_color_op(self):
-        spikes = Spikes([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
-                              vdims=['y', 'color']).options(color='color')
-        with self.assertRaises(Exception):
-            mpl_renderer.get_plot(spikes)
+        spikes = Spikes([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'A')],
+                        vdims=['y', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(spikes)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([0, 1, 0]))
+        self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_spikes_alpha_op(self):
         spikes = Spikes([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -140,3 +145,15 @@ def test_op_ndoverlay_value(self):
             children = subplot.handles['artist'].get_children()
             for c in children:
                 self.assertEqual(c.get_facecolor(), color)
+
+    def test_spikes_color_index_color_clash(self):
+        spikes = Spikes([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims=['y', 'color']).options(color='color', color_index='color')
+        with ParamLogStream() as log:
+            plot = mpl_renderer.get_plot(spikes)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'color' option "
+                   "and declare a color_index, ignoring the color_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)
+

From dc3c5fd0b2542cc6a3a122dbb0b5e2dc7c1e7c66 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 17:23:40 +0000
Subject: [PATCH 035/117] Finalized style mapping for Spikes and Labels

---
 .../reference/elements/bokeh/Labels.ipynb     |  4 +--
 .../reference/elements/bokeh/Spikes.ipynb     |  6 ++--
 .../elements/matplotlib/Spikes.ipynb          |  6 ++--
 holoviews/plotting/bokeh/annotation.py        |  2 +-
 holoviews/plotting/bokeh/element.py           |  8 ++++-
 holoviews/plotting/mpl/annotation.py          |  5 ++-
 holoviews/tests/plotting/bokeh/testlabels.py  | 36 ++++++++++++++-----
 holoviews/util/ops.py                         |  4 +--
 8 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/examples/reference/elements/bokeh/Labels.ipynb b/examples/reference/elements/bokeh/Labels.ipynb
index 9b2fbdad8f..0a40fa75b0 100644
--- a/examples/reference/elements/bokeh/Labels.ipynb
+++ b/examples/reference/elements/bokeh/Labels.ipynb
@@ -72,7 +72,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "If the value dimension of the data is not already of string type it will be formatted using the applicable entry in ``Dimension.type_formatters`` or an explicit ``value_format`` defined on the Dimension. Additionally the ``color_index`` option allows us to colormap the text by a dimension.\n",
+    "If the value dimension of the data is not already of string type it will be formatted using the applicable entry in ``Dimension.type_formatters`` or an explicit ``value_format`` defined on the Dimension. Additionally the ``text_color`` option allows us to colormap the text by a dimension.\n",
     "\n",
     "Here we will create a 2D array of values, define a Dimension with a formatter and then colormap the text:"
    ]
@@ -88,7 +88,7 @@
     "zs = np.sin(xs**2)*np.sin(ys**2)[:, np.newaxis]\n",
     "\n",
     "hv.Labels((xs, ys, zs), vdims=value_dimension).options(\n",
-    "    bgcolor='black', cmap='magma', color_index='Values', height=400, text_font_size='6pt', width=400\n",
+    "    bgcolor='black', cmap='magma', text_color='Values', height=400, text_font_size='6pt', width=400\n",
     ")"
    ]
   }
diff --git a/examples/reference/elements/bokeh/Spikes.ipynb b/examples/reference/elements/bokeh/Spikes.ipynb
index 1674194d72..bf73094b72 100644
--- a/examples/reference/elements/bokeh/Spikes.ipynb
+++ b/examples/reference/elements/bokeh/Spikes.ipynb
@@ -66,7 +66,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "When supplying a second dimension to the ``Spikes`` element as a value dimension, these additional values will be mapped onto the line height. Optionally, you may also supply a colormap ``cmap`` and ``color_index`` to map the value dimensions to a suitable set of colors. This way we can, for example, plot a [mass spectrogram](https://en.wikipedia.org/wiki/Mass_spectrometry):"
+    "When supplying a second dimension to the ``Spikes`` element as a value dimension, these additional values will be mapped onto the line height. Optionally, it is also possible to map dimensions to style options. This way we can, for example, plot a [mass spectrogram](https://en.wikipedia.org/wiki/Mass_spectrometry):"
    ]
   },
   {
@@ -75,7 +75,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Spikes [color_index='Intensity'] (cmap='Reds')\n",
+    "%%opts Spikes (color='Intensity' cmap='Reds')\n",
     "hv.Spikes(np.random.rand(20, 2), 'Mass', 'Intensity')"
    ]
   },
@@ -83,7 +83,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Another possibility is to draw a number of spike trains representing the firing of neurons, of the sort that are commonly encountered in neuroscience. Here we generate 10 separate random spike trains and distribute them evenly across the space by setting their ``position``. By declaring some ``yticks``, each spike train can be labeled individually:"
+    "Another possibility is to draw a set of Spikes offset by a position, this can be useful for plotting neuron spike trains or other events. Here we generate 10 separate random spike trains and distribute them evenly across the space by setting their ``position``. By declaring some ``yticks``, each spike train can be labeled individually:"
    ]
   },
   {
diff --git a/examples/reference/elements/matplotlib/Spikes.ipynb b/examples/reference/elements/matplotlib/Spikes.ipynb
index 9ef9fd6e8b..b47b1bfbad 100644
--- a/examples/reference/elements/matplotlib/Spikes.ipynb
+++ b/examples/reference/elements/matplotlib/Spikes.ipynb
@@ -66,7 +66,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "When supplying a second dimension to the ``Spikes`` element as a value dimensions, these additional values will be mapped onto the line height. Optionally, you may also supply a colormap ``cmap`` and ``color_index`` to map the value dimensions to a suitable set of colors. This way we can, for example, plot a [mass spectrogram](https://en.wikipedia.org/wiki/Mass_spectrometry):"
+    "When supplying a second dimension to the ``Spikes`` element as a value dimension, these additional values will be mapped onto the line height. Optionally, it is also possible to map dimensions to style options. This way we can, for example, plot a [mass spectrogram](https://en.wikipedia.org/wiki/Mass_spectrometry):"
    ]
   },
   {
@@ -75,7 +75,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Spikes [color_index='Intensity'] (cmap='Reds')\n",
+    "%%opts Spikes (color='Intensity' cmap='Reds')\n",
     "hv.Spikes(np.random.rand(20, 2), 'Mass', 'Intensity')"
    ]
   },
@@ -83,7 +83,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Another possibility is to draw a number of spike trains representing the firing of neurons, of the sort that are commonly encountered in neuroscience. Here we generate 10 separate random spike trains and distribute them evenly across the space by setting their ``position``. By declaring some ``yticks``, each spike train can be labeled individually:"
+    "Another possibility is to draw a set of Spikes offset by a position, this can be useful for plotting neuron spike trains or other events. Here we generate 10 separate random spike trains and distribute them evenly across the space by setting their ``position``. By declaring some ``yticks``, each spike train can be labeled individually:"
    ]
   },
   {
diff --git a/holoviews/plotting/bokeh/annotation.py b/holoviews/plotting/bokeh/annotation.py
index d1ce62a5a1..f212151f37 100644
--- a/holoviews/plotting/bokeh/annotation.py
+++ b/holoviews/plotting/bokeh/annotation.py
@@ -110,7 +110,7 @@ def get_data(self, element, ranges, style):
             return data, mapping, style
 
         cdata, cmapping = self._get_color_data(element, ranges, style, name='text_color')
-        if dims[2] is cdim:
+        if dims[2] is cdim and cdata:
             # If color dim is same as text dim, rename color column
             data['text_color'] = cdata[tdim]
             mapping['text_color'] = dict(cmapping['text_color'], field='text_color')
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 806f594410..b11b2f2d73 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -680,7 +680,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
                 val = self.overlay_dims[v.dimension]
             else:
-                val = v.eval(element, ranges)
+                val = v.eval(element, ranges=ranges, flat=True)
 
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
@@ -703,6 +703,11 @@ def _apply_ops(self, element, source, ranges, style, group=None):
 
             if k == 'angle':
                 val = np.deg2rad(val)
+            elif k.endswith('font_size'):
+                if np.isscalar(val) and isinstance(val, int):
+                    val = str(v)+'pt'
+                elif isinstance(val, np.ndarray) and val.dtype.kind in 'ifu':
+                    val = [str(int(v))+'pt' for v in val]
             if np.isscalar(val):
                 key = val
             else:
@@ -732,6 +737,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 line_style = new_style.get(prefix+'line_'+s)
                 if line_style and validate(s, line_style):
                     new_style.pop(prefix+'line_'+s)
+
         return new_style
 
 
diff --git a/holoviews/plotting/mpl/annotation.py b/holoviews/plotting/mpl/annotation.py
index 328a26516a..bc92e8600d 100644
--- a/holoviews/plotting/mpl/annotation.py
+++ b/holoviews/plotting/mpl/annotation.py
@@ -101,11 +101,14 @@ class LabelsPlot(ColorbarPlot):
     style_opts = ['alpha', 'color', 'family', 'weight', 'size', 'visible',
                   'horizontalalignment', 'verticalalignment', 'cmap', 'rotation']
 
-    _no_op_styles = []
+    _no_op_styles = ['cmap']
 
     _plot_methods = dict(single='annotate')
 
     def get_data(self, element, ranges, style):
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
+
         xs, ys = (element.dimension_values(i) for i in range(2))
         tdim = element.get_dimension(2)
         text = [tdim.pprint_value(v) for v in element.dimension_values(tdim)]
diff --git a/holoviews/tests/plotting/bokeh/testlabels.py b/holoviews/tests/plotting/bokeh/testlabels.py
index 224dd6ee99..20cda8c140 100644
--- a/holoviews/tests/plotting/bokeh/testlabels.py
+++ b/holoviews/tests/plotting/bokeh/testlabels.py
@@ -8,7 +8,7 @@
 except:
     pass
 
-
+from ..utils import ParamLogStream
 from .testplot import TestBokehPlot, bokeh_renderer
 
 
@@ -112,7 +112,7 @@ def test_label_color_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['text_color'], np.array(['#000', '#F00', '#0F0']))
-        self.assertEqual(glyph.text_color, 'text_color')
+        self.assertEqual(glyph.text_color, {'field': 'text_color'})
 
     def test_label_linear_color_op(self):
         labels = Labels([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
@@ -135,7 +135,7 @@ def test_label_categorical_color_op(self):
         glyph = plot.handles['glyph']
         cmapper = plot.handles['color_color_mapper']
         self.assertTrue(cmapper, CategoricalColorMapper)
-        self.assertEqual(cmapper.factors, np.array(['A', 'B', 'C']))
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
         self.assertEqual(cds.data['text_color'], np.array(['A', 'B', 'C']))
         self.assertEqual(glyph.text_color, {'field': 'text_color', 'transform': cmapper})
 
@@ -146,7 +146,7 @@ def test_label_angle_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['angle'], np.array([0, 0.785398, 1.570796]))
-        self.assertEqual(glyph.angle, 'angle')
+        self.assertEqual(glyph.angle, {'field': 'angle'})
 
     def test_label_alpha_op(self):
         labels = Labels([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -155,13 +155,33 @@ def test_label_alpha_op(self):
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['text_alpha'], np.array([0, 0.2, 0.7]))
-        self.assertEqual(glyph.text_alpha, 'text_alpha')
+        self.assertEqual(glyph.text_alpha, {'field': 'text_alpha'})
 
-    def test_label_size_op(self):
+    def test_label_font_size_op_strings(self):
         labels = Labels([(0, 0, '10pt'), (0, 1, '4pt'), (0, 2, '8pt')],
                         vdims='size').options(text_font_size='size')
         plot = bokeh_renderer.get_plot(labels)
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
-        self.assertEqual(cds.data['size'], ['10pt', '4pt', '8pt'])
-        self.assertEqual(glyph.text_font_size, 'text_font_size')
+        self.assertEqual(cds.data['text_font_size'], np.array(['10pt', '4pt', '8pt']))
+        self.assertEqual(glyph.text_font_size, {'field': 'text_font_size'})
+
+    def test_label_font_size_op_ints(self):
+        labels = Labels([(0, 0, 10), (0, 1, 4), (0, 2, 8)],
+                        vdims='size').options(text_font_size='size')
+        plot = bokeh_renderer.get_plot(labels)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['text_font_size'], ['10pt', '4pt', '8pt'])
+        self.assertEqual(glyph.text_font_size, {'field': 'text_font_size'})
+
+    def test_labels_color_index_color_clash(self):
+        labels = Labels([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(text_color='color', color_index='color')        
+        with ParamLogStream() as log:
+            plot = bokeh_renderer.get_plot(labels)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'text_color' option "
+                   "and declare a color_index, ignoring the color_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 77fea3a519..3c9432f4a2 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -136,12 +136,12 @@ def sum(self, **kwargs): return op(self, np.sum, **kwargs)
     def std(self, **kwargs): return op(self, np.std, **kwargs)
     def var(self, **kwargs): return op(self, np.var, **kwargs)
 
-    def eval(self, dataset, ranges={}):
+    def eval(self, dataset, flat=False, ranges={}):
         expanded = not ((dataset.interface.gridded and self.dimension in dataset.kdims) or
                         (dataset.interface.multi and dataset.interface.isscalar(dataset, self.dimension)))
         if isinstance(dataset, Graph):
             dataset = dataset if self.dimension in dataset else dataset.nodes
-        data = dataset.dimension_values(self.dimension, expanded=expanded, flat=False)
+        data = dataset.dimension_values(self.dimension, expanded=expanded, flat=flat)
         for o in self.ops:
             other = o['other']
             if other is not None:

From 67d518a09cd5df5f8409b44de3ca9ccf812264c3 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 18:34:06 +0000
Subject: [PATCH 036/117] Finalized style mapping support for VectorField

---
 .../gallery/demos/bokeh/quiver_demo.ipynb     |  2 +-
 .../demos/matplotlib/quiver_demo.ipynb        |  2 +-
 .../elements/bokeh/VectorField.ipynb          |  6 +-
 .../elements/matplotlib/VectorField.ipynb     |  6 +-
 holoviews/plotting/bokeh/chart.py             |  6 +-
 holoviews/plotting/bokeh/element.py           |  7 +-
 holoviews/plotting/mpl/chart.py               | 27 ++++--
 .../plotting/bokeh/testvectorfieldplot.py     | 89 +++++++++++++++++++
 .../matplotlib/testvectorfieldplot.py         | 70 +++++++++++++++
 holoviews/util/ops.py                         |  7 +-
 10 files changed, 200 insertions(+), 22 deletions(-)
 create mode 100644 holoviews/tests/plotting/bokeh/testvectorfieldplot.py
 create mode 100644 holoviews/tests/plotting/matplotlib/testvectorfieldplot.py

diff --git a/examples/gallery/demos/bokeh/quiver_demo.ipynb b/examples/gallery/demos/bokeh/quiver_demo.ipynb
index 0c02b0a612..d1fd9164a8 100644
--- a/examples/gallery/demos/bokeh/quiver_demo.ipynb
+++ b/examples/gallery/demos/bokeh/quiver_demo.ipynb
@@ -77,7 +77,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [width=500 color_index=3 size_index=3 pivot='tip'] Points (color='black')\n",
+    "%%opts VectorField [width=500 size_index=3 pivot='tip'] (color='Magnitude') Points (color='black')\n",
     "hv.VectorField((xs, ys, angle, mag), label=\"pivot='tip'; scales with x view\") * hv.Points((X.flat, Y.flat))"
    ]
   }
diff --git a/examples/gallery/demos/matplotlib/quiver_demo.ipynb b/examples/gallery/demos/matplotlib/quiver_demo.ipynb
index 92dbdfc874..bce0418387 100644
--- a/examples/gallery/demos/matplotlib/quiver_demo.ipynb
+++ b/examples/gallery/demos/matplotlib/quiver_demo.ipynb
@@ -77,7 +77,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [aspect=1.5 fig_size=200 size_index=3 color_index=3] (pivot='tip') Points (color='black' s=5)\n",
+    "%%opts VectorField [aspect=1.5 fig_size=200 size_index=3] (color='Magnitude' pivot='tip') Points (color='black' s=5)\n",
     "hv.VectorField((xs, ys, angle, mag), label=\"pivot='tip'; scales with x view\") * hv.Points((X.flat, Y.flat))"
    ]
   }
diff --git a/examples/reference/elements/bokeh/VectorField.ipynb b/examples/reference/elements/bokeh/VectorField.ipynb
index 0648b2893f..fbe157b80a 100644
--- a/examples/reference/elements/bokeh/VectorField.ipynb
+++ b/examples/reference/elements/bokeh/VectorField.ipynb
@@ -61,7 +61,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3] VectorField.A [color_index=2] VectorField.M [color_index=3]\n",
+    "%%opts VectorField [size_index=3] VectorField.A (color='Angle') VectorField.M (color='Magnitude')\n",
     "hv.VectorField(vector_data, group='A') + hv.VectorField(vector_data, group='M')"
    ]
   },
@@ -78,7 +78,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [color_index=2 size_index=3 rescale_lengths=False] (scale=4)\n",
+    "%%opts VectorField [size_index=3 rescale_lengths=False] (scale=4, color='Angle')\n",
     "hv.HoloMap({phase: hv.VectorField([x, y,(vector_data[2]+phase)%np.pi*2, vector_data[3]+np.abs(phase)])\n",
     "            for phase in np.linspace(-np.pi,np.pi,5)}, kdims='Phase')"
    ]
@@ -119,7 +119,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [width=500 color_index=3 size_index=3 pivot='tip'] (cmap='fire' scale=0.8) Points (color='black' size=1)\n",
+    "%%opts VectorField [width=500 size_index=3 pivot='tip'] (cmap='fire' scale=0.8 color='Magnitude') Points (color='black' size=1)\n",
     "hv.VectorField((xs, ys, angle, mag)) * hv.Points((X.flat, Y.flat))"
    ]
   },
diff --git a/examples/reference/elements/matplotlib/VectorField.ipynb b/examples/reference/elements/matplotlib/VectorField.ipynb
index 89b0f76afd..3c74609d34 100644
--- a/examples/reference/elements/matplotlib/VectorField.ipynb
+++ b/examples/reference/elements/matplotlib/VectorField.ipynb
@@ -61,7 +61,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3] VectorField.A [color_index=2] VectorField.M [color_index=3]\n",
+    "%%opts VectorField [size_index=3] VectorField.A (color='Angle') VectorField.M (color='Magnitude')\n",
     "hv.VectorField(vector_data, group='A') + hv.VectorField(vector_data, group='M')"
    ]
   },
@@ -78,7 +78,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [color_index=2 size_index=3 rescale_lengths=False] (scale=4)\n",
+    "%%opts VectorField [size_index=3 rescale_lengths=False] (scale=4 color='Angle')\n",
     "hv.HoloMap({phase: hv.VectorField([x, y,(vector_data[2]+phase)%np.pi*2, vector_data[3]+np.abs(phase)])\n",
     "            for phase in np.linspace(-np.pi,np.pi,5)}, kdims='Phase')"
    ]
@@ -119,7 +119,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [color_index=3 size_index=3 pivot='tip'] (cmap='fire' scale=0.8) Points (color='black' s=1)\n",
+    "%%opts VectorField [size_index=3 aspect=2 fig_size=300] (pivot='tip' cmap='fire' scale=0.8 color='Magnitude') Points (color='black' s=1)\n",
     "hv.VectorField((xs, ys, angle, mag)) * hv.Points((X.flat, Y.flat))"
    ]
   },
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 449db85e83..fc5097fe11 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -242,13 +242,13 @@ def get_data(self, element, ranges, style):
             ya1s = y0s - np.sin(rads+np.pi/4)*arrow_len
             xa2s = x0s - np.cos(rads-np.pi/4)*arrow_len
             ya2s = y0s - np.sin(rads-np.pi/4)*arrow_len
-            x0s = np.concatenate([x0s, x0s, x0s])
+            x0s = np.tile(x0s, 3)
             x1s = np.concatenate([x1s, xa1s, xa2s])
-            y0s = np.concatenate([y0s, y0s, y0s])
+            y0s = np.tile(y0s, 3)
             y1s = np.concatenate([y1s, ya1s, ya2s])
             if cdim:
                 color = cdata.get(cdim.name)
-                color = np.concatenate([color, color, color])
+                color = np.tile(color, 3)
         elif cdim:
             color = cdata.get(cdim.name)
 
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index b11b2f2d73..09be58fa9a 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -25,7 +25,7 @@
 from ...core import DynamicMap, CompositeOverlay, Element, Dimension
 from ...core.options import abbreviated_exception, SkipRendering
 from ...core import util
-from ...element import Graph
+from ...element import Graph, VectorField
 from ...streams import Buffer
 from ...util.ops import op
 from ..plot import GenericElementPlot, GenericOverlayPlot
@@ -699,7 +699,10 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                                  )
                     )
                 elif source.data and len(val) != len(list(source.data.values())[0]):
-                    continue
+                    if isinstance(element, VectorField):
+                        val = np.tile(val, 3)
+                    else:
+                        continue
 
             if k == 'angle':
                 val = np.deg2rad(val)
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index dc76e1e7c5..f600f3c09f 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -21,6 +21,7 @@
 )
 from ...element import Raster, HeatMap
 from ...operation import interpolate_curve
+from ...util.ops import op
 from ..plot import PlotSelector
 from ..util import compute_sizes, get_sideplot_ranges, get_min_distance
 from .element import ElementPlot, ColorbarPlot, LegendPlot
@@ -688,11 +689,13 @@ class VectorFieldPlot(ColorbarPlot):
     style_opts = ['alpha', 'color', 'edgecolors', 'facecolors',
                   'linewidth', 'marker', 'visible', 'cmap',
                   'scale', 'headlength', 'headaxislength', 'pivot',
-                  'width','headwidth', 'norm']
-
-    _plot_methods = dict(single='quiver')
+                  'width', 'headwidth', 'norm']
 
+    _no_op_styles = ['alpha', 'marker', 'cmap', 'visible', 'norm',
+                     'pivot', 'scale', 'headlength', 'headaxislength',
+                     'headwidth']
 
+    _plot_methods = dict(single='quiver')
 
     def get_data(self, element, ranges, style):
         input_scale = style.pop('scale', 1.0)
@@ -717,22 +720,34 @@ def get_data(self, element, ranges, style):
             magnitudes = np.ones(len(xs))
 
         args = (xs, ys, magnitudes,  [0.0] * len(element))
-        if self.color_index:
+        cdim = element.get_dimension(self.color_index)
+        color = style.get('color', None)
+        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, op)):
+            self.warning("Cannot declare style mapping for 'color' option "
+                         "and declare a color_index, ignoring the color_index.")
+            cdim = None
+        if cdim:
             colors = element.dimension_values(self.color_index)
             args += (colors,)
             cdim = element.get_dimension(self.color_index)
             self._norm_kwargs(element, ranges, style, cdim)
-            style['clim'] = (style.pop('vmin'), style.pop('vmax'))
             style.pop('color', None)
 
         if 'pivot' not in style: style['pivot'] = 'mid'
         if not self.arrow_heads:
             style['headaxislength'] = 0
+
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
         style.update(dict(scale=input_scale, angles=angles,
                           units='x', scale_units='x'))
 
-        return args, style, {}
+        if 'vmin' in style:
+            style['clim'] = (style.pop('vmin'), style.pop('vmax'))
+        if 'c' in style:
+            style['array'] = style.pop('c')
 
+        return args, style, {}
 
     def update_handles(self, key, axis, element, ranges, style):
         args, style, axis_kwargs = self.get_data(element, ranges, style)
diff --git a/holoviews/tests/plotting/bokeh/testvectorfieldplot.py b/holoviews/tests/plotting/bokeh/testvectorfieldplot.py
new file mode 100644
index 0000000000..592239a391
--- /dev/null
+++ b/holoviews/tests/plotting/bokeh/testvectorfieldplot.py
@@ -0,0 +1,89 @@
+import datetime as dt
+from unittest import SkipTest
+
+import numpy as np
+
+from holoviews.core import NdOverlay
+from holoviews.core.options import Cycle
+from holoviews.core.util import pd
+from holoviews.element import VectorField
+
+from .testplot import TestBokehPlot, bokeh_renderer
+from ..utils import ParamLogStream
+
+try:
+    from bokeh.models import FactorRange, LinearColorMapper, CategoricalColorMapper
+    from bokeh.models import Scatter
+except:
+    pass
+
+
+class TestVectorFieldPlot(TestBokehPlot):
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_vectorfield_color_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, '#000'), (0, 1, 0, 1,'#F00'), (0, 2, 0, 1,'#0F0')],
+                                  vdims=['A', 'M', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(vectorfield)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0', '#000',
+                                                      '#F00', '#0F0', '#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.line_color, {'field': 'color'})
+
+    def test_vectorfield_linear_color_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 1), (0, 2, 0, 1, 2)],
+                                  vdims=['A', 'M', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(vectorfield)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 2)
+        self.assertEqual(cds.data['color'], np.array([0, 1, 2, 0, 1, 2, 0, 1, 2]))
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_vectorfield_categorical_color_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 'A'), (0, 1, 0, 1, 'B'), (0, 2, 0, 1, 'C')],
+                                  vdims=['A', 'M', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(vectorfield)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
+        self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C', 'A', 'B', 'C', 'A', 'B', 'C']))
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_vectorfield_alpha_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 0.2), (0, 2, 0, 1, 0.7)],
+                                  vdims=['A', 'M', 'alpha']).options(alpha='alpha')
+        plot = bokeh_renderer.get_plot(vectorfield)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7, 0, 0.2, 0.7, 0, 0.2, 0.7]))
+        self.assertEqual(glyph.line_alpha, {'field': 'alpha'})
+
+    def test_vectorfield_line_width_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 1), (0, 1, 0, 1, 4), (0, 2, 0, 1, 8)],
+                                  vdims=['A', 'M', 'line_width']).options(line_width='line_width')
+        plot = bokeh_renderer.get_plot(vectorfield)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_width'], np.array([1, 4, 8, 1, 4, 8, 1, 4, 8]))
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
+
+    def test_vectorfield_color_index_color_clash(self):
+        vectorfield = VectorField([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                        vdims='color').options(line_color='color', color_index='color')        
+        with ParamLogStream() as log:
+            plot = bokeh_renderer.get_plot(vectorfield)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'line_color' option "
+                   "and declare a color_index, ignoring the color_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)
diff --git a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
new file mode 100644
index 0000000000..9bb160aa6e
--- /dev/null
+++ b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
@@ -0,0 +1,70 @@
+import numpy as np
+
+from holoviews.core.overlay import NdOverlay
+from holoviews.element import VectorField
+
+from .testplot import TestMPLPlot, mpl_renderer
+from ..utils import ParamLogStream
+
+try:
+    from matplotlib import pyplot
+except:
+    pass
+
+
+class TestVectorFieldPlot(TestMPLPlot):
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_vectorfield_color_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, '#000000'), (0, 1, 0, 1,'#FF0000'), (0, 2, 0, 1,'#00FF00')],
+                                  vdims=['A', 'M', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(vectorfield)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_facecolors(), np.array([
+            [0, 0, 0, 1],
+            [1, 0, 0, 1],
+            [0, 1, 0, 1]
+        ]))
+
+    def test_vectorfield_linear_color_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 1), (0, 2, 0, 1, 2)],
+                                  vdims=['A', 'M', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(vectorfield)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(artist.get_clim(), (0, 2))
+
+    def test_vectorfield_categorical_color_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 'A'), (0, 1, 0, 1, 'B'), (0, 2, 0, 1, 'C')],
+                                  vdims=['A', 'M', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(vectorfield)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(artist.get_clim(), (0, 2))
+
+    def test_vectorfield_alpha_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 0.2), (0, 2, 0, 1, 0.7)],
+                                  vdims=['A', 'M', 'alpha']).options(alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(vectorfield)
+
+    def test_vectorfield_line_width_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 1), (0, 1, 0, 1, 4), (0, 2, 0, 1, 8)],
+                                  vdims=['A', 'M', 'line_width']).options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(vectorfield)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [1, 4, 8])
+
+    def test_vectorfield_color_index_color_clash(self):
+        vectorfield = VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 1), (0, 2, 0, 1, 2)],
+                                  vdims=['A', 'M', 'color']).options(color='color', color_index='A')       
+        with ParamLogStream() as log:
+            plot = mpl_renderer.get_plot(vectorfield)
+        log_msg = log.stream.read()
+        warning = ("%s: Cannot declare style mapping for 'color' option "
+                   "and declare a color_index, ignoring the color_index.\n"
+                   % plot.name)
+        self.assertEqual(log_msg, warning)
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 3c9432f4a2..ebf1f27f25 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -136,9 +136,10 @@ def sum(self, **kwargs): return op(self, np.sum, **kwargs)
     def std(self, **kwargs): return op(self, np.std, **kwargs)
     def var(self, **kwargs): return op(self, np.var, **kwargs)
 
-    def eval(self, dataset, flat=False, ranges={}):
-        expanded = not ((dataset.interface.gridded and self.dimension in dataset.kdims) or
-                        (dataset.interface.multi and dataset.interface.isscalar(dataset, self.dimension)))
+    def eval(self, dataset, flat=False, expanded=None, ranges={}):
+        if expanded is None:
+            expanded = not ((dataset.interface.gridded and self.dimension in dataset.kdims) or
+                            (dataset.interface.multi and dataset.interface.isscalar(dataset, self.dimension)))
         if isinstance(dataset, Graph):
             dataset = dataset if self.dimension in dataset else dataset.nodes
         data = dataset.dimension_values(self.dimension, expanded=expanded, flat=flat)

From 4f73fbda1842f41a54acd3c4b646d49aed192b5c Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 21:01:09 +0000
Subject: [PATCH 037/117] Finalized style mapping for ErrorBars

---
 holoviews/plotting/mpl/chart.py               | 23 +++++-
 .../tests/plotting/bokeh/testerrorbarplot.py  | 80 +++++++++++++++++++
 .../plotting/matplotlib/testerrorbarplot.py   | 58 ++++++++++++++
 3 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 holoviews/tests/plotting/matplotlib/testerrorbarplot.py

diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index f600f3c09f..db7831ca33 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -104,7 +104,7 @@ def update_handles(self, key, axis, element, ranges, style):
 
 
 
-class ErrorPlot(ChartPlot):
+class ErrorPlot(ColorbarPlot):
     """
     ErrorPlot plots the ErrorBar Element type and supporting
     both horizontal and vertical error bars via the 'horizontal'
@@ -129,10 +129,27 @@ def init_artists(self, ax, plot_data, plot_kwargs):
                 bottoms, tops = caps
         else:
             _, (bottoms, tops), verts = handles
-        return {'bottoms': bottoms, 'tops': tops, 'verts': verts[0]}
+        return {'bottoms': bottoms, 'tops': tops, 'verts': verts[0], 'artist': verts[0]}
 
 
     def get_data(self, element, ranges, style):
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
+        color = style.get('color')
+        if isinstance(color, np.ndarray):
+            style['ecolor'] = color
+        c = style.get('c')
+        if isinstance(c, np.ndarray):
+            with abbreviated_exception():
+                raise ValueError('Mapping a continuous or categorical '
+                                 'dimension to a color on a ErrorBarPlot '
+                                 'is not supported by the {backend} backend. '
+                                 'To map a dimension to a color supply '
+                                 'an explicit list of rgba colors.'.format(
+                                     backend=self.renderer.backend
+                                 )
+                )
+
         style['fmt'] = 'none'
         dims = element.dimensions()
         xs, ys = (element.dimension_values(i) for i in range(2))
@@ -168,6 +185,8 @@ def update_handles(self, key, axis, element, ranges, style):
             new_arrays = [np.array([[xs[i], bys[i]], [xs[i], tys[i]]])
                           for i in range(samples)]
         verts.set_paths(new_arrays)
+        if 'ecolor' in style:
+            verts.set_edgecolors(style['ecolor'])
 
         if bottoms:
             bottoms.set_xdata(bxs)
diff --git a/holoviews/tests/plotting/bokeh/testerrorbarplot.py b/holoviews/tests/plotting/bokeh/testerrorbarplot.py
index 9c72991fd6..6f31511b30 100644
--- a/holoviews/tests/plotting/bokeh/testerrorbarplot.py
+++ b/holoviews/tests/plotting/bokeh/testerrorbarplot.py
@@ -1,5 +1,11 @@
+import numpy as np
+
+from bokeh.models import CategoricalColorMapper, LinearColorMapper
+
+from holoviews.core.overlay import NdOverlay
 from holoviews.element import ErrorBars
 
+from ..utils import ParamLogStream
 from .testplot import TestBokehPlot, bokeh_renderer
 
 
@@ -58,3 +64,77 @@ def test_errorbars_padding_logy(self):
         self.assertEqual(x_range.end, 3.2)
         self.assertEqual(y_range.start, 0.41158562699652224)
         self.assertEqual(y_range.end, 4.2518491541367327)
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_errorbars_color_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, '#000'), (0, 1, 0.2, 0.4, '#F00'), (0, 2, 0.6, 1.2, '#0F0')],
+                              vdims=['y', 'perr', 'nerr', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(errorbars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.line_color, {'field': 'color'})
+
+    def test_errorbars_linear_color_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, 0), (0, 1, 0.2, 0.4, 1), (0, 2, 0.6, 1.2, 2)],
+                              vdims=['y', 'perr', 'nerr', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(errorbars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 2)
+        self.assertEqual(cds.data['color'], np.array([0, 1, 2]))
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_errorbars_categorical_color_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, 'A'), (0, 1, 0.2, 0.4, 'B'), (0, 2, 0.6, 1.2, 'C')],
+                              vdims=['y', 'perr', 'nerr', 'color']).options(color='color')
+        plot = bokeh_renderer.get_plot(errorbars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
+        self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+
+    def test_errorbars_line_color_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, '#000'), (0, 1, 0.2, 0.4, '#F00'), (0, 2, 0.6, 1.2, '#0F0')],
+                              vdims=['y', 'perr', 'nerr', 'color']).options(line_color='color')
+        plot = bokeh_renderer.get_plot(errorbars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_color'], np.array(['#000', '#F00', '#0F0']))
+        self.assertEqual(glyph.line_color, {'field': 'line_color'})
+
+    def test_errorbars_alpha_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, 0), (0, 1, 0.2, 0.4, 0.2), (0, 2, 0.6, 1.2, 0.7)],
+                              vdims=['y', 'perr', 'nerr', 'alpha']).options(alpha='alpha')
+        plot = bokeh_renderer.get_plot(errorbars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.line_alpha, {'field': 'alpha'})
+
+    def test_errorbars_line_alpha_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, 0), (0, 1, 0.2, 0.4, 0.2), (0, 2, 0.6, 1.2, 0.7)],
+                              vdims=['y', 'perr', 'nerr', 'alpha']).options(line_alpha='alpha')
+        plot = bokeh_renderer.get_plot(errorbars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_alpha'], np.array([0, 0.2, 0.7]))
+        self.assertEqual(glyph.line_alpha, {'field': 'line_alpha'})
+
+    def test_errorbars_line_width_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, 1), (0, 1, 0.2, 0.4, 4), (0, 2, 0.6, 1.2, 8)],
+                              vdims=['y', 'perr', 'nerr', 'line_width']).options(line_width='line_width')
+        plot = bokeh_renderer.get_plot(errorbars)
+        cds = plot.handles['cds']
+        glyph = plot.handles['glyph']
+        self.assertEqual(cds.data['line_width'], np.array([1, 4, 8]))
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
diff --git a/holoviews/tests/plotting/matplotlib/testerrorbarplot.py b/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
new file mode 100644
index 0000000000..fcd31b780c
--- /dev/null
+++ b/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
@@ -0,0 +1,58 @@
+import numpy as np
+
+from holoviews.element import ErrorBars
+
+from ..utils import ParamLogStream
+from .testplot import TestMPLPlot, mpl_renderer
+
+
+class TestErrorBarPlot(TestMPLPlot):
+
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_errorbars_color_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, '#000000'), (0, 1, 0.2, 0.4, '#FF0000'), (0, 2, 0.6, 1.2, '#00FF00')],
+                              vdims=['y', 'perr', 'nerr', 'color']).options(color='color')
+        plot = mpl_renderer.get_plot(errorbars)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_edgecolors(),
+                         np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
+
+    def test_errorbars_linear_color_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, 0), (0, 1, 0.2, 0.4, 1), (0, 2, 0.6, 1.2, 2)],
+                              vdims=['y', 'perr', 'nerr', 'color']).options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(errorbars)
+
+    def test_errorbars_categorical_color_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, 'A'), (0, 1, 0.2, 0.4, 'B'), (0, 2, 0.6, 1.2, 'C')],
+                              vdims=['y', 'perr', 'nerr', 'color']).options(color='color')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(errorbars)
+
+    def test_errorbars_line_color_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, '#000000'), (0, 1, 0.2, 0.4, '#FF0000'), (0, 2, 0.6, 1.2, '#00FF00')],
+                              vdims=['y', 'perr', 'nerr', 'color']).options(ecolor='color')
+        plot = mpl_renderer.get_plot(errorbars)
+        artist = plot.handles['artist']
+        children = artist.get_children()
+        for c, w in zip(children, ['#000000', '#FF0000', '#00FF00']):
+            self.assertEqual(c.get_edgecolor(), tuple(c/255. for c in hex2rgb(w))+(1,))
+
+    def test_errorbars_alpha_op(self):
+        errorbars = ErrorBars([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
+                              vdims=['y', 'alpha']).options(alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(errorbars)
+
+    def test_errorbars_line_width_op(self):
+        errorbars = ErrorBars([(0, 0, 0.1, 0.2, 1), (0, 1, 0.2, 0.4, 4), (0, 2, 0.6, 1.2, 8)],
+                              vdims=['y', 'perr', 'nerr', 'line_width']).options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(errorbars)
+        artist = plot.handles['artist']
+        children = artist.get_children()
+        for c, w in zip(children, np.array([1, 4, 8])):
+            self.assertEqual(c.get_linewidth(), w)

From b36925162ca9d5f8db082ea7390dea9f3f1e9118 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 11 Nov 2018 21:03:13 +0000
Subject: [PATCH 038/117] Finalized CurvePlot and AreaPlot style mapping

---
 holoviews/plotting/mpl/chart.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index db7831ca33..d447e51cf2 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -75,6 +75,9 @@ class CurvePlot(ChartPlot):
     _plot_methods = dict(single='plot')
 
     def get_data(self, element, ranges, style):
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
+
         if 'steps' in self.interpolation:
             element = interpolate_curve(element, interpolation=self.interpolation)
         xs = element.dimension_values(0)
@@ -212,6 +215,9 @@ class AreaPlot(ChartPlot):
     _plot_methods = dict(single='fill_between')
 
     def get_data(self, element, ranges, style):
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
+
         xs = element.dimension_values(0)
         ys = [element.dimension_values(vdim) for vdim in element.vdims]
         return tuple([xs]+ys), style, {}

From 0f8a81839d3ef1104533abb2ea60c3af321e3c2d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 12 Nov 2018 01:04:58 +0000
Subject: [PATCH 039/117] Various updates to examples

---
 .../gallery/demos/bokeh/autompg_histogram.ipynb    |  2 +-
 examples/gallery/demos/bokeh/autompg_violins.ipynb |  2 +-
 examples/gallery/demos/bokeh/boxplot_chart.ipynb   |  2 +-
 .../gallery/demos/bokeh/choropleth_data_link.ipynb |  4 ++--
 examples/gallery/demos/bokeh/dragon_curve.ipynb    | 14 ++------------
 .../gallery/demos/bokeh/dropdown_economic.ipynb    |  2 +-
 .../demos/matplotlib/dropdown_economic.ipynb       |  2 +-
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/examples/gallery/demos/bokeh/autompg_histogram.ipynb b/examples/gallery/demos/bokeh/autompg_histogram.ipynb
index 6c209a2082..b9817400fe 100644
--- a/examples/gallery/demos/bokeh/autompg_histogram.ipynb
+++ b/examples/gallery/demos/bokeh/autompg_histogram.ipynb
@@ -53,7 +53,7 @@
    "outputs": [],
    "source": [
     "%%opts Histogram (alpha=0.9) [width=600]\n",
-    "autompg_ds.hist(dimension='mpg', groupby='cyl', adjoin=False)"
+    "autompg_ds.hist(dimension='mpg', groupby='cyl', bin_range=(9, 46), bins=40, adjoin=False)"
    ]
   }
  ],
diff --git a/examples/gallery/demos/bokeh/autompg_violins.ipynb b/examples/gallery/demos/bokeh/autompg_violins.ipynb
index 04fb690400..2a7f1735a5 100644
--- a/examples/gallery/demos/bokeh/autompg_violins.ipynb
+++ b/examples/gallery/demos/bokeh/autompg_violins.ipynb
@@ -50,7 +50,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "violin.options(height=500, width=900)"
+    "violin.options(height=500, width=900, violin_fill_color=('Year', str), cmap='Set1')"
    ]
   }
  ],
diff --git a/examples/gallery/demos/bokeh/boxplot_chart.ipynb b/examples/gallery/demos/bokeh/boxplot_chart.ipynb
index c89dc74e7e..e75efb0506 100644
--- a/examples/gallery/demos/bokeh/boxplot_chart.ipynb
+++ b/examples/gallery/demos/bokeh/boxplot_chart.ipynb
@@ -53,7 +53,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "boxwhisker.options(show_legend=False, width=400)"
+    "boxwhisker.options(show_legend=False, width=600, box_fill_color=('origin', str), cmap='Set1')"
    ]
   }
  ],
diff --git a/examples/gallery/demos/bokeh/choropleth_data_link.ipynb b/examples/gallery/demos/bokeh/choropleth_data_link.ipynb
index d296861299..5d67e4ff1a 100644
--- a/examples/gallery/demos/bokeh/choropleth_data_link.ipynb
+++ b/examples/gallery/demos/bokeh/choropleth_data_link.ipynb
@@ -70,8 +70,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "choropleth.options(width=500, height=500,  tools=['hover', 'tap'], xaxis=None, yaxis=None, color_index='Unemployment', clone=False)\n",
-    "table.options(height=428, clone=False)\n",
+    "choropleth = choropleth.options(width=500, height=500,  tools=['hover', 'tap'], xaxis=None, yaxis=None, color_index='Unemployment')\n",
+    "table = table.options(height=428)\n",
     "\n",
     "# Link the choropleth and the table\n",
     "DataLink(choropleth, table)\n",
diff --git a/examples/gallery/demos/bokeh/dragon_curve.ipynb b/examples/gallery/demos/bokeh/dragon_curve.ipynb
index 63a341fc98..caec9b74af 100644
--- a/examples/gallery/demos/bokeh/dragon_curve.ipynb
+++ b/examples/gallery/demos/bokeh/dragon_curve.ipynb
@@ -107,21 +107,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Path {+framewise} [xaxis=None yaxis=None title_format=''] (color='black' line_width=1)\n",
+    "%%opts Path {+framewise} [xaxis=None yaxis=None title_format='' padding=0.1] (color='black' line_width=1)\n",
     "\n",
-    "def pad_extents(path):\n",
-    "    \"Add 5% padding around the path\"\n",
-    "    minx, maxx = path.range('x')\n",
-    "    miny, maxy = path.range('y')\n",
-    "    xpadding = ((maxx-minx) * 0.1)/2\n",
-    "    ypadding = ((maxy-miny) * 0.1)/2\n",
-    "    path.extents = (minx-xpadding, miny-ypadding, maxx+xpadding, maxy+ypadding)\n",
-    "    return path\n",
-    "    \n",
     "hmap = hv.HoloMap(kdims='Iteration')\n",
     "for i in range(7,17):\n",
-    "    path = DragonCurve(-200, 0, i).path\n",
-    "    hmap[i] = pad_extents(path)\n",
+    "    hmap[i] = DragonCurve(-200, 0, i).path\n",
     "hmap"
    ]
   }
diff --git a/examples/gallery/demos/bokeh/dropdown_economic.ipynb b/examples/gallery/demos/bokeh/dropdown_economic.ipynb
index fb1347f812..91a8d8788f 100644
--- a/examples/gallery/demos/bokeh/dropdown_economic.ipynb
+++ b/examples/gallery/demos/bokeh/dropdown_economic.ipynb
@@ -54,7 +54,7 @@
    "outputs": [],
    "source": [
     "%%opts Overlay [width=700 height=400 show_frame=False]\n",
-    "%%opts Curve (color='k') Scatter [color_index=2 size_index=2 scaling_factor=1.4] (cmap='Blues' line_color='k')\n",
+    "%%opts Curve (color='k') Scatter (color='Unemployment' size=op('Unemployment')*1.5 cmap='Blues' line_color='k')\n",
     "%%opts VLine (color='k' line_width=1)\n",
     "%%opts Text (text_font_size='13px')\n",
     "gdp_curves = macro.to.curve('Year', 'GDP Growth')\n",
diff --git a/examples/gallery/demos/matplotlib/dropdown_economic.ipynb b/examples/gallery/demos/matplotlib/dropdown_economic.ipynb
index 9ce2a8b483..c93bb0944f 100644
--- a/examples/gallery/demos/matplotlib/dropdown_economic.ipynb
+++ b/examples/gallery/demos/matplotlib/dropdown_economic.ipynb
@@ -53,7 +53,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Curve (color='k') Scatter [color_index=2 size_index=2 scaling_factor=1.4] (cmap='Blues' edgecolors='k')\n",
+    "%%opts Curve (color='k') Scatter (color='Unemployment' s=op('Unemployment')*10 cmap='Blues' edgecolors='k')\n",
     "%%opts Overlay [show_frame=True aspect=2, fig_size=250, show_frame=False]\n",
     "gdp_curves = macro.to.curve('Year', 'GDP Growth')\n",
     "gdp_unem_scatter = macro.to.scatter('Year', ['GDP Growth', 'Unemployment'])\n",

From 81602867bfce6bb08962e0fd973163c5bad88532 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 12 Nov 2018 01:07:07 +0000
Subject: [PATCH 040/117] Resolve tuple op specs

---
 holoviews/plotting/bokeh/element.py | 6 ++++++
 holoviews/plotting/mpl/element.py   | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 09be58fa9a..ab8a73f06e 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -665,6 +665,12 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                     v = op(v)
                 elif any(d==v for d in self.overlay_dims):
                     v = op([d for d in self.overlay_dims if d==v][0])
+            elif isinstance(v, tuple) and v and isinstance(v[0], (util.basestring, tuple, op)):
+                try:
+                    v = op.resolve_spec(v)
+                except:
+                    continue
+
             if not isinstance(v, op) or (group is not None and not k.startswith(group)):
                 continue
             dname = v.dimension.name
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index b3f5b9fedf..e0182c2ae0 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -523,6 +523,11 @@ def _apply_ops(self, element, ranges, style):
                     v = op(v)
                 elif any(d==v for d in self.overlay_dims):
                     v = op([d for d in self.overlay_dims if d==v][0])
+            elif isinstance(v, tuple) and v and isinstance(v[0], (util.basestring, tuple, op)):
+                try:
+                    v = op.resolve_spec(v)
+                except:
+                    continue
 
             if not isinstance(v, op):
                 continue

From 98218c8e134889995dcb52a52e2a38b3d66b2e2b Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 12 Nov 2018 01:07:25 +0000
Subject: [PATCH 041/117] Fix for CompositeElementPlot

---
 holoviews/plotting/bokeh/element.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index ab8a73f06e..c0a60de2d8 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -1074,8 +1074,9 @@ def _init_glyphs(self, plot, element, ranges, source, data=None, mapping=None, s
                 source = self._init_datasource(ds_data)
                 source_cache[id(ds_data)] = source
             self.handles[key+'_source'] = source
+            group_style = dict(style)
             style_group = self._style_groups.get('_'.join(key.split('_')[:-1]))
-            properties = self._glyph_properties(plot, element, source, ranges, style, style_group)
+            properties = self._glyph_properties(plot, element, source, ranges, group_style, style_group)
             properties = self._process_properties(key, properties, mapping.get(key, {}))
 
             with abbreviated_exception():
@@ -1128,10 +1129,10 @@ def _update_glyphs(self, element, ranges):
             gdata = data.get(key)
             source = self.handles[key+'_source']
             glyph = self.handles.get(key+'_glyph')
-
             if glyph:
+                group_style = dict(style)
                 style_group = self._style_groups.get('_'.join(key.split('_')[:-1]))
-                properties = self._glyph_properties(plot, element, source, ranges, style, style_group)
+                properties = self._glyph_properties(plot, element, source, ranges, group_style, style_group)
                 properties = self._process_properties(key, properties, mapping[key])
                 renderer = self.handles.get(key+'_glyph_renderer')
                 with abbreviated_exception():

From 4a6fa7a2403221124b2d6846e65c128e81665281 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 12 Nov 2018 01:07:45 +0000
Subject: [PATCH 042/117] Fixed bug in DataLinkCallback

---
 holoviews/plotting/bokeh/callbacks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/holoviews/plotting/bokeh/callbacks.py b/holoviews/plotting/bokeh/callbacks.py
index e32bbbd9a5..0156877114 100644
--- a/holoviews/plotting/bokeh/callbacks.py
+++ b/holoviews/plotting/bokeh/callbacks.py
@@ -1237,10 +1237,10 @@ def __init__(self, root_model, link, source_plot, target_plot):
         for k, v in tgt_cds.data.items():
             if k not in src_cds.data:
                 continue
-            col = src_cds.data[k]
+            col = np.asarray(src_cds.data[k])
             if not ((isscalar(v) and v == col) or
                     (v.dtype.kind not in 'iufc' and (v==col).all()) or
-                    np.allclose(v, src_cds.data[k])):
+                    np.allclose(v, np.asarray(src_cds.data[k]))):
                 raise ValueError('DataLink can only be applied if overlapping '
                                  'dimension values are equal, %s column on source '
                                  'does not match target' % k)

From 1d71f7965ab038e81bb74bd848e7905caf074e83 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 12 Nov 2018 01:08:30 +0000
Subject: [PATCH 043/117] Fixed BoxWhiskerPlot bug

---
 holoviews/plotting/bokeh/stats.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index 37674a5f6e..1a96f0f946 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -110,12 +110,14 @@ def _get_factors(self, element):
         Get factors for categorical axes.
         """
         if not element.kdims:
-            xfactors, yfactors =  [element.label], []
+            xfactors, yfactors = [element.label], []
         else:
             factors = [tuple(d.pprint_value(v) for d, v in zip(element.kdims, key))
                        for key in element.groupby(element.kdims).data.keys()]
             factors = [f[0] if len(f) == 1 else f for f in factors]
             xfactors, yfactors = factors, []
+            if element.ndims > 1:
+                xfactors = sorted(xfactors)
         return (yfactors, xfactors) if self.invert_axes else (xfactors, yfactors)
 
     def _postprocess_hover(self, renderer, source):
@@ -390,9 +392,7 @@ def get_data(self, element, ranges, style):
             scatter_map = {'x': 'x', 'y': 'y'}
             bar_glyph = 'vbar'
 
-        elstyle = self.lookup_options(element, 'style')
         kwargs = {'bandwidth': self.bandwidth, 'cut': self.cut}
-
         mapping, data = {}, {}
         patches_data, seg_data, bar_data, scatter_data = (defaultdict(list) for i in range(4))
         for i, (key, g) in enumerate(groups.items()):

From 232ac40f50aad2769420cd97fdb28f8e5d3e1b9c Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Thu, 15 Nov 2018 13:10:31 +0000
Subject: [PATCH 044/117] Added common function to ops

---
 holoviews/util/ops.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index ebf1f27f25..aa00c6c714 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -129,12 +129,29 @@ def __array_ufunc__(self, *args, **kwargs):
         kwargs = {k: v for k, v in kwargs.items() if v is not None}
         return op(self, ufunc, **kwargs)
 
-    def max(self, **kwargs): return op(self, np.max, **kwargs)
+    def max(self, **kwargs):  return op(self, np.max, **kwargs)
     def mean(self, **kwargs): return op(self, np.mean, **kwargs)
-    def min(self, **kwargs): return op(self, np.min, **kwargs)
-    def sum(self, **kwargs): return op(self, np.sum, **kwargs)
-    def std(self, **kwargs): return op(self, np.std, **kwargs)
-    def var(self, **kwargs): return op(self, np.var, **kwargs)
+    def min(self, **kwargs):  return op(self, np.min, **kwargs)
+    def sum(self, **kwargs):  return op(self, np.sum, **kwargs)
+    def std(self, **kwargs):  return op(self, np.std, **kwargs)
+    def var(self, **kwargs):  return op(self, np.var, **kwargs)
+    def astype(self, dtype):  return op(self, np.asarray, dtype=dtype)
+
+    ## Custom functions
+
+    def norm(self):
+        """
+        Normalizes the data into the given range
+        """
+        return op(self, norm_fn)
+
+    def cat(self, categories, empty=None):
+        cat_op = op(self, cat_fn, categories=categories, empty=empty)
+        return cat_op
+
+    def bin(self, bins, labels=None):
+        bin_op = op(self, bin_fn, categories=categories, empty=empty)
+        return bin_op
 
     def eval(self, dataset, flat=False, expanded=None, ranges={}):
         if expanded is None:

From 87411d947aae6b515674a2c4fd106379760d30a2 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 13:17:38 +0000
Subject: [PATCH 045/117] Various updates for Graph and stats elements

---
 holoviews/plotting/bokeh/chart.py             |   6 +-
 holoviews/plotting/bokeh/element.py           |  16 ++-
 holoviews/plotting/bokeh/graphs.py            |  12 +-
 holoviews/plotting/bokeh/hex_tiles.py         |   4 +-
 holoviews/plotting/bokeh/stats.py             |   5 +-
 holoviews/plotting/mpl/element.py             |  25 +++-
 holoviews/plotting/mpl/graphs.py              |  15 +-
 holoviews/plotting/mpl/hex_tiles.py           |   2 +
 holoviews/plotting/mpl/path.py                |   7 +
 holoviews/plotting/mpl/stats.py               |  14 +-
 holoviews/tests/plotting/bokeh/testbarplot.py |   2 +-
 .../tests/plotting/bokeh/testgraphplot.py     | 130 +++++++++++++++++-
 holoviews/tests/plotting/bokeh/testlabels.py  |   4 +-
 .../tests/plotting/bokeh/testpointplot.py     |   2 +-
 .../tests/plotting/bokeh/testviolinplot.py    |  12 +-
 .../plotting/matplotlib/testgraphplot.py      |  83 ++++++++++-
 16 files changed, 295 insertions(+), 44 deletions(-)

diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index fc5097fe11..399f63cd25 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -783,12 +783,12 @@ def _get_factors(self, element):
         if gdim and not sdim:
             gvals = element.dimension_values(gdim, False)
             gvals = [g if gvals.dtype.kind in 'SU' else gdim.pprint_value(g) for g in gvals]
-            coords = ([(x, g) for x in xvals for g in gvals], [])
-        else:
-            coords = (xvals, [])
+            xvals = sorted([(x, g) for x in xvals for g in gvals])
+        coords = xvals, []
         if self.invert_axes: coords = coords[::-1]
         return coords
 
+
     def _get_axis_labels(self, *args, **kwargs):
         """
         Override axis mapping by setting the first key and value
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index c0a60de2d8..3c590a9a03 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -661,7 +661,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
         prefix = group+'_' if group else ''
         for k, v in dict(style).items():
             if isinstance(v, util.basestring):
-                if v in element:
+                if v in element or (isinstance(element, Graph) and v in element.nodes):
                     v = op(v)
                 elif any(d==v for d in self.overlay_dims):
                     v = op([d for d in self.overlay_dims if d==v][0])
@@ -674,6 +674,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             if not isinstance(v, op) or (group is not None and not k.startswith(group)):
                 continue
             dname = v.dimension.name
+
             if k == 'marker' and dname in markers:
                 continue
             elif (dname not in element and v.dimension not in self.overlay_dims and
@@ -731,7 +732,8 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 if val.dtype.kind not in 'if':
                     kwargs['factors'] = np.unique(val)
                 cmapper = self._get_colormapper(v.dimension, element, ranges,
-                                                style, name=dname+'_color_mapper', **kwargs)
+                                                style, name=k+'_color_mapper',
+                                                group=group, **kwargs)
                 key = {'field': k, 'transform': cmapper}
             new_style[k] = key
 
@@ -742,10 +744,10 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                     continue
                 fill_style = new_style.get(prefix+'fill_'+s)
                 if fill_style and validate(s, fill_style):
-                    new_style.pop(prefix+'fill_'+s)
+                    new_style[prefix+'fill_'+s] = value
                 line_style = new_style.get(prefix+'line_'+s)
                 if line_style and validate(s, line_style):
-                    new_style.pop(prefix+'line_'+s)
+                    new_style[prefix+'line_'+s] = value
 
         return new_style
 
@@ -1061,6 +1063,7 @@ def _init_glyphs(self, plot, element, ranges, source, data=None, mapping=None, s
             style = self.style[self.cyclic_index]
             data, mapping, style = self.get_data(element, ranges, style)
 
+
         keys = glyph_order(dict(data, **mapping), self._draw_order)
 
         source_cache = {}
@@ -1246,7 +1249,7 @@ def _draw_colorbar(self, plot, color_mapper):
 
 
     def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=None,
-                         name='color_mapper'):
+                         group=None, name='color_mapper'):
         # The initial colormapper instance is cached the first time
         # and then only updated
         if dim is None and colors is None:
@@ -1277,7 +1280,8 @@ def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=Non
         else:
             low, high = None, None
 
-        cmap = colors or style.pop('cmap', 'viridis')
+        prefix = '' if group is None else group+'_'
+        cmap = colors or style.get(prefix+'cmap', style.pop('cmap', 'viridis'))
         nan_colors = {k: rgba_tuple(v) for k, v in self.clipping_colors.items()}
         if isinstance(cmap, dict):
             if factors is None:
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index d6093b0a51..f054eaf74b 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -79,6 +79,7 @@ def _hover_opts(self, element):
     def get_extents(self, element, ranges, range_type='combined'):
         return super(GraphPlot, self).get_extents(element.nodes, ranges, range_type)
 
+
     def _get_axis_labels(self, *args, **kwargs):
         """
         Override axis labels to group all key dimensions together.
@@ -127,7 +128,7 @@ def _get_edge_colors(self, element, ranges, edge_data, edge_mapping, style):
             edge_data[field] = cvals
         edge_style = dict(style, cmap=cmap)
         mapper = self._get_colormapper(cdim, element, ranges, edge_style,
-                                       factors, colors, 'edge_colormapper')
+                                       factors, colors, 'edge', 'edge_colormapper')
         transform = {'field': field, 'transform': mapper}
         color_type = 'fill_color' if self.filled else 'line_color'
         edge_mapping['edge_'+color_type] = transform
@@ -248,9 +249,14 @@ def _init_glyphs(self, plot, element, ranges, source):
                 continue
             source = self._init_datasource(data.pop(key, {}))
             self.handles[key+'_source'] = source
+            group_style = dict(style)
             style_group = self._style_groups.get('_'.join(key.split('_')[:-1]))
-            glyph_props = self._glyph_properties(plot, element, source, ranges, style, style_group)
-            properties.update(glyph_props)
+            others = [sg for sg in self._style_groups.values() if sg != style_group]
+            glyph_props = self._glyph_properties(plot, element, source, ranges, group_style, style_group)
+            for k, p in glyph_props.items():
+                if any(k.startswith(o) for o in others):
+                    continue
+                properties[k] = p
             mappings.update(mapping.pop(key, {}))
         properties = {p: v for p, v in properties.items() if p not in ('legend', 'source')}
         properties.update(mappings)
diff --git a/holoviews/plotting/bokeh/hex_tiles.py b/holoviews/plotting/bokeh/hex_tiles.py
index 7b90ce9223..51c1a08f3e 100644
--- a/holoviews/plotting/bokeh/hex_tiles.py
+++ b/holoviews/plotting/bokeh/hex_tiles.py
@@ -132,7 +132,9 @@ class HexTilesPlot(ColorbarPlot):
 
     _plot_methods = dict(single='hex_tile')
 
-    style_opts = ['cmap', 'color'] + line_properties + fill_properties
+    style_opts = ['cmap', 'color', 'scale'] + line_properties + fill_properties
+
+    _no_op_styles = ['cmap', 'line_dash']
 
     def _hover_opts(self, element):
         if self.aggregator is np.size:
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index 1a96f0f946..3d8f038f1c 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -97,7 +97,10 @@ def _get_axis_labels(self, *args, **kwargs):
         return xlabel, ylabel, None
 
     def _glyph_properties(self, plot, element, source, ranges, style, group=None):
-        element = element.aggregate(function=np.mean)
+        if element.ndims > 0:
+            element = element.aggregate(function=np.mean)
+        else:
+            element = element.clone([(element.aggregate(function=np.mean),)])
         with abbreviated_exception():
             new_style = self._apply_ops(element, source, ranges, style, group)
         properties = dict(new_style, source=source)
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index e0182c2ae0..1839bcdb4b 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -519,7 +519,7 @@ def _apply_ops(self, element, ranges, style):
         new_style = dict(style)
         for k, v in style.items():
             if isinstance(v, util.basestring):
-                if v in element:
+                if v in element or (isinstance(element, Graph) and v in element.nodes):
                     v = op(v)
                 elif any(d==v for d in self.overlay_dims):
                     v = op([d for d in self.overlay_dims if d==v][0])
@@ -529,11 +529,13 @@ def _apply_ops(self, element, ranges, style):
                 except:
                     continue
 
+
             if not isinstance(v, op):
                 continue
 
             dname = v.dimension.name
-            if dname not in element and v.dimension not in self.overlay_dims:
+            if (dname not in element and v.dimension not in self.overlay_dims and
+                not (isinstance(element, Graph) and v.dimension in element.nodes)):
                 new_style.pop(k)
                 self.warning('Specified %s op %r could not be applied, %s dimension '
                              'could not be found' % (k, v, v.dimension))
@@ -560,12 +562,16 @@ def _apply_ops(self, element, ranges, style):
                                  )
                 )
 
-            if k in ('c', 'color') and isinstance(val, np.ndarray) and all(not is_color(c) for c in val):
+            style_groups = getattr(self, '_style_groups', [])
+            groups = [sg for sg in style_groups if k.startswith(sg)]
+            group = groups[0] if groups else None
+            prefix = '' if group is None else group+'_'
+            if k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray) and all(not is_color(c) for c in val):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v.dimension, val)
                 if val.dtype.kind in 'OSUM':
                     val = categorize_colors(val)
-                k = 'c'
+                k = prefix+'c'
 
             new_style[k] = val
 
@@ -573,11 +579,16 @@ def _apply_ops(self, element, ranges, style):
             # If mapped to color/alpha override static fill/line style
             if k == 'c':
                 new_style.pop('color', None)
-            if k in ('c', 'color') and isinstance(val, np.ndarray):
-                fill_style = new_style.get('facecolor')
+
+            style_groups = getattr(self, '_style_groups', [])
+            groups = [sg for sg in style_groups if k.startswith(sg)]
+            group = groups[0] if groups else None
+            prefix = '' if group is None else group+'_'
+            if k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray):
+                fill_style = new_style.get(prefix+'facecolor')
                 if fill_style and is_color(fill_style):
                     new_style.pop('facecolor')
-                line_style = new_style.get('edgecolor')
+                line_style = new_style.get(prefix+'edgecolor')
                 if line_style and is_color(line_style):
                     new_style.pop('edgecolor')
             elif k == 'facecolors' and not isinstance(new_style.get('color', new_style.get('c')), np.ndarray):
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 3af764db21..707bb2777f 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -4,8 +4,8 @@
 from matplotlib.collections import LineCollection, PolyCollection
 
 from ...core.data import Dataset
-from ...core.options import Cycle
-from ...core.util import basestring, unique_array, search_indices, max_range
+from ...core.options import Cycle, abbreviated_exception
+from ...core.util import basestring, unique_array, search_indices, max_range, is_number
 from ..util import process_cmap
 from .element import ColorbarPlot
 
@@ -55,7 +55,7 @@ def _compute_styles(self, element, ranges, style):
                 style.pop('node_color', None)
             if 'c' in style:
                 self._norm_kwargs(element.nodes, ranges, style, cdim)
-        elif color:
+        elif color and 'node_color' in style:
             style['c'] = style.pop('node_color')
         style['node_edgecolors'] = style.pop('node_edgecolors', 'none')
 
@@ -97,6 +97,9 @@ def _compute_styles(self, element, ranges, style):
 
 
     def get_data(self, element, ranges, style):
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
+
         xidx, yidx = (1, 0) if self.invert_axes else (0, 1)
         pxs, pys = (element.nodes.dimension_values(i) for i in range(2))
         dims = element.nodes.dimensions()
@@ -120,6 +123,8 @@ def init_artists(self, ax, plot_args, plot_kwargs):
                      for k, v in plot_kwargs.items()
                      if not any(k.startswith(p) for p in groups)
                      and k not in color_opts}
+        if 'c' in edge_opts:
+            edge_opts['array'] = edge_opts.pop('c')
         paths = plot_args['edges']
         if self.filled:
             coll = PolyCollection
@@ -127,7 +132,6 @@ def init_artists(self, ax, plot_args, plot_kwargs):
                 edge_opts['facecolors'] = edge_opts.pop('colors')
         else:
             coll = LineCollection
-        print(edge_opts)
         edges = coll(paths, **edge_opts)
         ax.add_collection(edges)
 
@@ -137,7 +141,8 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         node_opts = {k[5:] if 'node_' in k else k: v
                      for k, v in plot_kwargs.items()
                      if not any(k.startswith(p) for p in groups)}
-        if 'size' in node_opts: node_opts['s'] = node_opts.pop('size')**2
+        if is_number(node_opts.get('size')):
+            node_opts['s'] = node_opts.pop('size')**2
         nodes = ax.scatter(xs, ys, **node_opts)
 
         return {'nodes': nodes, 'edges': edges}
diff --git a/holoviews/plotting/mpl/hex_tiles.py b/holoviews/plotting/mpl/hex_tiles.py
index 80f70b769e..043b9eb595 100644
--- a/holoviews/plotting/mpl/hex_tiles.py
+++ b/holoviews/plotting/mpl/hex_tiles.py
@@ -29,6 +29,8 @@ class HexTilesPlot(ColorbarPlot):
 
     style_opts = ['edgecolors', 'alpha', 'linewidths', 'marginals']
 
+    _no_op_styles = style_opts
+
     _plot_methods = dict(single='hexbin')
 
     def get_data(self, element, ranges, style):
diff --git a/holoviews/plotting/mpl/path.py b/holoviews/plotting/mpl/path.py
index beabefba3d..cd4ebcc317 100644
--- a/holoviews/plotting/mpl/path.py
+++ b/holoviews/plotting/mpl/path.py
@@ -3,6 +3,7 @@
 from matplotlib.collections import PatchCollection, LineCollection
 
 from ...core import util
+from ...core.options import abbreviated_exception
 from ...element import Polygons
 from .element import ColorbarPlot
 from .util import polygons_to_path_patches
@@ -28,6 +29,9 @@ def _finalize_artist(self, element):
             self._draw_colorbar(element.get_dimension(self.color_index))
 
     def get_data(self, element, ranges, style):
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
+
         cdim = element.get_dimension(self.color_index)
         if cdim: cidx = element.get_dimension_index(cdim)
         if not cdim:
@@ -79,6 +83,9 @@ def _finalize_artist(self, element):
             self._draw_colorbar(cdim)
 
     def get_data(self, element, ranges, style):
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
+
         if None not in [element.level, self.color_index]:
             cdim = element.vdims[0]
         else:
diff --git a/holoviews/plotting/mpl/stats.py b/holoviews/plotting/mpl/stats.py
index 449621bc2f..699e540462 100644
--- a/holoviews/plotting/mpl/stats.py
+++ b/holoviews/plotting/mpl/stats.py
@@ -1,4 +1,6 @@
 import param
+import numpy as np
+
 
 from ...core.ndmapping import sorted_context
 from .chart import AreaPlot, ChartPlot
@@ -56,8 +58,7 @@ class BoxPlot(ChartPlot):
                   'whiskerprops', 'capprops', 'flierprops',
                   'medianprops', 'meanprops', 'meanline']
 
-    _no_op_styles = [s for s in style_opts
-                     if s not in ('conf_intervals', 'widths')] 
+    _no_op_styles = style_opts
 
     _plot_methods = dict(single='boxplot')
 
@@ -154,7 +155,7 @@ class ViolinPlot(BoxPlot):
                   'widths', 'stats_color', 'box_color', 'alpha', 'edgecolors']
 
     _no_op_styles = [s for s in style_opts
-                     if s not in ('facecolors', 'edgecolors', 'widths')] 
+                     if s not in ('facecolors', 'edgecolors', 'widths')]
 
     def init_artists(self, ax, plot_args, plot_kwargs):
         box_color = plot_kwargs.pop('box_color', 'black')
@@ -204,6 +205,13 @@ def get_data(self, element, ranges, style):
         style['positions'] = list(range(len(data)))
         style['labels'] = labels
         style['facecolors'] = colors
+
+        if element.ndims > 0:
+            element = element.aggregate(function=np.mean)
+        else:
+            element = element.clone([(element.aggregate(function=np.mean),)])
+        new_style = self._apply_ops(element, ranges, style)
+
         style = {k: v for k, v in style.items()
                  if k not in ['zorder', 'label']}
         style['vert'] = not self.invert_axes
diff --git a/holoviews/tests/plotting/bokeh/testbarplot.py b/holoviews/tests/plotting/bokeh/testbarplot.py
index d3ba4d35c9..b7bad415f1 100644
--- a/holoviews/tests/plotting/bokeh/testbarplot.py
+++ b/holoviews/tests/plotting/bokeh/testbarplot.py
@@ -248,7 +248,7 @@ def test_bars_color_index_color_no_clash(self):
                     vdims=['y', 'color']).options(fill_color='color', color_index='color')        
         plot = bokeh_renderer.get_plot(bars)
         glyph = plot.handles['glyph']
-        cmapper = plot.handles['color_color_mapper']
+        cmapper = plot.handles['fill_color_color_mapper']
         cmapper2 = plot.handles['color_mapper']
         self.assertEqual(glyph.fill_color, {'field': 'fill_color', 'transform': cmapper})
         self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper2})
diff --git a/holoviews/tests/plotting/bokeh/testgraphplot.py b/holoviews/tests/plotting/bokeh/testgraphplot.py
index f316119a3b..ba3b23de9e 100644
--- a/holoviews/tests/plotting/bokeh/testgraphplot.py
+++ b/holoviews/tests/plotting/bokeh/testgraphplot.py
@@ -4,7 +4,7 @@
 
 import numpy as np
 from holoviews.core.data import Dataset
-from holoviews.element import Graph, TriMesh, Chord, circular_layout
+from holoviews.element import Graph, Nodes, TriMesh, Chord, circular_layout
 
 try:
     from bokeh.models import (NodesAndLinkedEdges, EdgesAndLinkedNodes, Patches)
@@ -158,6 +158,127 @@ def test_graph_edges_numerically_colormapped(self):
         self.assertEqual(edge_source.data['Weight'], self.node_info2['Weight'])
         self.assertEqual(glyph.line_color, {'field': 'Weight', 'transform': cmapper})
 
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_graph_op_node_color(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 'red'), (0, 1, 1, 'green'), (1, 1, 2, 'blue')],
+                      vdims='color')
+        graph = Graph((edges, nodes)).options(node_color='color')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        self.assertEqual(glyph.fill_color, {'field': 'node_color'})
+        self.assertEqual(glyph.line_color, {'field': 'node_color'})
+        self.assertEqual(cds.data['node_color'], np.array(['red', 'green', 'blue']))
+
+    def test_graph_op_node_color_linear(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 0.5), (0, 1, 1, 1.5), (1, 1, 2, 2.5)],
+                      vdims='color')
+        graph = Graph((edges, nodes)).options(node_color='color')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        cmapper = plot.handles['node_color_color_mapper']
+        self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(cds.data['node_color'], np.array([0.5, 1.5, 2.5]))
+
+    def test_graph_op_node_color_categorical(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 'A'), (0, 1, 1, 'B'), (1, 1, 2, 'C')],
+                      vdims='color')
+        graph = Graph((edges, nodes)).options(node_color='color')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        cmapper = plot.handles['node_color_color_mapper']
+        self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(cds.data['node_color'], np.array(['A', 'B', 'C']))
+
+    def test_graph_op_node_size(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 2), (0, 1, 1, 4), (1, 1, 2, 6)],
+                      vdims='size')
+        graph = Graph((edges, nodes)).options(node_size='size')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        self.assertEqual(glyph.size, {'field': 'node_size'})
+        self.assertEqual(cds.data['node_size'], np.array([2, 4, 6]))
+
+    def test_graph_op_node_alpha(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 0.2), (0, 1, 1, 0.6), (1, 1, 2, 1)], vdims='alpha')
+        graph = Graph((edges, nodes)).options(node_alpha='alpha')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        self.assertEqual(glyph.fill_alpha, {'field': 'node_alpha'})
+        self.assertEqual(glyph.line_alpha, {'field': 'node_alpha'})
+        self.assertEqual(cds.data['node_alpha'], np.array([0.2, 0.6, 1]))
+
+    def test_graph_op_node_line_width(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 2), (0, 1, 1, 4), (1, 1, 2, 6)], vdims='line_width')
+        graph = Graph((edges, nodes)).options(node_line_width='line_width')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        self.assertEqual(glyph.line_width, {'field': 'node_line_width'})
+        self.assertEqual(cds.data['node_line_width'], np.array([2, 4, 6]))
+
+    def test_graph_op_edge_color(self):
+        edges = [(0, 1, 'red'), (0, 2, 'green'), (1, 3, 'blue')]
+        graph = Graph(edges, vdims='color').options(edge_color='color')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        self.assertEqual(glyph.line_color, {'field': 'edge_color'})
+        self.assertEqual(cds.data['edge_color'], np.array(['red', 'green', 'blue']))
+
+    def test_graph_op_edge_color_linear(self):
+        edges = [(0, 1, 2), (0, 2, 0.5), (1, 3, 3)]
+        graph = Graph(edges, vdims='color').options(edge_color='color')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        cmapper = plot.handles['edge_color_color_mapper']
+        self.assertEqual(glyph.line_color, {'field': 'edge_color', 'transform': cmapper})
+        self.assertEqual(cds.data['edge_color'], np.array([2, 0.5, 3]))
+
+    def test_graph_op_edge_color_categorical(self):
+        edges = [(0, 1, 'C'), (0, 2, 'B'), (1, 3, 'A')]
+        graph = Graph(edges, vdims='color').options(edge_color='color')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        cmapper = plot.handles['edge_color_color_mapper']
+        self.assertEqual(glyph.line_color, {'field': 'edge_color', 'transform': cmapper})
+        self.assertEqual(cds.data['edge_color'], np.array(['C', 'B', 'A']))
+
+    def test_graph_op_edge_alpha(self):
+        edges = [(0, 1, 0.1), (0, 2, 0.5), (1, 3, 0.3)]
+        graph = Graph(edges, vdims='alpha').options(edge_alpha='alpha')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        self.assertEqual(glyph.line_alpha, {'field': 'edge_alpha'})
+        self.assertEqual(cds.data['edge_alpha'], np.array([0.1, 0.5, 0.3]))
+
+    def test_graph_op_edge_line_width(self):
+        edges = [(0, 1, 2), (0, 2, 10), (1, 3, 6)]
+        graph = Graph(edges, vdims='line_width').options(edge_line_width='line_width')
+        plot = bokeh_renderer.get_plot(graph)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        self.assertEqual(glyph.line_width, {'field': 'edge_line_width'})
+        self.assertEqual(cds.data['edge_line_width'], np.array([2, 10, 6]))
+
 
 class TestBokehTriMeshPlot(TestBokehPlot):
 
@@ -192,10 +313,11 @@ def test_plot_simple_trimesh_filled(self):
         layout = {str(int(z)): (x, y) for x, y, z in self.trimesh.nodes.array()}
         self.assertEqual(layout_source.graph_layout, layout)
 
-    def test_graph_edges_categorical_colormapped(self):
+    def test_trimesh_edges_categorical_colormapped(self):
         g = self.trimesh.opts(plot=dict(edge_color_index='node1'),
-                                       style=dict(edge_cmap=['#FFFFFF', '#000000']))
+                              style=dict(edge_cmap=['#FFFFFF', '#000000']))
         plot = bokeh_renderer.get_plot(g)
+        print(plot.handles)
         cmapper = plot.handles['edge_colormapper']
         edge_source = plot.handles['multi_line_1_source']
         glyph = plot.handles['multi_line_1_glyph']
@@ -205,7 +327,7 @@ def test_graph_edges_categorical_colormapped(self):
         self.assertEqual(edge_source.data['node1_str__'], ['0', '1'])
         self.assertEqual(glyph.line_color, {'field': 'node1_str__', 'transform': cmapper})
 
-    def test_graph_nodes_numerically_colormapped(self):
+    def test_trimesh_nodes_numerically_colormapped(self):
         g = self.trimesh_weighted.opts(plot=dict(edge_color_index='weight'),
                                        style=dict(edge_cmap=['#FFFFFF', '#000000']))
         plot = bokeh_renderer.get_plot(g)
diff --git a/holoviews/tests/plotting/bokeh/testlabels.py b/holoviews/tests/plotting/bokeh/testlabels.py
index 20cda8c140..f997655580 100644
--- a/holoviews/tests/plotting/bokeh/testlabels.py
+++ b/holoviews/tests/plotting/bokeh/testlabels.py
@@ -120,7 +120,7 @@ def test_label_linear_color_op(self):
         plot = bokeh_renderer.get_plot(labels)
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
-        cmapper = plot.handles['color_color_mapper']
+        cmapper = plot.handles['text_color_color_mapper']
         self.assertTrue(cmapper, LinearColorMapper)
         self.assertEqual(cmapper.low, 0)
         self.assertEqual(cmapper.high, 2)
@@ -133,7 +133,7 @@ def test_label_categorical_color_op(self):
         plot = bokeh_renderer.get_plot(labels)
         cds = plot.handles['cds']
         glyph = plot.handles['glyph']
-        cmapper = plot.handles['color_color_mapper']
+        cmapper = plot.handles['text_color_color_mapper']
         self.assertTrue(cmapper, CategoricalColorMapper)
         self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
         self.assertEqual(cds.data['text_color'], np.array(['A', 'B', 'C']))
diff --git a/holoviews/tests/plotting/bokeh/testpointplot.py b/holoviews/tests/plotting/bokeh/testpointplot.py
index 524ad8e3fa..06b65f4f28 100644
--- a/holoviews/tests/plotting/bokeh/testpointplot.py
+++ b/holoviews/tests/plotting/bokeh/testpointplot.py
@@ -472,7 +472,7 @@ def test_point_color_index_color_no_clash(self):
                         vdims='color').options(fill_color='color', color_index='color')        
         plot = bokeh_renderer.get_plot(points)
         glyph = plot.handles['glyph']
-        cmapper = plot.handles['color_color_mapper']
+        cmapper = plot.handles['fill_color_color_mapper']
         cmapper2 = plot.handles['color_mapper']
         self.assertEqual(glyph.fill_color, {'field': 'fill_color', 'transform': cmapper})
         self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper2})
diff --git a/holoviews/tests/plotting/bokeh/testviolinplot.py b/holoviews/tests/plotting/bokeh/testviolinplot.py
index 9077d32487..1a0db7e249 100644
--- a/holoviews/tests/plotting/bokeh/testviolinplot.py
+++ b/holoviews/tests/plotting/bokeh/testviolinplot.py
@@ -38,9 +38,9 @@ def test_violin_simple(self):
         scatter_source = plot.handles['scatter_1_source']
         self.assertEqual(scatter_source.data['x'], [('', 0)])
         self.assertEqual(scatter_source.data['y'], [q2])
-        patch_source = plot.handles['patch_0_source']
-        self.assertEqual(patch_source.data['x'], kde['x'])
-        self.assertEqual(patch_source.data['y'], kde['y'])
+        patch_source = plot.handles['patches_1_source']
+        self.assertEqual(patch_source.data['xs'], [kde['y']])
+        self.assertEqual(patch_source.data['ys'], [kde['x']])
 
     def test_violin_inner_quartiles(self):
         values = np.random.rand(100)
@@ -74,6 +74,6 @@ def test_violin_multi(self):
     def test_violin_empty(self):
         violin = Violin([])
         plot = bokeh_renderer.get_plot(violin)
-        patch_source = plot.handles['patch_0_source']
-        self.assertEqual(patch_source.data['x'], np.array([]))
-        self.assertEqual(patch_source.data['y'], [])
+        patch_source = plot.handles['patches_1_source']
+        self.assertEqual(patch_source.data['xs'], [[]])
+        self.assertEqual(patch_source.data['ys'], [np.array([])])
diff --git a/holoviews/tests/plotting/matplotlib/testgraphplot.py b/holoviews/tests/plotting/matplotlib/testgraphplot.py
index 4eae05eea8..5e6c39e909 100644
--- a/holoviews/tests/plotting/matplotlib/testgraphplot.py
+++ b/holoviews/tests/plotting/matplotlib/testgraphplot.py
@@ -3,7 +3,7 @@
 import numpy as np
 from holoviews.core.data import Dataset
 from holoviews.core.options import Cycle
-from holoviews.element import Graph, TriMesh, Chord, circular_layout
+from holoviews.element import Graph, Nodes, TriMesh, Chord, circular_layout
 
 # Standardize backend due to random inconsistencies
 try:
@@ -83,6 +83,87 @@ def test_plot_graph_numerically_colored_edges(self):
         self.assertEqual(edges.get_array(), self.weights)
         self.assertEqual(edges.get_clim(), (self.weights.min(), self.weights.max()))
 
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_graph_op_node_color(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, '#000000'), (0, 1, 1, '#FF0000'), (1, 1, 2, '#00FF00')],
+                      vdims='color')
+        graph = Graph((edges, nodes)).options(node_color='color')
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_facecolors(),
+                         np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
+
+    def test_graph_op_node_color_linear(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 0.5), (0, 1, 1, 1.5), (1, 1, 2, 2.5)],
+                      vdims='color')
+        graph = Graph((edges, nodes)).options(node_color='color')
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_array(), np.array([0.5, 1.5, 2.5]))
+
+    def test_graph_op_node_color_categorical(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 'A'), (0, 1, 1, 'B'), (1, 1, 2, 'A')],
+                      vdims='color')
+        graph = Graph((edges, nodes)).options(node_color='color')
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_array(), np.array([0, 1, 0]))
+
+    def test_graph_op_node_size(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 2), (0, 1, 1, 4), (1, 1, 2, 6)],
+                      vdims='size')
+        graph = Graph((edges, nodes)).options(node_size='size')
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_sizes(), np.array([4, 16, 36]))
+
+    def test_graph_op_node_linewidth(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 2), (0, 1, 1, 4), (1, 1, 2, 3.5)], vdims='line_width')
+        graph = Graph((edges, nodes)).options(node_linewidth='line_width')
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_linewidths(), [2, 4, 3.5])
+
+    def test_graph_op_node_alpha(self):
+        edges = [(0, 1), (0, 2)]
+        nodes = Nodes([(0, 0, 0, 0.2), (0, 1, 1, 0.6), (1, 1, 2, 1)], vdims='alpha')
+        graph = Graph((edges, nodes)).options(node_alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(graph)
+
+    def test_graph_op_edge_color(self):
+        edges = [(0, 1, 'red'), (0, 2, 'green'), (1, 3, 'blue')]
+        graph = Graph(edges, vdims='color').options(edge_color='color')
+        plot = mpl_renderer.get_plot(graph)
+
+    def test_graph_op_edge_color_linear(self):
+        edges = [(0, 1, 2), (0, 2, 0.5), (1, 3, 3)]
+        graph = Graph(edges, vdims='color').options(edge_color='color')
+        plot = mpl_renderer.get_plot(graph)
+
+    def test_graph_op_edge_color_categorical(self):
+        edges = [(0, 1, 'C'), (0, 2, 'B'), (1, 3, 'A')]
+        graph = Graph(edges, vdims='color').options(edge_color='color')
+        plot = mpl_renderer.get_plot(graph)
+
+    def test_graph_op_edge_alpha(self):
+        edges = [(0, 1, 0.1), (0, 2, 0.5), (1, 3, 0.3)]
+        graph = Graph(edges, vdims='alpha').options(edge_alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(graph)
+
+    def test_graph_op_edge_linewidth(self):
+        edges = [(0, 1, 2), (0, 2, 10), (1, 3, 6)]
+        graph = Graph(edges, vdims='line_width').options(edge_linewidth='line_width')
+        plot = mpl_renderer.get_plot(graph)
 
 
 class TestMplTriMeshPlot(TestMPLPlot):

From 2edbd80cf467f13fc250113715b21d5bacfa03bd Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 13:31:27 +0000
Subject: [PATCH 046/117] Renamed op to dim

---
 .../demos/bokeh/dropdown_economic.ipynb       |  2 +-
 .../demos/matplotlib/dropdown_economic.ipynb  |  2 +-
 .../reference/elements/bokeh/Histogram.ipynb  |  4 +-
 .../reference/elements/bokeh/Points.ipynb     |  2 +-
 .../reference/elements/bokeh/Scatter.ipynb    |  2 +-
 .../elements/matplotlib/Histogram.ipynb       |  4 +-
 holoviews/plotting/bokeh/element.py           | 12 ++--
 holoviews/plotting/mpl/element.py             | 13 ++--
 holoviews/util/ops.py                         | 60 +++++++++----------
 holoviews/util/parser.py                      |  4 +-
 10 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/examples/gallery/demos/bokeh/dropdown_economic.ipynb b/examples/gallery/demos/bokeh/dropdown_economic.ipynb
index 91a8d8788f..bbdbb0e0a7 100644
--- a/examples/gallery/demos/bokeh/dropdown_economic.ipynb
+++ b/examples/gallery/demos/bokeh/dropdown_economic.ipynb
@@ -54,7 +54,7 @@
    "outputs": [],
    "source": [
     "%%opts Overlay [width=700 height=400 show_frame=False]\n",
-    "%%opts Curve (color='k') Scatter (color='Unemployment' size=op('Unemployment')*1.5 cmap='Blues' line_color='k')\n",
+    "%%opts Curve (color='k') Scatter (color='Unemployment' size=dim('Unemployment')*1.5 cmap='Blues' line_color='k')\n",
     "%%opts VLine (color='k' line_width=1)\n",
     "%%opts Text (text_font_size='13px')\n",
     "gdp_curves = macro.to.curve('Year', 'GDP Growth')\n",
diff --git a/examples/gallery/demos/matplotlib/dropdown_economic.ipynb b/examples/gallery/demos/matplotlib/dropdown_economic.ipynb
index c93bb0944f..118f0ce927 100644
--- a/examples/gallery/demos/matplotlib/dropdown_economic.ipynb
+++ b/examples/gallery/demos/matplotlib/dropdown_economic.ipynb
@@ -53,7 +53,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Curve (color='k') Scatter (color='Unemployment' s=op('Unemployment')*10 cmap='Blues' edgecolors='k')\n",
+    "%%opts Curve (color='k') Scatter (color='Unemployment' s=dim('Unemployment')*10 cmap='Blues' edgecolors='k')\n",
     "%%opts Overlay [show_frame=True aspect=2, fig_size=250, show_frame=False]\n",
     "gdp_curves = macro.to.curve('Year', 'GDP Growth')\n",
     "gdp_unem_scatter = macro.to.scatter('Year', ['GDP Growth', 'Unemployment'])\n",
diff --git a/examples/reference/elements/bokeh/Histogram.ipynb b/examples/reference/elements/bokeh/Histogram.ipynb
index d612d9e5cc..86f8ed6e4c 100644
--- a/examples/reference/elements/bokeh/Histogram.ipynb
+++ b/examples/reference/elements/bokeh/Histogram.ipynb
@@ -67,7 +67,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Like most other elements a ``Histogram`` also supports using ``op`` transforms to map dimensions to visual attributes. To demonstrate this we will use the ``bin`` op to bin the 'y' values into positive and negative values and map those to a 'blue' and 'red' ``fill_color``:"
+    "Like most other elements a ``Histogram`` also supports using ``dim`` transforms to map dimensions to visual attributes. To demonstrate this we will use the ``bin`` op to bin the 'y' values into positive and negative values and map those to a 'blue' and 'red' ``fill_color``:"
    ]
   },
   {
@@ -76,7 +76,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "hv.Histogram(curve).options(fill_color=hv.op('y', 'bin', bins=[-1, 0, 1], labels=['red', 'blue']))"
+    "hv.Histogram(curve).options(fill_color=hv.dim('y').bin(bins=[-1, 0, 1], labels=['red', 'blue']))"
    ]
   },
   {
diff --git a/examples/reference/elements/bokeh/Points.ipynb b/examples/reference/elements/bokeh/Points.ipynb
index 6b6037eba0..1609de39bd 100644
--- a/examples/reference/elements/bokeh/Points.ipynb
+++ b/examples/reference/elements/bokeh/Points.ipynb
@@ -73,7 +73,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Points (color='z' size=op('size')*20)\n",
+    "%%opts Points (color='z' size=dim('size')*20)\n",
     "np.random.seed(10)\n",
     "data = np.random.rand(100,4)\n",
     "\n",
diff --git a/examples/reference/elements/bokeh/Scatter.ipynb b/examples/reference/elements/bokeh/Scatter.ipynb
index ccb9e2b129..5d5962a378 100644
--- a/examples/reference/elements/bokeh/Scatter.ipynb
+++ b/examples/reference/elements/bokeh/Scatter.ipynb
@@ -73,7 +73,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Scatter (color='z' size=op('size')*20)\n",
+    "%%opts Scatter (color='z' size=dim('size')*20)\n",
     "np.random.seed(10)\n",
     "data = np.random.rand(100,4)\n",
     "\n",
diff --git a/examples/reference/elements/matplotlib/Histogram.ipynb b/examples/reference/elements/matplotlib/Histogram.ipynb
index 4d3271547f..2e0e3eff83 100644
--- a/examples/reference/elements/matplotlib/Histogram.ipynb
+++ b/examples/reference/elements/matplotlib/Histogram.ipynb
@@ -67,7 +67,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Like most other elements a ``Histogram`` also supports using ``op`` transforms to map dimensions to visual attributes. To demonstrate this we will use the ``bin`` op to bin the 'y' values into positive and negative values and map those to a 'blue' and 'red' ``fill_color``:"
+    "Like most other elements a ``Histogram`` also supports using ``dim`` transforms to map dimensions to visual attributes. To demonstrate this we will use the ``bin`` op to bin the 'y' values into positive and negative values and map those to a 'blue' and 'red' ``fill_color``:"
    ]
   },
   {
@@ -76,7 +76,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "hv.Histogram(curve).options(color=hv.op('y', 'bin', bins=[-1, 0, 1], labels=['red', 'blue']))"
+    "hv.Histogram(curve).options(color=hv.dim('y').bin(bins=[-1, 0, 1], labels=['red', 'blue']))"
    ]
   },
   {
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 3c590a9a03..009da8aeb2 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -27,7 +27,7 @@
 from ...core import util
 from ...element import Graph, VectorField
 from ...streams import Buffer
-from ...util.ops import op
+from ...util.ops import dim
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import BokehPlot, TOOLS
@@ -662,16 +662,16 @@ def _apply_ops(self, element, source, ranges, style, group=None):
         for k, v in dict(style).items():
             if isinstance(v, util.basestring):
                 if v in element or (isinstance(element, Graph) and v in element.nodes):
-                    v = op(v)
+                    v = dim(v)
                 elif any(d==v for d in self.overlay_dims):
-                    v = op([d for d in self.overlay_dims if d==v][0])
-            elif isinstance(v, tuple) and v and isinstance(v[0], (util.basestring, tuple, op)):
+                    v = dim([d for d in self.overlay_dims if d==v][0])
+            elif isinstance(v, tuple) and v and isinstance(v[0], (util.basestring, tuple, dim)):
                 try:
-                    v = op.resolve_spec(v)
+                    v = dim.resolve_spec(v)
                 except:
                     continue
 
-            if not isinstance(v, op) or (group is not None and not k.startswith(group)):
+            if not isinstance(v, dim) or (group is not None and not k.startswith(group)):
                 continue
             dname = v.dimension.name
 
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 1839bcdb4b..a4a9bc0f79 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -13,7 +13,7 @@
                      CompositeOverlay, Element3D, Element)
 from ...core.options import abbreviated_exception
 from ...element import Graph
-from ...util.ops import op
+from ...util.ops import dim
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import MPLPlot, mpl_rc_context
@@ -520,17 +520,16 @@ def _apply_ops(self, element, ranges, style):
         for k, v in style.items():
             if isinstance(v, util.basestring):
                 if v in element or (isinstance(element, Graph) and v in element.nodes):
-                    v = op(v)
+                    v = dim(v)
                 elif any(d==v for d in self.overlay_dims):
-                    v = op([d for d in self.overlay_dims if d==v][0])
-            elif isinstance(v, tuple) and v and isinstance(v[0], (util.basestring, tuple, op)):
+                    v = dim([d for d in self.overlay_dims if d==v][0])
+            elif isinstance(v, tuple) and v and isinstance(v[0], (util.basestring, tuple, dim)):
                 try:
-                    v = op.resolve_spec(v)
+                    v = dim.resolve_spec(v)
                 except:
                     continue
 
-
-            if not isinstance(v, op):
+            if not isinstance(v, dim):
                 continue
 
             dname = v.dimension.name
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index aa00c6c714..224d05d45c 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -52,7 +52,7 @@ def int_fn(values):
     return values.astype(int)
 
 
-class op(object):
+class dim(object):
 
     _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn,
                     str: str_fn, int: int_fn}
@@ -100,42 +100,42 @@ def register(cls, key, function):
         self._op_registry[name] = function
 
     # Unary operators
-    def __abs__(self): return op(self, operator.abs)
-    def __neg__(self): return op(self, operator.neg)
-    def __pos__(self): return op(self, operator.pos)
+    def __abs__(self): return dim(self, operator.abs)
+    def __neg__(self): return dim(self, operator.neg)
+    def __pos__(self): return dim(self, operator.pos)
 
     # Binary operators
-    def __add__(self, other):       return op(self, operator.add, other)
-    def __div__(self, other):       return op(self, operator.div, other)
-    def __floordiv__(self, other):  return op(self, operator.floordiv, other)
-    def __pow__(self, other):       return op(self, operator.pow, other)
-    def __mod__(self, other):       return op(self, operator.mod, other)
-    def __mul__(self, other):       return op(self, operator.mul, other)
-    def __sub__(self, other):       return op(self, operator.sub, other)
-    def __truediv__(self, other):   return op(self, operator.truediv, other)
+    def __add__(self, other):       return dim(self, operator.add, other)
+    def __div__(self, other):       return dim(self, operator.div, other)
+    def __floordiv__(self, other):  return dim(self, operator.floordiv, other)
+    def __pow__(self, other):       return dim(self, operator.pow, other)
+    def __mod__(self, other):       return dim(self, operator.mod, other)
+    def __mul__(self, other):       return dim(self, operator.mul, other)
+    def __sub__(self, other):       return dim(self, operator.sub, other)
+    def __truediv__(self, other):   return dim(self, operator.truediv, other)
 
     # Reverse binary operators
-    def __radd__(self, other):      return op(self, operator.add, other, True)
-    def __rdiv__(self, other):      return op(self, operator.div, other, True)
-    def __rfloordiv__(self, other): return op(self, operator.floordiv, other, True)
-    def __rmod__(self, other):      return op(self, operator.mod, other, True)
-    def __rmul__(self, other):      return op(self, operator.mul, other, True)
-    def __rsub__(self, other):      return op(self, operator.sub, other, True)
-    def __rtruediv__(self, other):  return op(self, operator.truediv, other, True)
+    def __radd__(self, other):      return dim(self, operator.add, other, True)
+    def __rdiv__(self, other):      return dim(self, operator.div, other, True)
+    def __rfloordiv__(self, other): return dim(self, operator.floordiv, other, True)
+    def __rmod__(self, other):      return dim(self, operator.mod, other, True)
+    def __rmul__(self, other):      return dim(self, operator.mul, other, True)
+    def __rsub__(self, other):      return dim(self, operator.sub, other, True)
+    def __rtruediv__(self, other):  return dim(self, operator.truediv, other, True)
 
     ## NumPy operations
     def __array_ufunc__(self, *args, **kwargs):
         ufunc = getattr(args[0], args[1])
         kwargs = {k: v for k, v in kwargs.items() if v is not None}
-        return op(self, ufunc, **kwargs)
+        return dim(self, ufunc, **kwargs)
 
-    def max(self, **kwargs):  return op(self, np.max, **kwargs)
-    def mean(self, **kwargs): return op(self, np.mean, **kwargs)
-    def min(self, **kwargs):  return op(self, np.min, **kwargs)
-    def sum(self, **kwargs):  return op(self, np.sum, **kwargs)
-    def std(self, **kwargs):  return op(self, np.std, **kwargs)
-    def var(self, **kwargs):  return op(self, np.var, **kwargs)
-    def astype(self, dtype):  return op(self, np.asarray, dtype=dtype)
+    def max(self, **kwargs):  return dim(self, np.max, **kwargs)
+    def mean(self, **kwargs): return dim(self, np.mean, **kwargs)
+    def min(self, **kwargs):  return dim(self, np.min, **kwargs)
+    def sum(self, **kwargs):  return dim(self, np.sum, **kwargs)
+    def std(self, **kwargs):  return dim(self, np.std, **kwargs)
+    def var(self, **kwargs):  return dim(self, np.var, **kwargs)
+    def astype(self, dtype):  return dim(self, np.asarray, dtype=dtype)
 
     ## Custom functions
 
@@ -143,14 +143,14 @@ def norm(self):
         """
         Normalizes the data into the given range
         """
-        return op(self, norm_fn)
+        return dim(self, norm_fn)
 
     def cat(self, categories, empty=None):
-        cat_op = op(self, cat_fn, categories=categories, empty=empty)
+        cat_op = dim(self, cat_fn, categories=categories, empty=empty)
         return cat_op
 
     def bin(self, bins, labels=None):
-        bin_op = op(self, bin_fn, categories=categories, empty=empty)
+        bin_op = dim(self, bin_fn, categories=categories, empty=empty)
         return bin_op
 
     def eval(self, dataset, flat=False, expanded=None, ranges={}):
diff --git a/holoviews/util/parser.py b/holoviews/util/parser.py
index eab98653c9..5305c2e856 100644
--- a/holoviews/util/parser.py
+++ b/holoviews/util/parser.py
@@ -17,7 +17,7 @@
 from ..core.options import Options, Cycle, Palette
 from ..core.util import merge_option_dicts
 from ..operation import Compositor
-from .ops import op, norm
+from .ops import dim, norm
 
 ascii_uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 allowed = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!#$%&\()*+,-./:;<=>?@\\^_`{|}~'
@@ -36,7 +36,7 @@ class Parser(object):
     """
 
     # Static namespace set in __init__.py of the extension
-    namespace = {'np': np, 'Cycle': Cycle, 'Palette': Palette, 'op': op,
+    namespace = {'np': np, 'Cycle': Cycle, 'Palette': Palette, 'dim': dim,
                  'norm': norm}
     # If True, raise SyntaxError on eval error otherwise warn
     abort_on_eval_failure = False

From 0b15b45ae9f82a8d39640a5188abd2611b611327 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 17:57:11 +0000
Subject: [PATCH 047/117] Fixed import

---
 holoviews/util/ops.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 224d05d45c..f6b4ca8172 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -1,5 +1,8 @@
 import operator
-from itertools import zip_longest
+try:
+    from itertools import zip_longest as zip_longest
+except:
+    from itertools import izip_longest as zip_longest
 
 import numpy as np
 

From cae455d849254e3d9a5f60d1c408ecd688b25fad Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 18:06:38 +0000
Subject: [PATCH 048/117] Fixed flakes

---
 holoviews/plotting/bokeh/chart.py                  |  8 ++++----
 holoviews/plotting/bokeh/element.py                | 10 +++++-----
 holoviews/plotting/bokeh/stats.py                  |  2 +-
 holoviews/plotting/mpl/chart.py                    | 10 +++++-----
 holoviews/plotting/mpl/stats.py                    |  3 +--
 holoviews/plotting/mpl/util.py                     |  1 -
 holoviews/tests/plotting/bokeh/testerrorbarplot.py |  2 --
 .../tests/plotting/bokeh/testvectorfieldplot.py    |  9 +--------
 .../tests/plotting/matplotlib/testerrorbarplot.py  |  2 +-
 .../tests/plotting/matplotlib/testgraphplot.py     |  8 ++++----
 .../tests/plotting/matplotlib/testspikeplot.py     |  1 +
 .../plotting/matplotlib/testvectorfieldplot.py     |  6 ------
 holoviews/util/ops.py                              | 14 ++++++--------
 13 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 399f63cd25..5b89ccd093 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -10,7 +10,7 @@
 from ...core.util import max_range, basestring, dimension_sanitizer, isfinite, range_pad
 from ...element import Bars
 from ...operation import interpolate_curve
-from ...util.ops import op
+from ...util.ops import dim
 from ..util import compute_sizes, get_min_distance, dim_axis_label, get_axis_padding
 from .element import ElementPlot, ColorbarPlot, LegendPlot
 from .styles import (expand_batched_style, line_properties, fill_properties,
@@ -55,7 +55,7 @@ def _get_size_data(self, element, ranges, style):
         data, mapping = {}, {}
         sdim = element.get_dimension(self.size_index)
         ms = style.get('size', np.sqrt(6))
-        if sdim and ((isinstance(ms, basestring) and ms in element) or isinstance(ms, op)):
+        if sdim and ((isinstance(ms, basestring) and ms in element) or isinstance(ms, dim)):
             self.warning("Cannot declare style mapping for 'size' option "
                          "and declare a size_index, ignoring the size_index.")
             sdim = None
@@ -135,8 +135,8 @@ def get_batched_data(self, element, ranges):
                 data[k].append(v)
 
             if 'hover' in self.handles:
-                for dim, k in zip(element.dimensions(), key):
-                    sanitized = dimension_sanitizer(dim.name)
+                for d, k in zip(element.dimensions(), key):
+                    sanitized = dimension_sanitizer(d.name)
                     data[sanitized].append([k]*nvals)
 
         data = {k: np.concatenate(v) for k, v in data.items()}
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 009da8aeb2..f7d8c37273 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -717,7 +717,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 if np.isscalar(val) and isinstance(val, int):
                     val = str(v)+'pt'
                 elif isinstance(val, np.ndarray) and val.dtype.kind in 'ifu':
-                    val = [str(int(v))+'pt' for v in val]
+                    val = [str(int(s))+'pt' for s in val]
             if np.isscalar(val):
                 key = val
             else:
@@ -737,17 +737,17 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 key = {'field': k, 'transform': cmapper}
             new_style[k] = key
 
-        for style, value in list(new_style.items()):
+        for style, val in list(new_style.items()):
             # If mapped to color/alpha override static fill/line style
             for s in ('alpha', 'color'):
                 if prefix+s != style or style not in source.data:
                     continue
                 fill_style = new_style.get(prefix+'fill_'+s)
                 if fill_style and validate(s, fill_style):
-                    new_style[prefix+'fill_'+s] = value
+                    new_style[prefix+'fill_'+s] = val
                 line_style = new_style.get(prefix+'line_'+s)
                 if line_style and validate(s, line_style):
-                    new_style[prefix+'line_'+s] = value
+                    new_style[prefix+'line_'+s] = val
 
         return new_style
 
@@ -1324,7 +1324,7 @@ def _get_color_data(self, element, ranges, style, name='color', factors=None, co
         data, mapping = {}, {}
         cdim = element.get_dimension(self.color_index)
         color = style.get(name, None)
-        if cdim and ((isinstance(color, util.basestring) and color in element) or isinstance(color, op)):
+        if cdim and ((isinstance(color, util.basestring) and color in element) or isinstance(color, dim)):
             self.warning("Cannot declare style mapping for '%s' option "
                          "and declare a color_index, ignoring the color_index."
                          % name)
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index 3d8f038f1c..27a23c4345 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -15,7 +15,7 @@
 from .chart import AreaPlot
 from .element import CompositeElementPlot, ColorbarPlot, LegendPlot
 from .path import PolygonPlot
-from .styles import fill_properties, line_properties, rgb2hex
+from .styles import fill_properties, line_properties
 from .util import decode_bytes
 
 
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index d447e51cf2..5498cb0199 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -21,7 +21,7 @@
 )
 from ...element import Raster, HeatMap
 from ...operation import interpolate_curve
-from ...util.ops import op
+from ...util.ops import dim
 from ..plot import PlotSelector
 from ..util import compute_sizes, get_sideplot_ranges, get_min_distance
 from .element import ElementPlot, ColorbarPlot, LegendPlot
@@ -617,7 +617,7 @@ def _compute_styles(self, element, ranges, style):
         color = style.pop('color', None)
         cmap = style.get('cmap', None)
 
-        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, op)):
+        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, dim)):
             self.warning("Cannot declare style mapping for 'color' option "
                          "and declare a color_index, ignoring the color_index.")
             cdim = None
@@ -638,7 +638,7 @@ def _compute_styles(self, element, ranges, style):
 
         ms = style.get('s', mpl.rcParams['lines.markersize'])
         sdim = element.get_dimension(self.size_index)
-        if sdim and ((isinstance(ms, basestring) and ms in element) or isinstance(ms, op)):
+        if sdim and ((isinstance(ms, basestring) and ms in element) or isinstance(ms, dim)):
             self.warning("Cannot declare style mapping for 's' option "
                          "and declare a size_index, ignoring the size_index.")
             sdim = None
@@ -747,7 +747,7 @@ def get_data(self, element, ranges, style):
         args = (xs, ys, magnitudes,  [0.0] * len(element))
         cdim = element.get_dimension(self.color_index)
         color = style.get('color', None)
-        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, op)):
+        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, dim)):
             self.warning("Cannot declare style mapping for 'color' option "
                          "and declare a color_index, ignoring the color_index.")
             cdim = None
@@ -1106,7 +1106,7 @@ def get_data(self, element, ranges, style):
 
         cdim = element.get_dimension(self.color_index)
         color = style.get('color', None)
-        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, op)):
+        if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, dim)):
             self.warning("Cannot declare style mapping for 'color' option "
                          "and declare a color_index, ignoring the color_index.")
             cdim = None
diff --git a/holoviews/plotting/mpl/stats.py b/holoviews/plotting/mpl/stats.py
index 699e540462..3475f14263 100644
--- a/holoviews/plotting/mpl/stats.py
+++ b/holoviews/plotting/mpl/stats.py
@@ -211,8 +211,7 @@ def get_data(self, element, ranges, style):
         else:
             element = element.clone([(element.aggregate(function=np.mean),)])
         new_style = self._apply_ops(element, ranges, style)
-
-        style = {k: v for k, v in style.items()
+        style = {k: v for k, v in new_style.items()
                  if k not in ['zorder', 'label']}
         style['vert'] = not self.invert_axes
         format_kdims = [kd(value_format=None) for kd in element.kdims]
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index 9b5479d628..a06e829065 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -13,7 +13,6 @@
 
 from ...core.util import basestring, _getargspec
 from ...element import Raster, RGB, Polygons
-from ...element import Raster, RGB
 from ..util import COLOR_ALIASES, RGB_HEX_REGEX
 
 
diff --git a/holoviews/tests/plotting/bokeh/testerrorbarplot.py b/holoviews/tests/plotting/bokeh/testerrorbarplot.py
index 6f31511b30..692038d781 100644
--- a/holoviews/tests/plotting/bokeh/testerrorbarplot.py
+++ b/holoviews/tests/plotting/bokeh/testerrorbarplot.py
@@ -2,10 +2,8 @@
 
 from bokeh.models import CategoricalColorMapper, LinearColorMapper
 
-from holoviews.core.overlay import NdOverlay
 from holoviews.element import ErrorBars
 
-from ..utils import ParamLogStream
 from .testplot import TestBokehPlot, bokeh_renderer
 
 
diff --git a/holoviews/tests/plotting/bokeh/testvectorfieldplot.py b/holoviews/tests/plotting/bokeh/testvectorfieldplot.py
index 592239a391..35b0218a3a 100644
--- a/holoviews/tests/plotting/bokeh/testvectorfieldplot.py
+++ b/holoviews/tests/plotting/bokeh/testvectorfieldplot.py
@@ -1,19 +1,12 @@
-import datetime as dt
-from unittest import SkipTest
-
 import numpy as np
 
-from holoviews.core import NdOverlay
-from holoviews.core.options import Cycle
-from holoviews.core.util import pd
 from holoviews.element import VectorField
 
 from .testplot import TestBokehPlot, bokeh_renderer
 from ..utils import ParamLogStream
 
 try:
-    from bokeh.models import FactorRange, LinearColorMapper, CategoricalColorMapper
-    from bokeh.models import Scatter
+    from bokeh.models import LinearColorMapper, CategoricalColorMapper
 except:
     pass
 
diff --git a/holoviews/tests/plotting/matplotlib/testerrorbarplot.py b/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
index fcd31b780c..1236735c41 100644
--- a/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
+++ b/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
@@ -1,8 +1,8 @@
 import numpy as np
 
 from holoviews.element import ErrorBars
+from holoviews.plotting.util import hex2rgb
 
-from ..utils import ParamLogStream
 from .testplot import TestMPLPlot, mpl_renderer
 
 
diff --git a/holoviews/tests/plotting/matplotlib/testgraphplot.py b/holoviews/tests/plotting/matplotlib/testgraphplot.py
index 5e6c39e909..f850ceaab9 100644
--- a/holoviews/tests/plotting/matplotlib/testgraphplot.py
+++ b/holoviews/tests/plotting/matplotlib/testgraphplot.py
@@ -142,17 +142,17 @@ def test_graph_op_node_alpha(self):
     def test_graph_op_edge_color(self):
         edges = [(0, 1, 'red'), (0, 2, 'green'), (1, 3, 'blue')]
         graph = Graph(edges, vdims='color').options(edge_color='color')
-        plot = mpl_renderer.get_plot(graph)
+        mpl_renderer.get_plot(graph)
 
     def test_graph_op_edge_color_linear(self):
         edges = [(0, 1, 2), (0, 2, 0.5), (1, 3, 3)]
         graph = Graph(edges, vdims='color').options(edge_color='color')
-        plot = mpl_renderer.get_plot(graph)
+        mpl_renderer.get_plot(graph)
 
     def test_graph_op_edge_color_categorical(self):
         edges = [(0, 1, 'C'), (0, 2, 'B'), (1, 3, 'A')]
         graph = Graph(edges, vdims='color').options(edge_color='color')
-        plot = mpl_renderer.get_plot(graph)
+        mpl_renderer.get_plot(graph)
 
     def test_graph_op_edge_alpha(self):
         edges = [(0, 1, 0.1), (0, 2, 0.5), (1, 3, 0.3)]
@@ -163,7 +163,7 @@ def test_graph_op_edge_alpha(self):
     def test_graph_op_edge_linewidth(self):
         edges = [(0, 1, 2), (0, 2, 10), (1, 3, 6)]
         graph = Graph(edges, vdims='line_width').options(edge_linewidth='line_width')
-        plot = mpl_renderer.get_plot(graph)
+        mpl_renderer.get_plot(graph)
 
 
 class TestMplTriMeshPlot(TestMPLPlot):
diff --git a/holoviews/tests/plotting/matplotlib/testspikeplot.py b/holoviews/tests/plotting/matplotlib/testspikeplot.py
index f0f45bd0eb..191bf1c349 100644
--- a/holoviews/tests/plotting/matplotlib/testspikeplot.py
+++ b/holoviews/tests/plotting/matplotlib/testspikeplot.py
@@ -2,6 +2,7 @@
 
 from holoviews.core.overlay import NdOverlay
 from holoviews.element import Spikes
+from holoviews.plotting.util import hex2rgb
 
 from ..utils import ParamLogStream
 from .testplot import TestMPLPlot, mpl_renderer
diff --git a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
index 9bb160aa6e..640ccb1527 100644
--- a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
+++ b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
@@ -1,16 +1,10 @@
 import numpy as np
 
-from holoviews.core.overlay import NdOverlay
 from holoviews.element import VectorField
 
 from .testplot import TestMPLPlot, mpl_renderer
 from ..utils import ParamLogStream
 
-try:
-    from matplotlib import pyplot
-except:
-    pass
-
 
 class TestVectorFieldPlot(TestMPLPlot):
 
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index f6b4ca8172..c65fe92a9b 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -7,7 +7,7 @@
 import numpy as np
 
 from ..core.dimension import Dimension
-from ..core.util import basestring, unique_iterator, isfinite
+from ..core.util import basestring, unique_iterator
 from ..element import Graph
 
 
@@ -100,7 +100,7 @@ def register(cls, key, function):
         Register a custom op transform function which can from then
         on be referenced by the key.
         """
-        self._op_registry[name] = function
+        cls._op_registry[key] = function
 
     # Unary operators
     def __abs__(self): return dim(self, operator.abs)
@@ -149,12 +149,10 @@ def norm(self):
         return dim(self, norm_fn)
 
     def cat(self, categories, empty=None):
-        cat_op = dim(self, cat_fn, categories=categories, empty=empty)
-        return cat_op
+        return dim(self, cat_fn, categories=categories, empty=empty)
 
     def bin(self, bins, labels=None):
-        bin_op = dim(self, bin_fn, categories=categories, empty=empty)
-        return bin_op
+        return dim(self, bin_fn, bins=bins, labels=labels)
 
     def eval(self, dataset, flat=False, expanded=None, ranges={}):
         if expanded is None:
@@ -166,7 +164,7 @@ def eval(self, dataset, flat=False, expanded=None, ranges={}):
         for o in self.ops:
             other = o['other']
             if other is not None:
-                if isinstance(other, op):
+                if isinstance(other, dim):
                     other = other.eval(dataset, ranges)
                 args = (other, data) if o['reverse'] else (data, other)
             else:
@@ -190,7 +188,7 @@ def __repr__(self):
         return op_repr
 
 
-class norm(op):
+class norm(dim):
 
     def __init__(self, obj, **kwargs):
         super(norm, self).__init__(obj, norm_fn, **kwargs)

From b840e21fae82af283f1075c903410fc5ba1297a1 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 20:14:24 +0000
Subject: [PATCH 049/117] BarPlot fixes

---
 holoviews/plotting/bokeh/chart.py             | 18 +++++++++---------
 holoviews/tests/plotting/bokeh/testbarplot.py | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 5b89ccd093..8ee7af8456 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -236,6 +236,7 @@ def get_data(self, element, ranges, style):
         x0s, x1s = (xs + nxoff, xs - pxoff)
         y0s, y1s = (ys + nyoff, ys - pyoff)
 
+        color = None
         if self.arrow_heads:
             arrow_len = (lens/4.)
             xa1s = x0s - np.cos(rads+np.pi/4)*arrow_len
@@ -246,15 +247,14 @@ def get_data(self, element, ranges, style):
             x1s = np.concatenate([x1s, xa1s, xa2s])
             y0s = np.tile(y0s, 3)
             y1s = np.concatenate([y1s, ya1s, ya2s])
-            if cdim:
-                color = cdata.get(cdim.name)
-                color = np.tile(color, 3)
+            if cdim and cdim.name in cdata:
+                color = np.tile(cdata[cdim.name], 3)
         elif cdim:
             color = cdata.get(cdim.name)
 
         data = {'x0': x0s, 'x1': x1s, 'y0': y0s, 'y1': y1s}
         mapping = dict(x0='x0', x1='x1', y0='y0', y1='y1')
-        if cdim:
+        if cdim and color:
             data[cdim.name] = color
             mapping.update(cmapping)
 
@@ -737,7 +737,7 @@ def get_extents(self, element, ranges, range_type='combined'):
         ydim = element.vdims[0]
 
         # Compute stack heights
-        if self.stacked:
+        if self.stacked or self.stack_index:
             ds = Dataset(element)
             pos_range = ds.select(**{ydim.name: (0, None)}).aggregate(xdim, function=np.sum).range(ydim)
             neg_range = ds.select(**{ydim.name: (None, 0)}).aggregate(xdim, function=np.sum).range(ydim)
@@ -771,7 +771,7 @@ def _get_factors(self, element):
         sdim = None
         if element.ndims == 1:
             pass
-        elif not self.stacked:
+        elif not (self.stacked or self.stack_index):
             gdim = element.get_dimension(1)
         else:
             sdim = element.get_dimension(1)
@@ -798,7 +798,7 @@ def _get_axis_labels(self, *args, **kwargs):
         if self.batched:
             element = element.last
         xlabel = dim_axis_label(element.kdims[0])
-        if element.ndims > 1 and not self.stacked:
+        if element.ndims > 1 and not (self.stacked or self.stack_index):
             gdim = element.get_dimension(1)
         else:
             gdim = None
@@ -847,7 +847,7 @@ def _add_color_data(self, ds, ranges, style, cdim, data, mapping, factors, color
             isinstance(cmapper, CategoricalColorMapper)):
             mapping['legend'] = cdim.name
 
-        if not self.stacked and ds.ndims > 1:
+        if not (self.stacked or self.stack_index) and ds.ndims > 1:
             cmapping.pop('legend', None)
             mapping.pop('legend', None)
 
@@ -876,7 +876,7 @@ def get_data(self, element, ranges, style):
         group_dim, stack_dim = None, None
         if element.ndims == 1:
             grouping = None
-        elif self.stacked:
+        elif self.stacked or self.stack_index:
             grouping = 'stacked'
             stack_dim = element.get_dimension(1)
         else:
diff --git a/holoviews/tests/plotting/bokeh/testbarplot.py b/holoviews/tests/plotting/bokeh/testbarplot.py
index b7bad415f1..a907bd22db 100644
--- a/holoviews/tests/plotting/bokeh/testbarplot.py
+++ b/holoviews/tests/plotting/bokeh/testbarplot.py
@@ -234,7 +234,7 @@ def test_op_ndoverlay_value(self):
 
     def test_bars_color_index_color_clash(self):
         bars = Bars([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
-                    vdims=['y', 'color']).options(color='color', color_index='color')        
+                    vdims=['y', 'color']).options(color='color', color_index='color')
         with ParamLogStream() as log:
             plot = bokeh_renderer.get_plot(bars)
         log_msg = log.stream.read()
@@ -245,10 +245,10 @@ def test_bars_color_index_color_clash(self):
 
     def test_bars_color_index_color_no_clash(self):
         bars = Bars([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
-                    vdims=['y', 'color']).options(fill_color='color', color_index='color')        
+                    vdims=['y', 'color']).options(line_color='color', color_index='color')
         plot = bokeh_renderer.get_plot(bars)
         glyph = plot.handles['glyph']
-        cmapper = plot.handles['fill_color_color_mapper']
+        cmapper = plot.handles['line_color_color_mapper']
         cmapper2 = plot.handles['color_mapper']
-        self.assertEqual(glyph.fill_color, {'field': 'fill_color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper2})
+        self.assertEqual(glyph.line_color, {'field': 'line_color', 'transform': cmapper})
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper2})

From dfc62aef19f0adb06fd4027a0f053149c73bb871 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 20:21:06 +0000
Subject: [PATCH 050/117] Fixed bokeh tests

---
 holoviews/plotting/bokeh/hex_tiles.py           | 5 ++++-
 holoviews/tests/plotting/bokeh/testgraphplot.py | 2 --
 holoviews/tests/plotting/bokeh/testutils.py     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/holoviews/plotting/bokeh/hex_tiles.py b/holoviews/plotting/bokeh/hex_tiles.py
index 51c1a08f3e..024056cce4 100644
--- a/holoviews/plotting/bokeh/hex_tiles.py
+++ b/holoviews/plotting/bokeh/hex_tiles.py
@@ -48,7 +48,10 @@ def _process(self, element, key=None):
         xsize = ((x1-x0)/sx)*(2.0/3.0)
         ysize = ((y1-y0)/sy)*(2.0/3.0)
         size = xsize if self.orientation == 'flat' else ysize
-        scale = ysize/xsize
+        if isfinite(ysize) and isfinite(xsize) and not xsize == 0:
+            scale = ysize/xsize
+        else:
+            scale = 1
 
         # Compute hexagonal coordinates
         x, y = (element.dimension_values(i) for i in indexes)
diff --git a/holoviews/tests/plotting/bokeh/testgraphplot.py b/holoviews/tests/plotting/bokeh/testgraphplot.py
index ba3b23de9e..e949b285e6 100644
--- a/holoviews/tests/plotting/bokeh/testgraphplot.py
+++ b/holoviews/tests/plotting/bokeh/testgraphplot.py
@@ -131,8 +131,6 @@ def test_graph_nodes_numerically_colormapped(self):
         self.assertEqual(glyph.fill_color, {'field': 'Weight', 'transform': cmapper})
 
     def test_graph_edges_categorical_colormapped(self):
-        raise SkipTest('Temporarily disabled until array interface is simplified.')
-
         g = self.graph3.opts(plot=dict(edge_color_index='start'),
                              style=dict(edge_cmap=['#FFFFFF', '#000000']))
         plot = bokeh_renderer.get_plot(g)
diff --git a/holoviews/tests/plotting/bokeh/testutils.py b/holoviews/tests/plotting/bokeh/testutils.py
index 650466c45b..57f6bd53b3 100644
--- a/holoviews/tests/plotting/bokeh/testutils.py
+++ b/holoviews/tests/plotting/bokeh/testutils.py
@@ -4,8 +4,8 @@
 from holoviews.element.comparison import ComparisonTestCase
 
 try:
-    from holoviews.plotting.bokeh.util import (
-        expand_batched_style, filter_batched_data )
+    from holoviews.plotting.bokeh.util import filter_batched_data
+    from holoviews.plotting.bokeh.styles import expand_batched_style
     bokeh_renderer = Store.renderers['bokeh']
 except:
     bokeh_renderer = None

From 15230d1fbcd71f7df25cacce227a58ad8ace04f6 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 20:25:59 +0000
Subject: [PATCH 051/117] Fixes for matplotlib tests

---
 holoviews/plotting/mpl/__init__.py              | 6 +++---
 holoviews/plotting/mpl/graphs.py                | 2 +-
 holoviews/plotting/mpl/renderer.py              | 4 ++--
 holoviews/tests/plotting/matplotlib/testplot.py | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/holoviews/plotting/mpl/__init__.py b/holoviews/plotting/mpl/__init__.py
index ebde710c2e..a9169be487 100644
--- a/holoviews/plotting/mpl/__init__.py
+++ b/holoviews/plotting/mpl/__init__.py
@@ -224,10 +224,10 @@ def grid_selector(grid):
 if not config.style_17:
     options.Points = Options('plot', show_frame=True)
 
-options.ErrorBars = Options('style', ecolor='k')
+options.ErrorBars = Options('style', edgecolor='k')
 options.Spread = Options('style', facecolor=Cycle(), alpha=0.6, edgecolor='k', linewidth=0.5)
-options.Bars = Options('style', ec='k', color=Cycle())
-options.Histogram = Options('style', ec='k', facecolor=Cycle())
+options.Bars = Options('style', edgecolor='k', color=Cycle())
+options.Histogram = Options('style', edgecolor='k', facecolor=Cycle())
 options.Points = Options('style', color=Cycle(), marker='o', cmap=dflt_cmap)
 options.Scatter3D = Options('style', c=Cycle(), marker='o')
 options.Scatter3D = Options('plot', fig_size=150)
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 707bb2777f..3053bbbf50 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -88,7 +88,7 @@ def _compute_styles(self, element, ranges, style):
             style['edge_colors'] = [colors[v%len(colors)] for v in cvals]
             style.pop('edge_color', None)
         if 'edge_array' in style:
-            self._norm_kwargs(element, ranges, style, edge_cdim, 'edge_')
+            self._norm_kwargs(element, ranges, style, edge_cdim, prefix='edge_')
         else:
             style.pop('edge_cmap', None)
         if 'edge_vmin' in style:
diff --git a/holoviews/plotting/mpl/renderer.py b/holoviews/plotting/mpl/renderer.py
index 3e54be8282..2cf2112377 100644
--- a/holoviews/plotting/mpl/renderer.py
+++ b/holoviews/plotting/mpl/renderer.py
@@ -132,9 +132,9 @@ def show(self, obj):
                 plots.append(self.get_plot(o))
             plt.show()
         except:
-            MPLPlot._close_figures = True
             raise
-        MPLPlot._close_figures = True
+        finally:
+            MPLPlot._close_figures = True
         return plots[0] if len(plots) == 1 else plots
 
 
diff --git a/holoviews/tests/plotting/matplotlib/testplot.py b/holoviews/tests/plotting/matplotlib/testplot.py
index ee14e55990..3c3eb5a490 100644
--- a/holoviews/tests/plotting/matplotlib/testplot.py
+++ b/holoviews/tests/plotting/matplotlib/testplot.py
@@ -6,6 +6,7 @@
 
 try:
     import holoviews.plotting.mpl # noqa
+    import matplotlib.pyplot as plt
     mpl_renderer = Store.renderers['matplotlib']
 except:
     mpl_renderer = None
@@ -34,3 +35,4 @@ def setUp(self):
     def tearDown(self):
         Store.current_backend = self.previous_backend
         mpl_renderer.comm_manager = self.comm_manager
+        plt.close(plt.gcf())

From d68c09469cffecc458909f53c6754d78182d44a1 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 20:39:09 +0000
Subject: [PATCH 052/117] Fixed flake

---
 holoviews/tests/plotting/bokeh/testgraphplot.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/holoviews/tests/plotting/bokeh/testgraphplot.py b/holoviews/tests/plotting/bokeh/testgraphplot.py
index e949b285e6..422ad13701 100644
--- a/holoviews/tests/plotting/bokeh/testgraphplot.py
+++ b/holoviews/tests/plotting/bokeh/testgraphplot.py
@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from unittest import SkipTest
-
 import numpy as np
 from holoviews.core.data import Dataset
 from holoviews.element import Graph, Nodes, TriMesh, Chord, circular_layout

From a436a8b40d6725549f852b9412d94b70759f898e Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 21:22:58 +0000
Subject: [PATCH 053/117] Made plotting imports consistent

---
 holoviews/plotting/bokeh/__init__.py   |  2 +-
 holoviews/plotting/bokeh/annotation.py |  2 ++
 holoviews/plotting/bokeh/callbacks.py  |  2 ++
 holoviews/plotting/bokeh/chart.py      |  2 ++
 holoviews/plotting/bokeh/element.py    |  2 ++
 holoviews/plotting/bokeh/graphs.py     |  2 ++
 holoviews/plotting/bokeh/heatmap.py    |  2 ++
 holoviews/plotting/bokeh/hex_tiles.py  |  2 +-
 holoviews/plotting/bokeh/path.py       |  2 ++
 holoviews/plotting/bokeh/plot.py       |  2 ++
 holoviews/plotting/bokeh/raster.py     |  2 ++
 holoviews/plotting/bokeh/renderer.py   | 17 +++++++++--------
 holoviews/plotting/bokeh/sankey.py     |  2 ++
 holoviews/plotting/bokeh/stats.py      |  2 ++
 holoviews/plotting/bokeh/tabular.py    |  2 ++
 holoviews/plotting/bokeh/util.py       | 15 +++++++++------
 holoviews/plotting/bokeh/widgets.py    |  2 +-
 holoviews/plotting/mpl/__init__.py     |  2 ++
 holoviews/plotting/mpl/annotation.py   |  3 +++
 holoviews/plotting/mpl/chart.py        | 12 +++++-------
 holoviews/plotting/mpl/chart3d.py      |  8 ++++----
 holoviews/plotting/mpl/element.py      |  9 +++++----
 holoviews/plotting/mpl/graphs.py       |  2 ++
 holoviews/plotting/mpl/heatmap.py      |  2 ++
 holoviews/plotting/mpl/hex_tiles.py    |  2 ++
 holoviews/plotting/mpl/path.py         |  3 +++
 holoviews/plotting/mpl/plot.py         |  6 ++++--
 holoviews/plotting/mpl/raster.py       |  4 +++-
 holoviews/plotting/mpl/renderer.py     |  9 +++++----
 holoviews/plotting/mpl/sankey.py       |  7 +++++--
 holoviews/plotting/mpl/stats.py        |  3 ++-
 holoviews/plotting/mpl/tabular.py      |  6 +++++-
 holoviews/plotting/mpl/util.py         |  5 +++--
 holoviews/plotting/mpl/widgets.py      |  2 ++
 34 files changed, 102 insertions(+), 45 deletions(-)

diff --git a/holoviews/plotting/bokeh/__init__.py b/holoviews/plotting/bokeh/__init__.py
index 13fd9aa3ad..e4f8c15523 100644
--- a/holoviews/plotting/bokeh/__init__.py
+++ b/holoviews/plotting/bokeh/__init__.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, division, unicode_literals
 
 from distutils.version import LooseVersion
 
diff --git a/holoviews/plotting/bokeh/annotation.py b/holoviews/plotting/bokeh/annotation.py
index f212151f37..20d276b125 100644
--- a/holoviews/plotting/bokeh/annotation.py
+++ b/holoviews/plotting/bokeh/annotation.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from collections import defaultdict
 
 import param
diff --git a/holoviews/plotting/bokeh/callbacks.py b/holoviews/plotting/bokeh/callbacks.py
index 0156877114..428088eb19 100644
--- a/holoviews/plotting/bokeh/callbacks.py
+++ b/holoviews/plotting/bokeh/callbacks.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from collections import defaultdict
 
 import param
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 8ee7af8456..a898b40cd6 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from collections import defaultdict
 
 import numpy as np
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index f7d8c37273..27545bb698 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import warnings
 from types import FunctionType
 
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index f054eaf74b..d31679ff9e 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from collections import defaultdict
 
 import param
diff --git a/holoviews/plotting/bokeh/heatmap.py b/holoviews/plotting/bokeh/heatmap.py
index 762b550466..52b6001014 100644
--- a/holoviews/plotting/bokeh/heatmap.py
+++ b/holoviews/plotting/bokeh/heatmap.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 import numpy as np
 
diff --git a/holoviews/plotting/bokeh/hex_tiles.py b/holoviews/plotting/bokeh/hex_tiles.py
index 024056cce4..32a8a2fe99 100644
--- a/holoviews/plotting/bokeh/hex_tiles.py
+++ b/holoviews/plotting/bokeh/hex_tiles.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division, unicode_literals
 
 import param
 import numpy as np
diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index 39539c4f0b..b6ce88645b 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from collections import defaultdict
 
 import param
diff --git a/holoviews/plotting/bokeh/plot.py b/holoviews/plotting/bokeh/plot.py
index 437b4b42ff..4535b809a8 100644
--- a/holoviews/plotting/bokeh/plot.py
+++ b/holoviews/plotting/bokeh/plot.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import json
 from itertools import groupby
 from collections import defaultdict
diff --git a/holoviews/plotting/bokeh/raster.py b/holoviews/plotting/bokeh/raster.py
index a9e94e57c4..0632b07fe1 100644
--- a/holoviews/plotting/bokeh/raster.py
+++ b/holoviews/plotting/bokeh/raster.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import numpy as np
 import param
 
diff --git a/holoviews/plotting/bokeh/renderer.py b/holoviews/plotting/bokeh/renderer.py
index 7d01fd7d57..3bffa15739 100644
--- a/holoviews/plotting/bokeh/renderer.py
+++ b/holoviews/plotting/bokeh/renderer.py
@@ -1,19 +1,25 @@
-from io import BytesIO
+from __future__ import absolute_import, division, unicode_literals
+
 import base64
 import logging
 import signal
+from io import BytesIO
 
 import param
-from param.parameterized import bothmethod
-
 import bokeh
+
+from param.parameterized import bothmethod
 from bokeh.application.handlers import FunctionHandler
 from bokeh.application import Application
 from bokeh.document import Document
+from bokeh.embed.notebook import encode_utf8, notebook_content
 from bokeh.io import curdoc, show as bkshow
+from bokeh.io.notebook import load_notebook
 from bokeh.models import Model
+from bokeh.protocol import Protocol
 from bokeh.resources import CDN, INLINE
 from bokeh.server.server import Server
+from bokeh.themes.theme import Theme
 
 from ...core import Store, HoloMap
 from ..plot import Plot, GenericElementPlot
@@ -21,11 +27,6 @@
 from .widgets import BokehScrubberWidget, BokehSelectionWidget, BokehServerWidgets
 from .util import attach_periodic, compute_plot_size, bokeh_version
 
-from bokeh.io.notebook import load_notebook
-from bokeh.protocol import Protocol
-from bokeh.embed.notebook import encode_utf8, notebook_content
-from bokeh.themes.theme import Theme
-
 NOTEBOOK_DIV = """
 {plot_div}
 <script type="text/javascript">
diff --git a/holoviews/plotting/bokeh/sankey.py b/holoviews/plotting/bokeh/sankey.py
index 475e9d1400..ce4120177e 100644
--- a/holoviews/plotting/bokeh/sankey.py
+++ b/holoviews/plotting/bokeh/sankey.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 import numpy as np
 
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index 27a23c4345..b4739410ad 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from collections import defaultdict
 from functools import partial
 
diff --git a/holoviews/plotting/bokeh/tabular.py b/holoviews/plotting/bokeh/tabular.py
index 85d3921abe..9dd3ef664e 100644
--- a/holoviews/plotting/bokeh/tabular.py
+++ b/holoviews/plotting/bokeh/tabular.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 
 from bokeh.models import Column
diff --git a/holoviews/plotting/bokeh/util.py b/holoviews/plotting/bokeh/util.py
index 299f0f83ee..df5b7e04df 100644
--- a/holoviews/plotting/bokeh/util.py
+++ b/holoviews/plotting/bokeh/util.py
@@ -1,15 +1,17 @@
-import re, time, sys
+from __future__ import absolute_import, division, unicode_literals
+
+import re
+import time
+import sys
+import datetime as dt
+
 from distutils.version import LooseVersion
 from collections import defaultdict
 from contextlib import contextmanager
-import datetime as dt
-
-import numpy as np
 
 import param
 import bokeh
-
-bokeh_version = LooseVersion(bokeh.__version__)  # noqa
+import numpy as np
 
 from bokeh.core.json_encoder import serialize_json # noqa (API import)
 from bokeh.core.properties import value
@@ -35,6 +37,7 @@
 from ...core.spaces import get_nested_dmaps, DynamicMap
 from ..util import dim_axis_label
 
+bokeh_version = LooseVersion(bokeh.__version__)  # noqa
 
 
 def convert_timestamp(timestamp):
diff --git a/holoviews/plotting/bokeh/widgets.py b/holoviews/plotting/bokeh/widgets.py
index b62f3064d2..7e2a494dc1 100644
--- a/holoviews/plotting/bokeh/widgets.py
+++ b/holoviews/plotting/bokeh/widgets.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, unicode_literals
 
 import math
 import json
diff --git a/holoviews/plotting/mpl/__init__.py b/holoviews/plotting/mpl/__init__.py
index a9169be487..2ef5cf2644 100644
--- a/holoviews/plotting/mpl/__init__.py
+++ b/holoviews/plotting/mpl/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import os
 from distutils.version import LooseVersion
 
diff --git a/holoviews/plotting/mpl/annotation.py b/holoviews/plotting/mpl/annotation.py
index bc92e8600d..63639347b8 100644
--- a/holoviews/plotting/mpl/annotation.py
+++ b/holoviews/plotting/mpl/annotation.py
@@ -1,6 +1,9 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 import numpy as np
 import matplotlib
+
 from matplotlib import patches as patches
 
 from ...core.util import match_spec, basestring
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index 5498cb0199..efabc9d29d 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -1,18 +1,15 @@
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, unicode_literals
 
 from itertools import product
-from distutils.version import LooseVersion
 
+import param
 import numpy as np
 import matplotlib as mpl
+
 from matplotlib import cm
 from matplotlib.collections import LineCollection
 from matplotlib.dates import DateFormatter, date2num
 
-mpl_version = LooseVersion(mpl.__version__)
-
-import param
-
 from ...core import OrderedDict, Dimension
 from ...core.options import Store, abbreviated_exception
 from ...core.util import (
@@ -27,7 +24,8 @@
 from .element import ElementPlot, ColorbarPlot, LegendPlot
 from .path  import PathPlot
 from .plot import AdjoinedPlot, mpl_rc_context
-from .util import categorize_colors
+from .util import categorize_colors, mpl_version
+
 
 
 class ChartPlot(ElementPlot):
diff --git a/holoviews/plotting/mpl/chart3d.py b/holoviews/plotting/mpl/chart3d.py
index b22aa155c7..5e1d41a90e 100644
--- a/holoviews/plotting/mpl/chart3d.py
+++ b/holoviews/plotting/mpl/chart3d.py
@@ -1,8 +1,7 @@
-from distutils.version import LooseVersion
+from __future__ import absolute_import, division, unicode_literals
 
 import numpy as np
 import param
-import matplotlib as mpl
 import matplotlib.cm as cm
 
 from ...core import Dimension
@@ -10,6 +9,7 @@
 from ..util import map_colors
 from .element import ColorbarPlot
 from .chart import PointPlot
+from .util import mpl_version
 
 
 class Plot3D(ColorbarPlot):
@@ -77,7 +77,7 @@ def _finalize_axis(self, key, **kwargs):
         if self.disable_axes:
             axis.set_axis_off()
 
-        if LooseVersion(mpl.__version__) <= '1.5.9':
+        if mpl_version <= '1.5.9':
             axis.set_axis_bgcolor(self.bgcolor)
         else:
             axis.set_facecolor(self.bgcolor)
@@ -128,7 +128,7 @@ def get_data(self, element, ranges, style):
         # Temporary fix until color handling is deterministic in mpl+py3
         if not element.get_dimension(self.color_index) and 'c' in style:
             color = style.pop('c')
-            if LooseVersion(mpl.__version__) >= '1.5':
+            if mpl_version >= '1.5':
                 style['color'] = color
             else:
                 style['facecolors'] = color
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index a4a9bc0f79..0598fb8170 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -1,10 +1,12 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import math
 from types import FunctionType
 
 import param
 import numpy as np
-import matplotlib as mpl
 import matplotlib.colors as mpl_colors
+
 from matplotlib import ticker
 from matplotlib.dates import date2num
 
@@ -17,8 +19,7 @@
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import MPLPlot, mpl_rc_context
-from .util import wrap_formatter, is_color, categorize_colors
-from distutils.version import LooseVersion
+from .util import wrap_formatter, is_color, categorize_colors, mpl_version
 
 
 class ElementPlot(GenericElementPlot, MPLPlot):
@@ -117,7 +118,7 @@ def _finalize_axis(self, key, element=None, title=None, dimensions=None, ranges=
         subplots = list(self.subplots.values()) if self.subplots else []
         if self.zorder == 0 and key is not None:
             if self.bgcolor:
-                if LooseVersion(mpl.__version__) <= '1.5.9':
+                if mpl_version <= '1.5.9':
                     axis.set_axis_bgcolor(self.bgcolor)
                 else:
                     axis.set_facecolor(self.bgcolor)
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 3053bbbf50..44b65eda09 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 import numpy as np
 
diff --git a/holoviews/plotting/mpl/heatmap.py b/holoviews/plotting/mpl/heatmap.py
index d4a0ffdbd2..59f88590de 100644
--- a/holoviews/plotting/mpl/heatmap.py
+++ b/holoviews/plotting/mpl/heatmap.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from itertools import product
 
 import numpy as np
diff --git a/holoviews/plotting/mpl/hex_tiles.py b/holoviews/plotting/mpl/hex_tiles.py
index 043b9eb595..b511580c1e 100644
--- a/holoviews/plotting/mpl/hex_tiles.py
+++ b/holoviews/plotting/mpl/hex_tiles.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 import numpy as np
 
diff --git a/holoviews/plotting/mpl/path.py b/holoviews/plotting/mpl/path.py
index cd4ebcc317..b01fc3b359 100644
--- a/holoviews/plotting/mpl/path.py
+++ b/holoviews/plotting/mpl/path.py
@@ -1,5 +1,8 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 import numpy as np
+
 from matplotlib.collections import PatchCollection, LineCollection
 
 from ...core import util
diff --git a/holoviews/plotting/mpl/plot.py b/holoviews/plotting/mpl/plot.py
index 3d8a68ccf3..fb25916797 100644
--- a/holoviews/plotting/mpl/plot.py
+++ b/holoviews/plotting/mpl/plot.py
@@ -1,14 +1,16 @@
-from __future__ import division
+from __future__ import absolute_import, division, unicode_literals
 
 from itertools import chain
 from contextlib import contextmanager
 
+import param
 import numpy as np
 import matplotlib as mpl
+
 from mpl_toolkits.mplot3d import Axes3D  # noqa (For 3D plots)
 from matplotlib import pyplot as plt
 from matplotlib import gridspec, animation
-import param
+
 from ...core import (OrderedDict, HoloMap, AdjointLayout, NdLayout,
                      GridSpace, Element, CompositeOverlay, Empty,
                      Collator, GridMatrix, Layout)
diff --git a/holoviews/plotting/mpl/raster.py b/holoviews/plotting/mpl/raster.py
index 0c3ac20e9a..701173be8d 100644
--- a/holoviews/plotting/mpl/raster.py
+++ b/holoviews/plotting/mpl/raster.py
@@ -1,5 +1,7 @@
-import numpy as np
+from __future__ import absolute_import, division, unicode_literals
+
 import param
+import numpy as np
 
 from ...core import CompositeOverlay, Element
 from ...core import traversal
diff --git a/holoviews/plotting/mpl/renderer.py b/holoviews/plotting/mpl/renderer.py
index 2cf2112377..10e864564b 100644
--- a/holoviews/plotting/mpl/renderer.py
+++ b/holoviews/plotting/mpl/renderer.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import os
 import sys
 import base64
@@ -5,16 +7,15 @@
 from tempfile import NamedTemporaryFile
 from contextlib import contextmanager
 from itertools import chain
-from distutils.version import LooseVersion
 
+import param
 import matplotlib as mpl
+
 from matplotlib import pyplot as plt
 from param.parameterized import bothmethod
 
-import param
 from ...core import HoloMap
 from ...core.options import Store
-
 from ..renderer import Renderer, MIME_TYPES, HTML_TAGS
 from .widgets import MPLSelectionWidget, MPLScrubberWidget
 from .util import get_tight_bbox, mpl_version
@@ -40,7 +41,7 @@ class OutputWarning(param.Parameterized):pass
     'scrubber': ('html', None, {'fps': 5}, None)
 }
 
-if LooseVersion(mpl.__version__) >= '2.2':
+if mpl_version >= '2.2':
     ANIMATION_OPTS['gif'] = ('pillow', 'gif', {'fps': 10}, [])
 
 
diff --git a/holoviews/plotting/mpl/sankey.py b/holoviews/plotting/mpl/sankey.py
index 2958968c65..9a3baed705 100644
--- a/holoviews/plotting/mpl/sankey.py
+++ b/holoviews/plotting/mpl/sankey.py
@@ -1,10 +1,13 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 
-from ...core.util import basestring, max_range
-from .graphs import GraphPlot
 from matplotlib.patches import Rectangle
 from matplotlib.collections import PatchCollection
 
+from ...core.util import basestring, max_range
+from .graphs import GraphPlot
+
 
 class SankeyPlot(GraphPlot):
 
diff --git a/holoviews/plotting/mpl/stats.py b/holoviews/plotting/mpl/stats.py
index 3475f14263..fea21126a8 100644
--- a/holoviews/plotting/mpl/stats.py
+++ b/holoviews/plotting/mpl/stats.py
@@ -1,7 +1,8 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import param
 import numpy as np
 
-
 from ...core.ndmapping import sorted_context
 from .chart import AreaPlot, ChartPlot
 from .path import PolygonPlot
diff --git a/holoviews/plotting/mpl/tabular.py b/holoviews/plotting/mpl/tabular.py
index a2a9fccf6a..0245182d95 100644
--- a/holoviews/plotting/mpl/tabular.py
+++ b/holoviews/plotting/mpl/tabular.py
@@ -1,7 +1,11 @@
+from __future__ import absolute_import, division, unicode_literals
+
 from collections import defaultdict
+
+import param
+
 from matplotlib.font_manager import FontProperties
 from matplotlib.table import Table as mpl_Table
-import param
 
 from .element import ElementPlot
 from .plot import mpl_rc_context
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index a06e829065..e9b8d4b5bf 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import re
 import warnings
 from distutils.version import LooseVersion
@@ -9,12 +11,11 @@
 from matplotlib.patches import Path, PathPatch
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 
-mpl_version = LooseVersion(matplotlib.__version__)  # noqa
-
 from ...core.util import basestring, _getargspec
 from ...element import Raster, RGB, Polygons
 from ..util import COLOR_ALIASES, RGB_HEX_REGEX
 
+mpl_version = LooseVersion(matplotlib.__version__)
 
 def is_color(color):
     """
diff --git a/holoviews/plotting/mpl/widgets.py b/holoviews/plotting/mpl/widgets.py
index 0d3001cf42..97a27faf59 100644
--- a/holoviews/plotting/mpl/widgets.py
+++ b/holoviews/plotting/mpl/widgets.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, unicode_literals
+
 import json
 import param
 

From a514bb3028588bee01173da1044c41b32bbf2e10 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 21:41:57 +0000
Subject: [PATCH 054/117] Fixed py2 handling of LooseVersion

---
 holoviews/core/data/pandas.py        |  6 ++---
 holoviews/core/util.py               | 39 ++++++++++++++--------------
 holoviews/operation/datashader.py    |  7 +++--
 holoviews/plotting/bokeh/__init__.py |  4 +--
 holoviews/plotting/bokeh/util.py     |  5 ++--
 holoviews/plotting/mpl/__init__.py   |  3 +--
 holoviews/plotting/mpl/util.py       |  3 +--
 holoviews/tests/teststreams.py       |  3 +--
 8 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/holoviews/core/data/pandas.py b/holoviews/core/data/pandas.py
index ba4c050fbf..8d0f8e5c22 100644
--- a/holoviews/core/data/pandas.py
+++ b/holoviews/core/data/pandas.py
@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from distutils.version import LooseVersion
-
 try:
     import itertools.izip as zip
 except ImportError:
@@ -156,7 +154,7 @@ def range(cls, dataset, dimension):
         column = dataset.data[dataset.get_dimension(dimension, strict=True).name]
         if column.dtype.kind == 'O':
             if (not isinstance(dataset.data, pd.DataFrame) or
-                        LooseVersion(pd.__version__) < '0.17.0'):
+                util.LooseVersion(pd.__version__) < '0.17.0'):
                 column = column.sort(inplace=False)
             else:
                 column = column.sort_values()
@@ -252,7 +250,7 @@ def sort(cls, dataset, by=[], reverse=False):
         cols = [dataset.get_dimension(d, strict=True).name for d in by]
 
         if (not isinstance(dataset.data, pd.DataFrame) or
-            LooseVersion(pd.__version__) < '0.17.0'):
+            util.LooseVersion(pd.__version__) < '0.17.0'):
             return dataset.data.sort(columns=cols, ascending=not reverse)
         return dataset.data.sort_values(by=cols, ascending=not reverse)
 
diff --git a/holoviews/core/util.py b/holoviews/core/util.py
index a9491fec7a..f7220b9d24 100644
--- a/holoviews/core/util.py
+++ b/holoviews/core/util.py
@@ -10,7 +10,7 @@
 from collections import defaultdict
 from functools import partial
 from contextlib import contextmanager
-from distutils.version import LooseVersion
+from distutils.version import LooseVersion as _LooseVersion
 
 from threading import Thread, Event
 import numpy as np
@@ -28,14 +28,28 @@
 except:
    import builtins as builtins   # noqa (compatibility)
 
-try:
-    # Python 3
+# Python3 compatibility
+if sys.version_info.major >= 3:
+    basestring = str
+    unicode = str
+    long = int
+    generator_types = (zip, range, types.GeneratorType)
+    RecursionError = RecursionError if sys.version_info.minor > 4 else RuntimeError # noqa
     _getargspec = inspect.getfullargspec
     get_keywords = operator.attrgetter('varkw')
-except AttributeError:
-    # Python 2
+    LooseVersion = _LooseVersion
+else:
+    basestring = basestring
+    unicode = unicode
+    from itertools import izip
+    generator_types = (izip, xrange, types.GeneratorType) # noqa
+    RecursionError = RuntimeError
     _getargspec = inspect.getargspec
     get_keywords = operator.attrgetter('keywords')
+    def LooseVersion(obj):
+        if isinstance(obj, unicode):
+            obj = str(obj)
+        return _LooseVersion(obj)
 
 numpy_version = LooseVersion(np.__version__)
 param_version = LooseVersion(param.__version__)
@@ -251,21 +265,6 @@ def deephash(obj):
         return None
 
 
-# Python3 compatibility
-if sys.version_info.major >= 3:
-    basestring = str
-    unicode = str
-    long = int
-    generator_types = (zip, range, types.GeneratorType)
-    RecursionError = RecursionError if sys.version_info.minor > 4 else RuntimeError # noqa
-else:
-    basestring = basestring
-    unicode = unicode
-    from itertools import izip
-    generator_types = (izip, xrange, types.GeneratorType) # noqa
-    RecursionError = RuntimeError
-
-
 def argspec(callable_obj):
     """
     Returns an ArgSpec object for functions, staticmethods, instance
diff --git a/holoviews/operation/datashader.py b/holoviews/operation/datashader.py
index aa44cc4de3..af671ec549 100644
--- a/holoviews/operation/datashader.py
+++ b/holoviews/operation/datashader.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, division
 
 from collections import Callable, Iterable
-from distutils.version import LooseVersion
 import warnings
 
 import param
@@ -14,8 +13,6 @@
 import dask.dataframe as dd
 from param.parameterized import bothmethod
 
-ds_version = LooseVersion(ds.__version__)
-
 try:
     from datashader.bundling import (directly_connect_edges as connect_edges,
                                      hammer_bundle)
@@ -26,10 +23,12 @@
                     CompositeOverlay, Dataset, Overlay)
 from ..core.data import PandasInterface, XArrayInterface
 from ..core.sheetcoords import BoundingBox
-from ..core.util import get_param_values, basestring, datetime_types, dt_to_int
+from ..core.util import LooseVersion, get_param_values, basestring, datetime_types, dt_to_int
 from ..element import (Image, Path, Curve, RGB, Graph, TriMesh, QuadMesh, Contours)
 from ..streams import RangeXY, PlotSize
 
+ds_version = LooseVersion(ds.__version__)
+
 
 class LinkableOperation(Operation):
     """
diff --git a/holoviews/plotting/bokeh/__init__.py b/holoviews/plotting/bokeh/__init__.py
index e4f8c15523..548b126057 100644
--- a/holoviews/plotting/bokeh/__init__.py
+++ b/holoviews/plotting/bokeh/__init__.py
@@ -1,7 +1,5 @@
 from __future__ import absolute_import, division, unicode_literals
 
-from distutils.version import LooseVersion
-
 import numpy as np
 import bokeh
 from bokeh.palettes import all_palettes
@@ -16,7 +14,7 @@
                         Graph, Nodes, EdgePaths, Distribution, Bivariate,
                         TriMesh, Violin, Chord, Div, HexTiles, Labels, Sankey)
 from ...core.options import Options, Cycle, Palette
-from ...core.util import VersionError
+from ...core.util import LooseVersion, VersionError
 
 if LooseVersion(bokeh.__version__) < '0.12.10':
     raise VersionError("The bokeh extension requires a bokeh version >=0.12.10, "
diff --git a/holoviews/plotting/bokeh/util.py b/holoviews/plotting/bokeh/util.py
index df5b7e04df..199e8bf5e2 100644
--- a/holoviews/plotting/bokeh/util.py
+++ b/holoviews/plotting/bokeh/util.py
@@ -5,7 +5,6 @@
 import sys
 import datetime as dt
 
-from distutils.version import LooseVersion
 from collections import defaultdict
 from contextlib import contextmanager
 
@@ -32,8 +31,8 @@
     Chart = type(None) # Create stub for isinstance check
 
 from ...core.overlay import Overlay
-from ...core.util import (basestring, unique_array, callable_name, pd,
-                          dt64_to_dt, _getargspec)
+from ...core.util import (LooseVersion, _getargspec, basestring,
+                          callable_name, dt64_to_dt, pd, unique_array)
 from ...core.spaces import get_nested_dmaps, DynamicMap
 from ..util import dim_axis_label
 
diff --git a/holoviews/plotting/mpl/__init__.py b/holoviews/plotting/mpl/__init__.py
index 2ef5cf2644..d48bacb901 100644
--- a/holoviews/plotting/mpl/__init__.py
+++ b/holoviews/plotting/mpl/__init__.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, division, unicode_literals
 
 import os
-from distutils.version import LooseVersion
 
 from matplotlib import rc_params_from_file
 from matplotlib.colors import ListedColormap
@@ -9,7 +8,7 @@
 from ...core import Layout, Collator, GridMatrix, config
 from ...core.options import Cycle, Palette, Options
 from ...core.overlay import NdOverlay, Overlay
-from ...core.util import pd
+from ...core.util import LooseVersion, pd
 from ...element import * # noqa (API import)
 from ..plot import PlotSelector
 from .annotation import * # noqa (API import)
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index e9b8d4b5bf..535269bf6b 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -2,7 +2,6 @@
 
 import re
 import warnings
-from distutils.version import LooseVersion
 
 import numpy as np
 import matplotlib
@@ -11,7 +10,7 @@
 from matplotlib.patches import Path, PathPatch
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 
-from ...core.util import basestring, _getargspec
+from ...core.util import LooseVersion, _getargspec, basestring
 from ...element import Raster, RGB, Polygons
 from ..util import COLOR_ALIASES, RGB_HEX_REGEX
 
diff --git a/holoviews/tests/teststreams.py b/holoviews/tests/teststreams.py
index 619f4822df..d9568c069a 100644
--- a/holoviews/tests/teststreams.py
+++ b/holoviews/tests/teststreams.py
@@ -2,12 +2,11 @@
 Unit test of the streams system
 """
 from collections import defaultdict
-from distutils.version import LooseVersion
 from unittest import SkipTest
 
 import param
 from holoviews.core.spaces import DynamicMap
-from holoviews.core.util import pd
+from holoviews.core.util import LooseVersion, pd
 from holoviews.element import Points
 from holoviews.element.comparison import ComparisonTestCase
 from holoviews.streams import * # noqa (Test all available streams)

From f00860c381a411263b79b22f1606111a3e1e60d2 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sat, 17 Nov 2018 22:10:38 +0000
Subject: [PATCH 055/117] Fixed LooseVersion

---
 holoviews/core/util.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/holoviews/core/util.py b/holoviews/core/util.py
index f7220b9d24..951e39a376 100644
--- a/holoviews/core/util.py
+++ b/holoviews/core/util.py
@@ -33,6 +33,7 @@
     basestring = str
     unicode = str
     long = int
+    cmp = lambda a, b: (a>b)-(a<b)
     generator_types = (zip, range, types.GeneratorType)
     RecursionError = RecursionError if sys.version_info.minor > 4 else RuntimeError # noqa
     _getargspec = inspect.getfullargspec
@@ -46,10 +47,20 @@
     RecursionError = RuntimeError
     _getargspec = inspect.getargspec
     get_keywords = operator.attrgetter('keywords')
-    def LooseVersion(obj):
-        if isinstance(obj, unicode):
-            obj = str(obj)
-        return _LooseVersion(obj)
+
+    class LooseVersion(_LooseVersion):
+
+        def __init__ (self, vstring=None):
+            if isinstance(vstring, unicode):
+                vstring = str(vstring)
+            self.parse(vstring)
+
+        def __cmp__(self, other):
+            if isinstance(other, unicode):
+                other = str(other)
+            if isinstance(other, basestring):
+                other = LooseVersion(other)
+            return cmp(self.version, other.version)
 
 numpy_version = LooseVersion(np.__version__)
 param_version = LooseVersion(param.__version__)

From b95c018c7804126813065a369bd28adf3d8a10ff Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 18 Nov 2018 14:06:08 +0000
Subject: [PATCH 056/117] Added unit tests for updating matplotlib chart styles

---
 holoviews/plotting/mpl/chart.py               | 49 +++++++++------
 holoviews/plotting/mpl/element.py             |  2 +-
 .../plotting/matplotlib/testerrorbarplot.py   | 41 ++++++++++---
 .../tests/plotting/matplotlib/testlabels.py   | 60 ++++++++++++++++++-
 .../plotting/matplotlib/testpointplot.py      | 57 ++++++++++++++++++
 .../plotting/matplotlib/testspikeplot.py      | 56 ++++++++++++++---
 .../matplotlib/testvectorfieldplot.py         | 56 ++++++++++++++++-
 7 files changed, 285 insertions(+), 36 deletions(-)

diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index efabc9d29d..bd78ee2a12 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -112,7 +112,7 @@ class ErrorPlot(ColorbarPlot):
     plot option.
     """
 
-    style_opts = ['ecolor', 'elinewidth', 'capsize', 'capthick',
+    style_opts = ['edgecolor', 'elinewidth', 'capsize', 'capthick',
                   'barsabove', 'lolims', 'uplims', 'xlolims',
                   'errorevery', 'xuplims', 'alpha', 'linestyle',
                   'linewidth', 'markeredgecolor', 'markeredgewidth',
@@ -139,6 +139,8 @@ def get_data(self, element, ranges, style):
         color = style.get('color')
         if isinstance(color, np.ndarray):
             style['ecolor'] = color
+        if 'edgecolor' in style:
+            style['ecolor'] = style.pop('edgecolor')
         c = style.get('c')
         if isinstance(c, np.ndarray):
             with abbreviated_exception():
@@ -186,15 +188,17 @@ def update_handles(self, key, axis, element, ranges, style):
             new_arrays = [np.array([[xs[i], bys[i]], [xs[i], tys[i]]])
                           for i in range(samples)]
         verts.set_paths(new_arrays)
-        if 'ecolor' in style:
-            verts.set_edgecolors(style['ecolor'])
-
         if bottoms:
             bottoms.set_xdata(bxs)
             bottoms.set_ydata(bys)
         if tops:
             tops.set_xdata(txs)
             tops.set_ydata(tys)
+        if 'ecolor' in style:
+            verts.set_edgecolors(style['ecolor'])
+        if 'linewidth' in style:
+            verts.set_linewidths(style['linewidth'])
+
         return axis_kwargs
 
 
@@ -657,16 +661,16 @@ def update_handles(self, key, axis, element, ranges, style):
         paths = self.handles['artist']
         (xs, ys), style, _ = self.get_data(element, ranges, style)
         paths.set_offsets(np.column_stack([xs, ys]))
-        sdim = element.get_dimension(self.size_index)
-        if sdim:
+        if 's' in style:
             paths.set_sizes(style['s'])
-
-        cdim = element.get_dimension(self.color_index)
-        if cdim:
+        if 'vmin' in style:
             paths.set_clim((style['vmin'], style['vmax']))
+        if 'c' in style:
             paths.set_array(style['c'])
-            if 'norm' in style:
-                paths.norm = style['norm']
+        if 'norm' in style:
+            paths.norm = style['norm']
+        if 'linewidth' in style:
+            paths.set_linewidths(style['linewidth'])
 
 
 
@@ -751,7 +755,7 @@ def get_data(self, element, ranges, style):
             cdim = None
         if cdim:
             colors = element.dimension_values(self.color_index)
-            args += (colors,)
+            style['c'] = colors
             cdim = element.get_dimension(self.color_index)
             self._norm_kwargs(element, ranges, style, cdim)
             style.pop('color', None)
@@ -780,9 +784,15 @@ def update_handles(self, key, axis, element, ranges, style):
         quiver.set_offsets(np.column_stack(args[:2]))
         quiver.U = args[2]
         quiver.angles = style['angles']
-        if self.color_index:
-            quiver.set_array(args[-1])
+        if 'color' in style:
+            quiver.set_facecolors(style['color'])
+            quiver.set_edgecolors(style['color'])
+        if 'array' in style:
+            quiver.set_array(style['array'])
+        if 'clim' in style:
             quiver.set_clim(style['clim'])
+        if 'linewidth' in style:
+            quiver.set_linewidths(style['linewidth'])
         return axis_kwargs
 
 
@@ -1122,11 +1132,16 @@ def update_handles(self, key, axis, element, ranges, style):
         (data,), kwargs, axis_kwargs = self.get_data(element, ranges, style)
         artist.set_paths(data)
         artist.set_visible(style.get('visible', True))
+        if 'color' in kwargs:
+            artist.set_edgecolors(kwargs['color'])
         if 'array' in kwargs or 'c' in kwargs:
-            artist.set_clim((kwargs['vmin'], kwargs['vmax']))
             artist.set_array(kwargs.get('array', kwargs.get('c')))
-            if 'norm' in kwargs:
-                artist.norm = kwargs['norm']
+        if 'vmin' in kwargs:
+            artist.set_clim((kwargs['vmin'], kwargs['vmax']))
+        if 'norm' in kwargs:
+            artist.norm = kwargs['norm']
+        if 'linewidth' in kwargs:
+            artist.set_linewidths(kwargs['linewidth'])
         return axis_kwargs
 
 
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 0598fb8170..b03b076e6a 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -568,7 +568,7 @@ def _apply_ops(self, element, ranges, style):
             prefix = '' if group is None else group+'_'
             if k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray) and all(not is_color(c) for c in val):
                 new_style.pop(k)
-                self._norm_kwargs(element, ranges, new_style, v.dimension, val)
+                self._norm_kwargs(element, ranges, new_style, v.dimension, val, prefix)
                 if val.dtype.kind in 'OSUM':
                     val = categorize_colors(val)
                 k = prefix+'c'
diff --git a/holoviews/tests/plotting/matplotlib/testerrorbarplot.py b/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
index 1236735c41..655ff6a998 100644
--- a/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
+++ b/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
@@ -1,5 +1,6 @@
 import numpy as np
 
+from holoviews.core.spaces import HoloMap
 from holoviews.element import ErrorBars
 from holoviews.plotting.util import hex2rgb
 
@@ -21,6 +22,21 @@ def test_errorbars_color_op(self):
         self.assertEqual(artist.get_edgecolors(),
                          np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
 
+    def test_errorbars_color_op_update(self):
+        errorbars = HoloMap({
+            0: ErrorBars([(0, 0, 0.1, 0.2, '#000000'), (0, 1, 0.2, 0.4, '#FF0000'),
+                          (0, 2, 0.6, 1.2, '#00FF00')], vdims=['y', 'perr', 'nerr', 'color']),
+            1: ErrorBars([(0, 0, 0.1, 0.2, '#FF0000'), (0, 1, 0.2, 0.4, '#00FF00'),
+                          (0, 2, 0.6, 1.2, '#0000FF')], vdims=['y', 'perr', 'nerr', 'color'])
+        }).options(color='color')
+        plot = mpl_renderer.get_plot(errorbars)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_edgecolors(),
+                         np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
+        plot.update((1,))
+        self.assertEqual(artist.get_edgecolors(),
+                         np.array([[1, 0, 0, 1], [0, 1, 0, 1], [0, 0, 1, 1]]))
+
     def test_errorbars_linear_color_op(self):
         errorbars = ErrorBars([(0, 0, 0.1, 0.2, 0), (0, 1, 0.2, 0.4, 1), (0, 2, 0.6, 1.2, 2)],
                               vdims=['y', 'perr', 'nerr', 'color']).options(color='color')
@@ -35,12 +51,12 @@ def test_errorbars_categorical_color_op(self):
 
     def test_errorbars_line_color_op(self):
         errorbars = ErrorBars([(0, 0, 0.1, 0.2, '#000000'), (0, 1, 0.2, 0.4, '#FF0000'), (0, 2, 0.6, 1.2, '#00FF00')],
-                              vdims=['y', 'perr', 'nerr', 'color']).options(ecolor='color')
+                              vdims=['y', 'perr', 'nerr', 'color']).options(edgecolor='color')
         plot = mpl_renderer.get_plot(errorbars)
         artist = plot.handles['artist']
-        children = artist.get_children()
-        for c, w in zip(children, ['#000000', '#FF0000', '#00FF00']):
-            self.assertEqual(c.get_edgecolor(), tuple(c/255. for c in hex2rgb(w))+(1,))
+        self.assertEqual(artist.get_edgecolors(), np.array([
+            [0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]
+        ))
 
     def test_errorbars_alpha_op(self):
         errorbars = ErrorBars([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -53,6 +69,17 @@ def test_errorbars_line_width_op(self):
                               vdims=['y', 'perr', 'nerr', 'line_width']).options(linewidth='line_width')
         plot = mpl_renderer.get_plot(errorbars)
         artist = plot.handles['artist']
-        children = artist.get_children()
-        for c, w in zip(children, np.array([1, 4, 8])):
-            self.assertEqual(c.get_linewidth(), w)
+        self.assertEqual(artist.get_linewidths(), [1, 4, 8])
+
+    def test_errorbars_line_width_op_update(self):
+        errorbars = HoloMap({
+            0: ErrorBars([(0, 0, 0.1, 0.2, 1), (0, 1, 0.2, 0.4, 4),
+                          (0, 2, 0.6, 1.2, 8)], vdims=['y', 'perr', 'nerr', 'line_width']),
+            1: ErrorBars([(0, 0, 0.1, 0.2, 2), (0, 1, 0.2, 0.4, 6),
+                          (0, 2, 0.6, 1.2, 4)], vdims=['y', 'perr', 'nerr', 'line_width'])
+        }).options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(errorbars)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [1, 4, 8])
+        plot.update((1,))
+        self.assertEqual(artist.get_linewidths(), [2, 6, 4])
diff --git a/holoviews/tests/plotting/matplotlib/testlabels.py b/holoviews/tests/plotting/matplotlib/testlabels.py
index d509a1ae77..2b7eb0a1bb 100644
--- a/holoviews/tests/plotting/matplotlib/testlabels.py
+++ b/holoviews/tests/plotting/matplotlib/testlabels.py
@@ -1,6 +1,7 @@
 import numpy as np
 
 from holoviews.core.dimension import Dimension
+from holoviews.core.spaces import HoloMap
 from holoviews.element import Labels
 
 from .testplot import TestMPLPlot, mpl_renderer
@@ -73,6 +74,21 @@ def test_label_color_op(self):
         self.assertEqual([a.get_color() for a in artist],
                          ['#000000', '#FF0000', '#00FF00'])
 
+    def test_label_color_op_update(self):
+        labels = HoloMap({
+            0: Labels([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                      vdims='color'),
+            1: Labels([(0, 0, '#FF0000'), (0, 1, '#00FF00'), (0, 2, '#0000FF')],
+                      vdims='color')}).options(color='color')
+        plot = mpl_renderer.get_plot(labels)
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_color() for a in artist],
+                         ['#000000', '#FF0000', '#00FF00'])
+        plot.update((1,))
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_color() for a in artist],
+                         ['#FF0000', '#00FF00', '#0000FF'])
+        
     def test_label_linear_color_op(self):
         labels = Labels([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
                         vdims='color').options(color='color')
@@ -90,7 +106,19 @@ def test_label_size_op(self):
                         vdims='size').options(size='size')
         plot = mpl_renderer.get_plot(labels)
         artist = plot.handles['artist']
-        self.assertEqual([a.get_fontsize() for a in artist], [8, 12, 6])
+
+    def test_label_size_op_update(self):
+        labels = HoloMap({
+            0: Labels([(0, 0, 8), (0, 1, 6), (0, 2, 12)],
+                      vdims='size'),
+            1: Labels([(0, 0, 9), (0, 1, 4), (0, 2, 3)],
+                      vdims='size')}).options(size='size')
+        plot = mpl_renderer.get_plot(labels)
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_fontsize() for a in artist], [8, 6, 12])
+        plot.update((1,))
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_fontsize() for a in artist], [9, 4, 3])
 
     def test_label_alpha_op(self):
         labels = Labels([(0, 0, 0), (0, 1, 0.2), (0, 2, 0.7)],
@@ -100,6 +128,21 @@ def test_label_alpha_op(self):
         self.assertEqual([a.get_alpha() for a in artist],
                          [0, 0.2, 0.7])
 
+    def test_label_alpha_op_update(self):
+        labels = HoloMap({
+            0: Labels([(0, 0, 0.3), (0, 1, 1), (0, 2, 0.6)],
+                      vdims='alpha'),
+            1: Labels([(0, 0, 0.6), (0, 1, 0.1), (0, 2, 1)],
+                      vdims='alpha')}).options(alpha='alpha')
+        plot = mpl_renderer.get_plot(labels)
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_alpha() for a in artist],
+                         [0.3, 1, 0.6])
+        plot.update((1,))
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_alpha() for a in artist],
+                         [0.6, 0.1, 1])
+
     def test_label_rotation_op(self):
         labels = Labels([(0, 0, 90), (0, 1, 180), (0, 2, 270)],
                         vdims='rotation').options(rotation='rotation')
@@ -107,3 +150,18 @@ def test_label_rotation_op(self):
         artist = plot.handles['artist']
         self.assertEqual([a.get_rotation() for a in artist],
                          [90, 180, 270])
+
+    def test_label_rotation_op_update(self):
+        labels = HoloMap({
+            0: Labels([(0, 0, 45), (0, 1, 180), (0, 2, 90)],
+                      vdims='rotation'),
+            1: Labels([(0, 0, 30), (0, 1, 120), (0, 2, 60)],
+                      vdims='rotation')}).options(rotation='rotation')
+        plot = mpl_renderer.get_plot(labels)
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_rotation() for a in artist],
+                         [45, 180, 90])
+        plot.update((1,))
+        artist = plot.handles['artist']
+        self.assertEqual([a.get_rotation() for a in artist],
+                         [30, 120, 60])
diff --git a/holoviews/tests/plotting/matplotlib/testpointplot.py b/holoviews/tests/plotting/matplotlib/testpointplot.py
index 93477ed971..8b40fa0c60 100644
--- a/holoviews/tests/plotting/matplotlib/testpointplot.py
+++ b/holoviews/tests/plotting/matplotlib/testpointplot.py
@@ -1,6 +1,7 @@
 import numpy as np
 
 from holoviews.core.overlay import NdOverlay
+from holoviews.core.spaces import HoloMap
 from holoviews.element import Points
 
 from .testplot import TestMPLPlot, mpl_renderer
@@ -164,6 +165,17 @@ def test_point_color_op(self):
         self.assertEqual(artist.get_facecolors(),
                          np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
 
+    def test_point_color_op_update(self):
+        points = HoloMap({0: Points([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                                    vdims='color'),
+                          1: Points([(0, 0, '#0000FF'), (0, 1, '#00FF00'), (0, 2, '#FF0000')],
+                                    vdims='color')}).options(color='color')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        plot.update((1,))
+        self.assertEqual(artist.get_facecolors(),
+                         np.array([[0, 0, 1, 1], [0, 1, 0, 1], [1, 0, 0, 1]]))
+
     def test_point_line_color_op(self):
         points = Points([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
                         vdims='color').options(edgecolors='color')
@@ -172,6 +184,17 @@ def test_point_line_color_op(self):
         self.assertEqual(artist.get_edgecolors(),
                          np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
 
+    def test_point_line_color_op_update(self):
+        points = HoloMap({0: Points([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                                    vdims='color'),
+                          1: Points([(0, 0, '#0000FF'), (0, 1, '#00FF00'), (0, 2, '#FF0000')],
+                                    vdims='color')}).options(edgecolors='color')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        plot.update((1,))
+        self.assertEqual(artist.get_edgecolors(),
+                         np.array([[0, 0, 1, 1], [0, 1, 0, 1], [1, 0, 0, 1]]))
+
     def test_point_fill_color_op(self):
         points = Points([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
                         vdims='color').options(facecolors='color')
@@ -188,6 +211,18 @@ def test_point_linear_color_op(self):
         self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
         self.assertEqual(artist.get_clim(), (0, 2))
 
+    def test_point_linear_color_op_update(self):
+        points = HoloMap({0: Points([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
+                                    vdims='color'),
+                          1: Points([(0, 0, 2.5), (0, 1, 3), (0, 2, 1.2)],
+                                    vdims='color')}).options(color='color', framewise=True)
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_clim(), (0, 2))
+        plot.update((1,))
+        self.assertEqual(artist.get_array(), np.array([2.5, 3, 1.2]))
+        self.assertEqual(artist.get_clim(), (1.2, 3))
+
     def test_point_categorical_color_op(self):
         points = Points([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'A')],
                         vdims='color').options(color='color')
@@ -203,6 +238,17 @@ def test_point_size_op(self):
         artist = plot.handles['artist']
         self.assertEqual(artist.get_sizes(), np.array([1, 4, 8]))
 
+    def test_point_size_op_update(self):
+        points = HoloMap({0: Points([(0, 0, 3), (0, 1, 1), (0, 2, 2)],
+                                    vdims='size'),
+                          1: Points([(0, 0, 2.5), (0, 1, 3), (0, 2, 1.2)],
+                                    vdims='size')}).options(s='size')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_sizes(), np.array([3, 1, 2]))
+        plot.update((1,))
+        self.assertEqual(artist.get_sizes(), np.array([2.5, 3, 1.2]))
+
     def test_point_line_width_op(self):
         points = Points([(0, 0, 1), (0, 1, 4), (0, 2, 8)],
                         vdims='line_width').options(linewidth='line_width')
@@ -210,6 +256,17 @@ def test_point_line_width_op(self):
         artist = plot.handles['artist']
         self.assertEqual(artist.get_linewidths(), [1, 4, 8])
 
+    def test_point_line_width_op_update(self):
+        points = HoloMap({0: Points([(0, 0, 3), (0, 1, 1), (0, 2, 2)],
+                                    vdims='line_width'),
+                          1: Points([(0, 0, 2.5), (0, 1, 3), (0, 2, 1.2)],
+                                    vdims='line_width')}).options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(points)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [3, 1, 2])
+        plot.update((1,))
+        self.assertEqual(artist.get_linewidths(), [2.5, 3, 1.2])
+
     def test_point_marker_op(self):
         points = Points([(0, 0, 'circle'), (0, 1, 'triangle'), (0, 2, 'square')],
                         vdims='marker').options(marker='marker')
diff --git a/holoviews/tests/plotting/matplotlib/testspikeplot.py b/holoviews/tests/plotting/matplotlib/testspikeplot.py
index 191bf1c349..24964d394f 100644
--- a/holoviews/tests/plotting/matplotlib/testspikeplot.py
+++ b/holoviews/tests/plotting/matplotlib/testspikeplot.py
@@ -1,6 +1,7 @@
 import numpy as np
 
 from holoviews.core.overlay import NdOverlay
+from holoviews.core.spaces import HoloMap
 from holoviews.element import Spikes
 from holoviews.plotting.util import hex2rgb
 
@@ -99,10 +100,26 @@ def test_spikes_color_op(self):
                               vdims=['y', 'color']).options(color='color')
         plot = mpl_renderer.get_plot(spikes)
         artist = plot.handles['artist']
-        children = artist.get_children()
-        for c, w in zip(children, ['#000000', '#FF0000', '#00FF00']):
-            self.assertEqual(c.get_facecolor(), tuple(c/255. for c in hex2rgb(w))+(1,))
-
+        self.assertEqual(artist.get_edgecolors(), np.array([
+            [0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]
+        ))
+
+    def test_spikes_color_op_update(self):
+        spikes = HoloMap({
+            0: Spikes([(0, 0, '#000000'), (0, 1, '#FF0000'), (0, 2, '#00FF00')],
+                      vdims=['y', 'color']),
+            1: Spikes([(0, 0, '#FF0000'), (0, 1, '#00FF00'), (0, 2, '#0000FF')],
+                      vdims=['y', 'color'])}).options(color='color')
+        plot = mpl_renderer.get_plot(spikes)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_edgecolors(), np.array([
+            [0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]
+        ))
+        plot.update((1,))
+        self.assertEqual(artist.get_edgecolors(), np.array([
+            [1, 0, 0, 1], [0, 1, 0, 1], [0, 0, 1, 1]]
+        ))
+        
     def test_spikes_linear_color_op(self):
         spikes = Spikes([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
                         vdims=['y', 'color']).options(color='color')
@@ -111,6 +128,20 @@ def test_spikes_linear_color_op(self):
         self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
         self.assertEqual(artist.get_clim(), (0, 2))
 
+    def test_spikes_linear_color_op_update(self):
+        spikes = HoloMap({
+            0: Spikes([(0, 0, 0.5), (0, 1, 3.2), (0, 2, 1.8)],
+                      vdims=['y', 'color']),
+            1: Spikes([(0, 0, 0.1), (0, 1, 0.8), (0, 2, 0.3)],
+                      vdims=['y', 'color'])}).options(color='color', framewise=True)
+        plot = mpl_renderer.get_plot(spikes)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([0.5, 3.2, 1.8]))
+        self.assertEqual(artist.get_clim(), (0.5, 3.2))
+        plot.update((1,))
+        self.assertEqual(artist.get_array(), np.array([0.1, 0.8, 0.3]))
+        self.assertEqual(artist.get_clim(), (0.1, 0.8))
+
     def test_spikes_categorical_color_op(self):
         spikes = Spikes([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'A')],
                         vdims=['y', 'color']).options(color='color')
@@ -130,9 +161,20 @@ def test_spikes_line_width_op(self):
                               vdims=['y', 'line_width']).options(linewidth='line_width')
         plot = mpl_renderer.get_plot(spikes)
         artist = plot.handles['artist']
-        children = artist.get_children()
-        for c, w in zip(children, np.array([1, 4, 8])):
-            self.assertEqual(c.get_linewidth(), w)
+        self.assertEqual(artist.get_linewidths(), [1, 4, 8])
+
+
+    def test_spikes_line_width_op_update(self):
+        spikes = HoloMap({
+            0: Spikes([(0, 0, 0.5), (0, 1, 3.2), (0, 2, 1.8)],
+                      vdims=['y', 'line_width']),
+            1: Spikes([(0, 0, 0.1), (0, 1, 0.8), (0, 2, 0.3)],
+                      vdims=['y', 'line_width'])}).options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(spikes)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [0.5, 3.2, 1.8])
+        plot.update((1,))
+        self.assertEqual(artist.get_linewidths(), [0.1, 0.8, 0.3])
 
     def test_op_ndoverlay_value(self):
         colors = ['blue', 'red']
diff --git a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
index 640ccb1527..b4bb52687e 100644
--- a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
+++ b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
@@ -1,5 +1,6 @@
 import numpy as np
 
+from holoviews.core.spaces import HoloMap
 from holoviews.element import VectorField
 
 from .testplot import TestMPLPlot, mpl_renderer
@@ -23,13 +24,50 @@ def test_vectorfield_color_op(self):
             [0, 1, 0, 1]
         ]))
 
-    def test_vectorfield_linear_color_op(self):
-        vectorfield = VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 1), (0, 2, 0, 1, 2)],
+    def test_vectorfield_color_op_update(self):
+        vectorfield = HoloMap({
+            0: VectorField([(0, 0, 0, 1, '#000000'), (0, 1, 0, 1, '#FF0000'), (0, 2, 0, 1, '#00FF00')],
+                           vdims=['A', 'M', 'color']),
+            1: VectorField([(0, 0, 0, 1, '#0000FF'), (0, 1, 0, 1, '#00FF00'), (0, 2, 0, 1, '#FF0000')],
+                           vdims=['A', 'M', 'color'])}).options(color='color')
+        plot = mpl_renderer.get_plot(vectorfield)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_facecolors(), np.array([
+            [0, 0, 0, 1],
+            [1, 0, 0, 1],
+            [0, 1, 0, 1]
+        ]))
+        plot.update((1,))
+        self.assertEqual(artist.get_facecolors(), np.array([
+            [0, 0, 1, 1],
+            [0, 1, 0, 1],
+            [1, 0, 0, 1]
+        ]))
+
+    def test_vectorfield_color_op(self):
+        vectorfield = VectorField([(0, 0, 0, 1, '#000000'), (0, 1, 0, 1,'#FF0000'), (0, 2, 0, 1,'#00FF00')],
                                   vdims=['A', 'M', 'color']).options(color='color')
         plot = mpl_renderer.get_plot(vectorfield)
         artist = plot.handles['artist']
+        self.assertEqual(artist.get_facecolors(), np.array([
+            [0, 0, 0, 1],
+            [1, 0, 0, 1],
+            [0, 1, 0, 1]
+        ]))
+
+    def test_vectorfield_linear_color_op_update(self):
+        vectorfield = HoloMap({
+            0: VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 1), (0, 2, 0, 1, 2)],
+                           vdims=['A', 'M', 'color']),
+            1: VectorField([(0, 0, 0, 1, 3.2), (0, 1, 0, 1, 2), (0, 2, 0, 1, 4)],
+                           vdims=['A', 'M', 'color'])}).options(color='color', framewise=True)
+        plot = mpl_renderer.get_plot(vectorfield)
+        artist = plot.handles['artist']
         self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
         self.assertEqual(artist.get_clim(), (0, 2))
+        plot.update((1,))
+        self.assertEqual(artist.get_array(), np.array([3.2, 2, 4]))
+        self.assertEqual(artist.get_clim(), (2, 4))
 
     def test_vectorfield_categorical_color_op(self):
         vectorfield = VectorField([(0, 0, 0, 1, 'A'), (0, 1, 0, 1, 'B'), (0, 2, 0, 1, 'C')],
@@ -52,9 +90,21 @@ def test_vectorfield_line_width_op(self):
         artist = plot.handles['artist']
         self.assertEqual(artist.get_linewidths(), [1, 4, 8])
 
+    def test_vectorfield_line_width_op_update(self):
+        vectorfield = HoloMap({
+            0: VectorField([(0, 0, 0, 1, 1), (0, 1, 0, 1, 4), (0, 2, 0, 1, 8)],
+                           vdims=['A', 'M', 'line_width']),
+            1: VectorField([(0, 0, 0, 1, 3), (0, 1, 0, 1, 2), (0, 2, 0, 1, 5)],
+                           vdims=['A', 'M', 'line_width'])}).options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(vectorfield)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [1, 4, 8])
+        plot.update((1,))
+        self.assertEqual(artist.get_linewidths(), [3, 2, 5])
+        
     def test_vectorfield_color_index_color_clash(self):
         vectorfield = VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 1), (0, 2, 0, 1, 2)],
-                                  vdims=['A', 'M', 'color']).options(color='color', color_index='A')       
+                                  vdims=['A', 'M', 'color']).options(color='color', color_index='A')
         with ParamLogStream() as log:
             plot = mpl_renderer.get_plot(vectorfield)
         log_msg = log.stream.read()

From 2cda953c17e847606ae563e7bf20bd57fedcf66c Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 18 Nov 2018 14:06:45 +0000
Subject: [PATCH 057/117] Fixes for mpl Graph style mapping

---
 holoviews/plotting/mpl/graphs.py              |  84 +++++++----
 .../plotting/matplotlib/testgraphplot.py      | 132 +++++++++++++++++-
 2 files changed, 183 insertions(+), 33 deletions(-)

diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 44b65eda09..1a1c15bc50 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -7,7 +7,7 @@
 
 from ...core.data import Dataset
 from ...core.options import Cycle, abbreviated_exception
-from ...core.util import basestring, unique_array, search_indices, max_range, is_number
+from ...core.util import basestring, unique_array, search_indices, max_range, is_number, isscalar
 from ..util import process_cmap
 from .element import ColorbarPlot
 
@@ -43,7 +43,7 @@ def _compute_styles(self, element, ranges, style):
             cs = element.nodes.dimension_values(self.color_index)
             # Check if numeric otherwise treat as categorical
             if cs.dtype.kind == 'f':
-                style['c'] = cs
+                style['node_c'] = cs
             else:
                 factors = unique_array(cs)
                 cmap = color if isinstance(color, Cycle) else cmap
@@ -55,14 +55,19 @@ def _compute_styles(self, element, ranges, style):
                 cs = search_indices(cs, factors)
                 style['node_facecolors'] = [colors[v%len(colors)] for v in cs]
                 style.pop('node_color', None)
-            if 'c' in style:
+            if 'node_c' in style:
                 self._norm_kwargs(element.nodes, ranges, style, cdim)
         elif color and 'node_color' in style:
-            style['c'] = style.pop('node_color')
+            style['node_facecolors'] = style.pop('node_color')
         style['node_edgecolors'] = style.pop('node_edgecolors', 'none')
+        if is_number(style.get('node_size')):
+            style['node_s'] = style.pop('node_size')**2
 
         edge_cdim = element.get_dimension(self.edge_color_index)
         if not edge_cdim:
+            if not isscalar(style.get('edge_color')):
+                opt = 'edge_facecolors' if self.filled else 'edge_edgecolors'
+                style[opt] = style.pop('edge_color')
             return style
 
         elstyle = self.lookup_options(element, 'style')
@@ -76,7 +81,7 @@ def _compute_styles(self, element, ranges, style):
         else:
             factors = unique_array(cvals)
         if factors is None or (factors.dtype.kind == 'f' and idx not in [0, 1]):
-            style['edge_array'] = cvals
+            style['edge_c'] = cvals
         else:
             cvals = search_indices(cvals, factors)
             factors = list(factors)
@@ -89,12 +94,10 @@ def _compute_styles(self, element, ranges, style):
                 colors = process_cmap(cmap, len(factors))
             style['edge_colors'] = [colors[v%len(colors)] for v in cvals]
             style.pop('edge_color', None)
-        if 'edge_array' in style:
+        if 'edge_c' in style:
             self._norm_kwargs(element, ranges, style, edge_cdim, prefix='edge_')
         else:
             style.pop('edge_cmap', None)
-        if 'edge_vmin' in style:
-            style['edge_clim'] = (style.pop('edge_vmin'), style.pop('edge_vmax'))
         return style
 
 
@@ -107,7 +110,12 @@ def get_data(self, element, ranges, style):
         dims = element.nodes.dimensions()
         self._compute_styles(element, ranges, style)
 
-        paths = element._split_edgepaths.split(datatype='array', dimensions=element.edgepaths.kdims)
+        if 'edge_vmin' in style:
+            style['edge_clim'] = (style.pop('edge_vmin'), style.pop('edge_vmax'))
+        if 'edge_c' in style:
+            style['edge_array'] = style.pop('edge_c')
+
+        paths = element._split_edgepaths.split(datatype='array', dimensions=element.edgepaths.kdims[:2])
         if self.invert_axes:
             paths = [p[:, ::-1] for p in paths]
         return {'nodes': (pxs, pys), 'edges': paths}, style, {'dimensions': dims}
@@ -134,7 +142,10 @@ def init_artists(self, ax, plot_args, plot_kwargs):
                 edge_opts['facecolors'] = edge_opts.pop('colors')
         else:
             coll = LineCollection
+        edgecolors = edge_opts.pop('edgecolors', None)
         edges = coll(paths, **edge_opts)
+        if edgecolors is not None:
+            edges.set_edgecolors(edgecolors)
         ax.add_collection(edges)
 
         # Draw nodes
@@ -143,8 +154,6 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         node_opts = {k[5:] if 'node_' in k else k: v
                      for k, v in plot_kwargs.items()
                      if not any(k.startswith(p) for p in groups)}
-        if is_number(node_opts.get('size')):
-            node_opts['s'] = node_opts.pop('size')**2
         nodes = ax.scatter(xs, ys, **node_opts)
 
         return {'nodes': nodes, 'edges': edges}
@@ -154,12 +163,24 @@ def _update_nodes(self, element, data, style):
         nodes = self.handles['nodes']
         xs, ys = data['nodes']
         nodes.set_offsets(np.column_stack([xs, ys]))
-        cdim = element.nodes.get_dimension(self.color_index)
-        if cdim and 'c' in style:
-            nodes.set_clim((style['vmin'], style['vmax']))
-            nodes.set_array(style['c'])
-            if 'norm' in style:
-                nodes.norm = style['norm']
+        if 'node_facecolors' in style:
+            nodes.set_facecolors(style['node_facecolors'])
+        if 'node_edgecolors' in style:
+            nodes.set_edgecolors(style['node_edgecolors'])
+        if 'node_c' in style:
+            nodes.set_array(style['node_c'])
+        if 'node_vmin' in style:
+            nodes.set_clim((style['node_vmin'], style['node_vmax']))
+        if 'node_norm' in style:
+            nodes.norm = style['norm']
+        if 'node_linewidth' in style:
+            nodes.set_linewidths(style['node_linewidth'])
+        if 'node_s' in style:
+            sizes = style['node_s']
+            if isscalar(sizes):
+                nodes.set_sizes([sizes])
+            else:
+                nodes.set_sizes(sizes)
 
 
     def _update_edges(self, element, data, style):
@@ -167,18 +188,23 @@ def _update_edges(self, element, data, style):
         paths = data['edges']
         edges.set_paths(paths)
         edges.set_visible(style.get('visible', True))
-        cdim = element.get_dimension(self.edge_color_index)
-        if cdim:
-            if 'edge_array' in style:
-                edges.set_clim(style['edge_clim'])
-                edges.set_array(style['edge_array'])
-                if 'norm' in style:
-                    edges.norm = style['edge_norm']
-            elif 'edge_colors' in style:
-                if self.filled:
-                    edges.set_facecolors(style['edge_colors'])
-                else:
-                    edges.set_edgecolors(style['edge_colors'])
+        if 'edge_facecolors' in style:
+            edges.set_facecolors(style['edge_facecolors'])
+        if 'edge_edgecolors' in style:
+            edges.set_edgecolors(style['edge_edgecolors'])
+        if 'edge_array' in style:
+            edges.set_array(style['edge_array'])
+        elif 'edge_colors' in style:
+            if self.filled:
+                edges.set_facecolors(style['edge_colors'])
+            else:
+                edges.set_edgecolors(style['edge_colors'])
+        if 'edge_clim' in style:
+            edges.set_clim(style['edge_clim'])
+        if 'edge_norm' in style:
+            edges.norm = style['edge_norm']
+        if 'edge_linewidth' in style:
+            edges.set_linewidths(style['edge_linewidth'])
 
 
     def update_handles(self, key, axis, element, ranges, style):
diff --git a/holoviews/tests/plotting/matplotlib/testgraphplot.py b/holoviews/tests/plotting/matplotlib/testgraphplot.py
index f850ceaab9..6436656cd2 100644
--- a/holoviews/tests/plotting/matplotlib/testgraphplot.py
+++ b/holoviews/tests/plotting/matplotlib/testgraphplot.py
@@ -3,6 +3,7 @@
 import numpy as np
 from holoviews.core.data import Dataset
 from holoviews.core.options import Cycle
+from holoviews.core.spaces import HoloMap
 from holoviews.element import Graph, Nodes, TriMesh, Chord, circular_layout
 
 # Standardize backend due to random inconsistencies
@@ -97,6 +98,23 @@ def test_graph_op_node_color(self):
         self.assertEqual(artist.get_facecolors(),
                          np.array([[0, 0, 0, 1], [1, 0, 0, 1], [0, 1, 0, 1]]))
 
+    def test_graph_op_node_color_update(self):
+        edges = [(0, 1), (0, 2)]
+        def get_graph(i):
+            c1, c2, c3 = {0: ('#00FF00', '#0000FF', '#FF0000'),
+                          1: ('#FF0000', '#00FF00', '#0000FF')}[i]
+            nodes = Nodes([(0, 0, 0, c1), (0, 1, 1, c2), (1, 1, 2, c3)],
+                      vdims='color')
+            return Graph((edges, nodes))
+        graph = HoloMap({0: get_graph(0), 1: get_graph(1)}).options(node_color='color')
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_facecolors(),
+                         np.array([[0, 1, 0, 1], [0, 0, 1, 1], [1, 0, 0, 1]]))
+        plot.update((1,))
+        self.assertEqual(artist.get_facecolors(),
+                         np.array([[1, 0, 0, 1], [0, 1, 0, 1], [0, 0, 1, 1]]))
+
     def test_graph_op_node_color_linear(self):
         edges = [(0, 1), (0, 2)]
         nodes = Nodes([(0, 0, 0, 0.5), (0, 1, 1, 1.5), (1, 1, 2, 2.5)],
@@ -105,6 +123,24 @@ def test_graph_op_node_color_linear(self):
         plot = mpl_renderer.get_plot(graph)
         artist = plot.handles['nodes']
         self.assertEqual(artist.get_array(), np.array([0.5, 1.5, 2.5]))
+        self.assertEqual(artist.get_clim(), (0.5, 2.5))
+
+    def test_graph_op_node_color_linear_update(self):
+        edges = [(0, 1), (0, 2)]
+        def get_graph(i):
+            c1, c2, c3 = {0: (0.5, 1.5, 2.5),
+                          1: (3, 2, 1)}[i]
+            nodes = Nodes([(0, 0, 0, c1), (0, 1, 1, c2), (1, 1, 2, c3)],
+                      vdims='color')
+            return Graph((edges, nodes))
+        graph = HoloMap({0: get_graph(0), 1: get_graph(1)}).options(node_color='color', framewise=True)
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_array(), np.array([0.5, 1.5, 2.5]))
+        self.assertEqual(artist.get_clim(), (0.5, 2.5))
+        plot.update((1,))
+        self.assertEqual(artist.get_array(), np.array([3, 2, 1]))
+        self.assertEqual(artist.get_clim(), (1, 3))
 
     def test_graph_op_node_color_categorical(self):
         edges = [(0, 1), (0, 2)]
@@ -124,6 +160,21 @@ def test_graph_op_node_size(self):
         artist = plot.handles['nodes']
         self.assertEqual(artist.get_sizes(), np.array([4, 16, 36]))
 
+    def test_graph_op_node_size_update(self):
+        edges = [(0, 1), (0, 2)]
+        def get_graph(i):
+            c1, c2, c3 = {0: (2, 4, 6),
+                          1: (12, 3, 5)}[i]
+            nodes = Nodes([(0, 0, 0, c1), (0, 1, 1, c2), (1, 1, 2, c3)],
+                      vdims='size')
+            return Graph((edges, nodes))
+        graph = HoloMap({0: get_graph(0), 1: get_graph(1)}).options(node_size='size')
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_sizes(), np.array([4, 16, 36]))
+        plot.update((1,))
+        self.assertEqual(artist.get_sizes(), np.array([144, 9, 25]))
+
     def test_graph_op_node_linewidth(self):
         edges = [(0, 1), (0, 2)]
         nodes = Nodes([(0, 0, 0, 2), (0, 1, 1, 4), (1, 1, 2, 3.5)], vdims='line_width')
@@ -132,6 +183,21 @@ def test_graph_op_node_linewidth(self):
         artist = plot.handles['nodes']
         self.assertEqual(artist.get_linewidths(), [2, 4, 3.5])
 
+    def test_graph_op_node_linewidth_update(self):
+        edges = [(0, 1), (0, 2)]
+        def get_graph(i):
+            c1, c2, c3 = {0: (2, 4, 6),
+                          1: (12, 3, 5)}[i]
+            nodes = Nodes([(0, 0, 0, c1), (0, 1, 1, c2), (1, 1, 2, c3)],
+                      vdims='line_width')
+            return Graph((edges, nodes))
+        graph = HoloMap({0: get_graph(0), 1: get_graph(1)}).options(node_linewidth='line_width')
+        plot = mpl_renderer.get_plot(graph)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_linewidths(), [2, 4, 6])
+        plot.update((1,))
+        self.assertEqual(artist.get_linewidths(), [12, 3, 5])
+
     def test_graph_op_node_alpha(self):
         edges = [(0, 1), (0, 2)]
         nodes = Nodes([(0, 0, 0, 0.2), (0, 1, 1, 0.6), (1, 1, 2, 1)], vdims='alpha')
@@ -142,17 +208,60 @@ def test_graph_op_node_alpha(self):
     def test_graph_op_edge_color(self):
         edges = [(0, 1, 'red'), (0, 2, 'green'), (1, 3, 'blue')]
         graph = Graph(edges, vdims='color').options(edge_color='color')
-        mpl_renderer.get_plot(graph)
+        plot = mpl_renderer.get_plot(graph)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_edgecolors(), np.array([
+            [1. , 0. , 0. , 1. ], [0. , 0.50196078, 0. , 1. ],
+            [0. , 0. , 1. , 1. ]]
+        ))
+
+    def test_graph_op_edge_color_update(self):
+        graph = HoloMap({
+            0: Graph([(0, 1, 'red'), (0, 2, 'green'), (1, 3, 'blue')],
+                    vdims='color'),
+            1: Graph([(0, 1, 'green'), (0, 2, 'blue'), (1, 3, 'red')],
+                     vdims='color')}).options(edge_color='color')
+        plot = mpl_renderer.get_plot(graph)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_edgecolors(), np.array([
+            [1. , 0. , 0. , 1. ], [0. , 0.50196078, 0. , 1. ],
+            [0. , 0. , 1. , 1. ]]
+        ))
+        plot.update((1,))
+        self.assertEqual(edges.get_edgecolors(), np.array([
+            [0. , 0.50196078, 0. , 1. ], [0. , 0. , 1. , 1. ],
+            [1. , 0. , 0. , 1. ]]
+        ))
 
     def test_graph_op_edge_color_linear(self):
         edges = [(0, 1, 2), (0, 2, 0.5), (1, 3, 3)]
         graph = Graph(edges, vdims='color').options(edge_color='color')
-        mpl_renderer.get_plot(graph)
+        plot = mpl_renderer.get_plot(graph)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_array(), np.array([2, 0.5, 3]))
+        self.assertEqual(edges.get_clim(), (0.5, 3))
+
+    def test_graph_op_edge_color_linear_update(self):
+        graph = HoloMap({
+            0: Graph([(0, 1, 2), (0, 2, 0.5), (1, 3, 3)],
+                    vdims='color'),
+            1: Graph([(0, 1, 4.3), (0, 2, 1.4), (1, 3, 2.6)],
+                     vdims='color')}).options(edge_color='color', framewise=True)
+        plot = mpl_renderer.get_plot(graph)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_array(), np.array([2, 0.5, 3]))
+        self.assertEqual(edges.get_clim(), (0.5, 3))
+        plot.update((1,))
+        self.assertEqual(edges.get_array(), np.array([4.3, 1.4, 2.6]))
+        self.assertEqual(edges.get_clim(), (1.4, 4.3))
 
     def test_graph_op_edge_color_categorical(self):
         edges = [(0, 1, 'C'), (0, 2, 'B'), (1, 3, 'A')]
         graph = Graph(edges, vdims='color').options(edge_color='color')
-        mpl_renderer.get_plot(graph)
+        plot = mpl_renderer.get_plot(graph)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_array(), np.array([2, 1, 0]))
+        self.assertEqual(edges.get_clim(), (0, 2))
 
     def test_graph_op_edge_alpha(self):
         edges = [(0, 1, 0.1), (0, 2, 0.5), (1, 3, 0.3)]
@@ -163,7 +272,22 @@ def test_graph_op_edge_alpha(self):
     def test_graph_op_edge_linewidth(self):
         edges = [(0, 1, 2), (0, 2, 10), (1, 3, 6)]
         graph = Graph(edges, vdims='line_width').options(edge_linewidth='line_width')
-        mpl_renderer.get_plot(graph)
+        plot = mpl_renderer.get_plot(graph)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_linewidths(), [2, 10, 6])
+
+    def test_graph_op_edge_line_width_update(self):
+        graph = HoloMap({
+            0: Graph([(0, 1, 2), (0, 2, 0.5), (1, 3, 3)],
+                    vdims='line_width'),
+            1: Graph([(0, 1, 4.3), (0, 2, 1.4), (1, 3, 2.6)],
+                     vdims='line_width')}).options(edge_linewidth='line_width')
+        plot = mpl_renderer.get_plot(graph)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_linewidths(), [2, 0.5, 3])
+        plot.update((1,))
+        self.assertEqual(edges.get_linewidths(), [4.3, 1.4, 2.6])
+
 
 
 class TestMplTriMeshPlot(TestMPLPlot):

From 572505359a396389c6f3885a911a3b6230533d6d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 18 Nov 2018 18:35:55 +0000
Subject: [PATCH 058/117] Fixes for fill/line color and TriMesh plotting

---
 .../reference/elements/bokeh/TriMesh.ipynb    |   2 +-
 .../elements/matplotlib/TriMesh.ipynb         |   4 +-
 holoviews/plotting/bokeh/element.py           |   5 +
 holoviews/plotting/bokeh/graphs.py            |  25 +++-
 holoviews/plotting/mpl/graphs.py              |   7 +-
 holoviews/tests/plotting/bokeh/testbarplot.py |   6 +-
 .../tests/plotting/bokeh/testgraphplot.py     | 138 ++++++++++++++++++
 .../tests/plotting/bokeh/testhistogramplot.py |   6 +-
 .../plotting/matplotlib/testgraphplot.py      | 106 ++++++++++++++
 9 files changed, 281 insertions(+), 18 deletions(-)

diff --git a/examples/reference/elements/bokeh/TriMesh.ipynb b/examples/reference/elements/bokeh/TriMesh.ipynb
index a2c5c8604e..f2ede5cb52 100644
--- a/examples/reference/elements/bokeh/TriMesh.ipynb
+++ b/examples/reference/elements/bokeh/TriMesh.ipynb
@@ -151,7 +151,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts TriMesh [filled=True edge_color_index='z' width=400 height=400 tools=['hover'] inspection_policy='edges'] (cmap='viridis')\n",
+    "%%opts TriMesh [filled=True width=400 height=400 tools=['hover'] inspection_policy='edges'] (cmap='viridis' edge_color='z')\n",
     "hv.TriMesh((simplices, nodes))"
    ]
   },
diff --git a/examples/reference/elements/matplotlib/TriMesh.ipynb b/examples/reference/elements/matplotlib/TriMesh.ipynb
index 40e4ef21aa..6eac8ff003 100644
--- a/examples/reference/elements/matplotlib/TriMesh.ipynb
+++ b/examples/reference/elements/matplotlib/TriMesh.ipynb
@@ -141,7 +141,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We can also do something more interesting, e.g. by adding a value dimension to the vertices and coloring the edges by the vertex averaged value using the ``edge_color_index`` plot option:"
+    "We can also do something more interesting, e.g. by adding a value dimension to the vertices and coloring the edges by the vertex averaged value using the ``edge_color`` plot option:"
    ]
   },
   {
@@ -150,7 +150,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts TriMesh [filled=True edge_color_index='z' fig_size=200] (cmap='viridis')\n",
+    "%%opts TriMesh [filled=True fig_size=200] (cmap='viridis' edge_color='z')\n",
     "hv.TriMesh((simplices, hv.Points(nodes, vdims='z')))"
    ]
   },
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 27545bb698..b6f4cdf00e 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -747,7 +747,12 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 fill_style = new_style.get(prefix+'fill_'+s)
                 if fill_style and validate(s, fill_style):
                     new_style[prefix+'fill_'+s] = val
+
+                # If glyph has fill and line style is set skip setting line color
                 line_style = new_style.get(prefix+'line_'+s)
+                if any(o.startswith(prefix+'fill') and getattr(self, 'filled', True)
+                       for o in self.style_opts) and line_style is not None:
+                    continue
                 if line_style and validate(s, line_style):
                     new_style[prefix+'line_'+s] = val
 
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index d31679ff9e..8fd97c3c26 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -301,7 +301,8 @@ def _init_glyphs(self, plot, element, ranges, source):
                 glyph = getattr(renderer.edge_renderer, glyph_type+'glyph', None)
                 if glyph is None:
                     continue
-                props = self._process_properties(self.edge_glyph, properties, mappings)
+                group_properties = dict(properties)
+                props = self._process_properties(self.edge_glyph, group_properties, mappings)
                 filtered = self._filter_properties(props, glyph_type, allowed_properties)
                 new_glyph = glyph_model(**dict(filtered, **edge_mapping))
                 setattr(renderer.edge_renderer, glyph_type+'glyph', new_glyph)
@@ -408,15 +409,25 @@ class TriMeshPlot(GraphPlot):
     # Declares that three columns in TriMesh refer to edges
     _node_columns = [0, 1, 2]
 
-    def get_data(self, element, ranges, style):
-        # Ensure the edgepaths for the triangles are generated before plotting
-        simplex_dim = element.get_dimension(self.edge_color_index)
-        vertex_dim = element.nodes.get_dimension(self.edge_color_index)
-        if not isinstance(self.edge_color_index, int) and vertex_dim and not simplex_dim:
+    def _process_vertices(self, element):
+        style = self.style[self.cyclic_index]
+        edge_color = style.get('edge_color')
+        if edge_color not in element.nodes:
+            edge_color = self.edge_color_index
+        simplex_dim = element.get_dimension(edge_color)
+        vertex_dim = element.nodes.get_dimension(edge_color)
+        if vertex_dim and not simplex_dim:
             simplices = element.array([0, 1, 2])
             z = element.nodes.dimension_values(vertex_dim)
             z = z[simplices].mean(axis=1)
             element = element.add_dimension(vertex_dim, len(element.vdims), z, vdim=True)
         element.edgepaths
-        return super(TriMeshPlot, self).get_data(element, ranges, style)
+        return element
+
+    def _init_glyphs(self, plot, element, ranges, source):
+        element = self._process_vertices(element)
+        super(TriMeshPlot, self)._init_glyphs(plot, element, ranges, source)
 
+    def _update_glyphs(self, element, ranges):
+        element = self._process_vertices(element)
+        super(TriMeshPlot, self)._update_glyphs(element, ranges)
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 1a1c15bc50..dbb4f24933 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -223,8 +223,11 @@ class TriMeshPlot(GraphPlot):
     style_opts = GraphPlot.style_opts + ['edge_facecolors']
 
     def get_data(self, element, ranges, style):
-        simplex_dim = element.get_dimension(self.edge_color_index)
-        vertex_dim = element.nodes.get_dimension(self.edge_color_index)
+        edge_color = style.get('edge_color')
+        if edge_color not in element.nodes:
+            edge_color = self.edge_color_index
+        simplex_dim = element.get_dimension(edge_color)
+        vertex_dim = element.nodes.get_dimension(edge_color)
         if not isinstance(self.edge_color_index, int) and vertex_dim and not simplex_dim:
             simplices = element.array([0, 1, 2])
             z = element.nodes.dimension_values(vertex_dim)
diff --git a/holoviews/tests/plotting/bokeh/testbarplot.py b/holoviews/tests/plotting/bokeh/testbarplot.py
index a907bd22db..9f0b4872b3 100644
--- a/holoviews/tests/plotting/bokeh/testbarplot.py
+++ b/holoviews/tests/plotting/bokeh/testbarplot.py
@@ -138,7 +138,7 @@ def test_bars_color_op(self):
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
         self.assertEqual(glyph.fill_color, {'field': 'color'})
-        self.assertEqual(glyph.line_color, {'field': 'color'})
+        self.assertEqual(glyph.line_color, 'black')
 
     def test_bars_linear_color_op(self):
         bars = Bars([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
@@ -152,7 +152,7 @@ def test_bars_linear_color_op(self):
         self.assertEqual(cmapper.high, 2)
         self.assertEqual(cds.data['color'], np.array([0, 1, 2]))
         self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
 
     def test_bars_categorical_color_op(self):
         bars = Bars([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
@@ -165,7 +165,7 @@ def test_bars_categorical_color_op(self):
         self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
         self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
         self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
 
     def test_bars_line_color_op(self):
         bars = Bars([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
diff --git a/holoviews/tests/plotting/bokeh/testgraphplot.py b/holoviews/tests/plotting/bokeh/testgraphplot.py
index 422ad13701..e6497f9279 100644
--- a/holoviews/tests/plotting/bokeh/testgraphplot.py
+++ b/holoviews/tests/plotting/bokeh/testgraphplot.py
@@ -336,6 +336,144 @@ def test_trimesh_nodes_numerically_colormapped(self):
         self.assertEqual(edge_source.data['weight'], np.array([0, 1]))
         self.assertEqual(glyph.line_color, {'field': 'weight', 'transform': cmapper})
 
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_trimesh_op_node_color(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 'red'), (0, 0, 1, 'green'), (0, 1, 2, 'blue'), (1, 0, 3, 'black')]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(node_color='color')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        self.assertEqual(glyph.fill_color, {'field': 'node_color'})
+        self.assertEqual(glyph.line_color, {'field': 'node_color'})
+        self.assertEqual(cds.data['node_color'], np.array(['red', 'green', 'blue', 'black']))
+    
+    def test_trimesh_op_node_color_linear(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 2), (0, 0, 1, 1), (0, 1, 2, 3), (1, 0, 3, 4)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(node_color='color')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        cmapper = plot.handles['node_color_color_mapper']
+        self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(cds.data['node_color'], np.array([2, 1, 3, 4]))
+        self.assertEqual(cmapper.low, 1) 
+        self.assertEqual(cmapper.high, 4)
+
+    def test_trimesh_op_node_color_categorical(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 'B'), (0, 0, 1, 'C'), (0, 1, 2, 'A'), (1, 0, 3, 'B')]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(node_color='color')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        cmapper = plot.handles['node_color_color_mapper']
+        self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(cds.data['node_color'], np.array(['B', 'C', 'A', 'B']))
+
+    def test_trimesh_op_node_size(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 3), (0, 0, 1, 2), (0, 1, 2, 8), (1, 0, 3, 4)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='size'))).options(node_size='size')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        self.assertEqual(glyph.size, {'field': 'node_size'})
+        self.assertEqual(cds.data['node_size'], np.array([3, 2, 8, 4]))
+
+    def test_trimesh_op_node_alpha(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 0.2), (0, 0, 1, 0.6), (0, 1, 2, 1), (1, 0, 3, 0.3)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='alpha'))).options(node_alpha='alpha')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        self.assertEqual(glyph.fill_alpha, {'field': 'node_alpha'})
+        self.assertEqual(glyph.line_alpha, {'field': 'node_alpha'})
+        self.assertEqual(cds.data['node_alpha'], np.array([0.2, 0.6, 1, 0.3]))
+
+    def test_trimesh_op_node_line_width(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 0.2), (0, 0, 1, 0.6), (0, 1, 2, 1), (1, 0, 3, 0.3)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='line_width'))).options(node_line_width='line_width')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['scatter_1_source']
+        glyph = plot.handles['scatter_1_glyph']
+        self.assertEqual(glyph.line_width, {'field': 'node_line_width'})
+        self.assertEqual(cds.data['node_line_width'], np.array([0.2, 0.6, 1, 0.3]))
+
+    def test_trimesh_op_edge_color_linear_mean_node(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 2), (0, 0, 1, 1), (0, 1, 2, 3), (1, 0, 3, 4)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(edge_color='color')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        cmapper = plot.handles['edge_color_color_mapper']
+        self.assertEqual(glyph.line_color, {'field': 'edge_color', 'transform': cmapper})
+        self.assertEqual(cds.data['edge_color'], np.array([2, 8/3.]))
+    
+    def test_trimesh_op_edge_color(self):
+        edges = [(0, 1, 2, 'red'), (1, 2, 3, 'blue')]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        self.assertEqual(glyph.line_color, {'field': 'edge_color'})
+        self.assertEqual(cds.data['edge_color'], np.array(['red', 'blue']))
+
+    def test_trimesh_op_edge_color_linear(self):
+        edges = [(0, 1, 2, 2.4), (1, 2, 3, 3.6)]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        cmapper = plot.handles['edge_color_color_mapper']
+        self.assertEqual(glyph.line_color, {'field': 'edge_color', 'transform': cmapper})
+        self.assertEqual(cds.data['edge_color'], np.array([2.4, 3.6]))
+        self.assertEqual(cmapper.low, 2.4)
+        self.assertEqual(cmapper.high, 3.6)
+
+    def test_trimesh_op_edge_color_categorical(self):
+        edges = [(0, 1, 2, 'A'), (1, 2, 3, 'B')]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        cmapper = plot.handles['edge_color_color_mapper']
+        self.assertEqual(glyph.line_color, {'field': 'edge_color', 'transform': cmapper})
+        self.assertEqual(cds.data['edge_color'], np.array(['A', 'B']))
+        self.assertEqual(cmapper.factors, ['A', 'B'])
+
+    def test_trimesh_op_edge_alpha(self):
+        edges = [(0, 1, 2, 0.7), (1, 2, 3, 0.3)]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='alpha').options(edge_alpha='alpha')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        self.assertEqual(glyph.line_alpha, {'field': 'edge_alpha'})
+        self.assertEqual(cds.data['edge_alpha'], np.array([0.7, 0.3]))
+
+    def test_trimesh_op_edge_line_width(self):
+        edges = [(0, 1, 2, 7), (1, 2, 3, 3)]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='line_width').options(edge_line_width='line_width')
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        self.assertEqual(glyph.line_width, {'field': 'edge_line_width'})
+        self.assertEqual(cds.data['edge_line_width'], np.array([7, 3]))
+
 
 class TestBokehChordPlot(TestBokehPlot):
 
diff --git a/holoviews/tests/plotting/bokeh/testhistogramplot.py b/holoviews/tests/plotting/bokeh/testhistogramplot.py
index 655642c6e1..c1f5a28f64 100644
--- a/holoviews/tests/plotting/bokeh/testhistogramplot.py
+++ b/holoviews/tests/plotting/bokeh/testhistogramplot.py
@@ -162,7 +162,7 @@ def test_histogram_color_op(self):
         glyph = plot.handles['glyph']
         self.assertEqual(cds.data['color'], np.array(['#000', '#F00', '#0F0']))
         self.assertEqual(glyph.fill_color, {'field': 'color'})
-        self.assertEqual(glyph.line_color, {'field': 'color'})
+        self.assertEqual(glyph.line_color, 'black')
 
     def test_histogram_linear_color_op(self):
         histogram = Histogram([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
@@ -176,7 +176,7 @@ def test_histogram_linear_color_op(self):
         self.assertEqual(cmapper.high, 2)
         self.assertEqual(cds.data['color'], np.array([0, 1, 2]))
         self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
 
     def test_histogram_categorical_color_op(self):
         histogram = Histogram([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'C')],
@@ -189,7 +189,7 @@ def test_histogram_categorical_color_op(self):
         self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
         self.assertEqual(cds.data['color'], np.array(['A', 'B', 'C']))
         self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
 
     def test_histogram_line_color_op(self):
         histogram = Histogram([(0, 0, '#000'), (0, 1, '#F00'), (0, 2, '#0F0')],
diff --git a/holoviews/tests/plotting/matplotlib/testgraphplot.py b/holoviews/tests/plotting/matplotlib/testgraphplot.py
index 6436656cd2..fb62a1d978 100644
--- a/holoviews/tests/plotting/matplotlib/testgraphplot.py
+++ b/holoviews/tests/plotting/matplotlib/testgraphplot.py
@@ -344,6 +344,112 @@ def test_plot_trimesh_categorically_colored_edges_filled(self):
                            [0.215686, 0.494118, 0.721569, 1.]])
         self.assertEqual(edges.get_facecolors(), colors)
 
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_trimesh_op_node_color(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 'red'), (0, 0, 1, 'green'), (0, 1, 2, 'blue'), (1, 0, 3, 'black')]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(node_color='color')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_facecolors(),
+                         np.array([[1, 0, 0, 1], [0, 0.501961, 0, 1], [0, 0, 1, 1], [0, 0, 0, 1]]))
+
+    def test_trimesh_op_node_color_linear(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 2), (0, 0, 1, 1), (0, 1, 2, 3), (1, 0, 3, 4)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(node_color='color')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_array(), np.array([2, 1, 3, 4]))
+        self.assertEqual(artist.get_clim(), (1, 4))
+
+    def test_trimesh_op_node_color_categorical(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 'B'), (0, 0, 1, 'C'), (0, 1, 2, 'A'), (1, 0, 3, 'B')]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(node_color='color')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_array(), np.array([1, 2, 0, 1]))
+        self.assertEqual(artist.get_clim(), (0, 2))
+
+    def test_trimesh_op_node_size(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 3), (0, 0, 1, 2), (0, 1, 2, 8), (1, 0, 3, 4)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='size'))).options(node_size='size')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_sizes(), np.array([9, 4, 64, 16]))
+
+    def test_trimesh_op_node_alpha(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 0.2), (0, 0, 1, 0.6), (0, 1, 2, 1), (1, 0, 3, 0.3)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='alpha'))).options(node_alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(graph)
+
+    def test_trimesh_op_node_line_width(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 0.2), (0, 0, 1, 0.6), (0, 1, 2, 1), (1, 0, 3, 0.3)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='line_width'))).options(node_linewidth='line_width')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['nodes']
+        self.assertEqual(artist.get_linewidths(), [0.2, 0.6, 1, 0.3])
+
+    def test_trimesh_op_edge_color_linear_mean_node(self):
+        edges = [(0, 1, 2), (1, 2, 3)]
+        nodes = [(-1, -1, 0, 2), (0, 0, 1, 1), (0, 1, 2, 3), (1, 0, 3, 4)]
+        trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(edge_color='color')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['edges']
+        self.assertEqual(artist.get_array(), np.array([2, 8/3.]))
+        self.assertEqual(artist.get_clim(), (1, 4))
+
+    def test_trimesh_op_edge_color(self):
+        edges = [(0, 1, 2, 'red'), (1, 2, 3, 'blue')]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['edges']
+        self.assertEqual(artist.get_edgecolors(), np.array([
+            [1, 0, 0, 1], [0, 0, 1, 1]]))
+
+    def test_trimesh_op_edge_color_linear(self):
+        edges = [(0, 1, 2, 2.4), (1, 2, 3, 3.6)]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['edges']
+        self.assertEqual(artist.get_array(), np.array([2.4, 3.6]))
+        self.assertEqual(artist.get_clim(), (2.4, 3.6))
+
+    def test_trimesh_op_edge_color_categorical(self):
+        edges = [(0, 1, 2, 'A'), (1, 2, 3, 'B')]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['edges']
+        self.assertEqual(artist.get_array(), np.array([0, 1]))
+        self.assertEqual(artist.get_clim(), (0, 1))
+
+    def test_trimesh_op_edge_alpha(self):
+        edges = [(0, 1, 2, 0.7), (1, 2, 3, 0.3)]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='alpha').options(edge_alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(graph)
+
+    def test_trimesh_op_edge_line_width(self):
+        edges = [(0, 1, 2, 7), (1, 2, 3, 3)]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='line_width').options(edge_linewidth='line_width')
+        plot = mpl_renderer.get_plot(trimesh)
+        artist = plot.handles['edges']
+        self.assertEqual(artist.get_linewidths(), [7, 3])
+
+
 
 class TestMplChordPlot(TestMPLPlot):
 

From f4ede900c0d7a8a2a205e6b5a3a2d1e08f1be80f Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Sun, 18 Nov 2018 20:10:25 +0000
Subject: [PATCH 059/117] Refactored code to check whether dim transform
 applies

---
 holoviews/core/util.py              |  3 +++
 holoviews/plotting/bokeh/element.py | 25 ++++++++++++-------------
 holoviews/plotting/mpl/element.py   |  9 +++------
 holoviews/util/ops.py               | 17 +++++++++++++++++
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/holoviews/core/util.py b/holoviews/core/util.py
index 951e39a376..64f33cf08b 100644
--- a/holoviews/core/util.py
+++ b/holoviews/core/util.py
@@ -49,6 +49,9 @@
     get_keywords = operator.attrgetter('keywords')
 
     class LooseVersion(_LooseVersion):
+        """
+        Subclassed to avoid unicode issues in python2
+        """
 
         def __init__ (self, vstring=None):
             if isinstance(vstring, unicode):
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index b6f4cdf00e..ad13a2c7f6 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -673,17 +673,13 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 except:
                     continue
 
-            if not isinstance(v, dim) or (group is not None and not k.startswith(group)):
+            if (not isinstance(v, dim) or (group is not None and not k.startswith(group)) or
+                (k == 'marker' and v.dimension.name in markers)):
                 continue
-            dname = v.dimension.name
-
-            if k == 'marker' and dname in markers:
-                continue
-            elif (dname not in element and v.dimension not in self.overlay_dims and
-                not (isinstance(element, Graph) and v.dimension in element.nodes)):
+            elif (not v.applies(element) and v.dimension not in self.overlay_dims):
                 new_style.pop(k)
-                self.warning('Specified %s op %r could not be applied, %s dimension '
-                             'could not be found' % (k, v, v.dimension))
+                self.warning('Specified %s dim transform %r could not be applied, as not all '
+                             'dimensions could be resolved.' % (k, v))
                 continue
 
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
@@ -1233,7 +1229,7 @@ class ColorbarPlot(ElementPlot):
 
     _no_op_styles = ['cmap', 'palette']
 
-    def _draw_colorbar(self, plot, color_mapper):
+    def _draw_colorbar(self, plot, color_mapper, prefix=''):
         if CategoricalColorMapper and isinstance(color_mapper, CategoricalColorMapper):
             return
         if LogColorMapper and isinstance(color_mapper, LogColorMapper) and color_mapper.low > 0:
@@ -1252,7 +1248,7 @@ def _draw_colorbar(self, plot, color_mapper):
                              **dict(opts, **self.colorbar_opts))
 
         plot.add_layout(color_bar, pos)
-        self.handles['colorbar'] = color_bar
+        self.handles[prefix+'colorbar'] = color_bar
 
 
     def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=None,
@@ -1389,8 +1385,11 @@ def _init_glyph(self, plot, mapping, properties):
         Returns a Bokeh glyph object and optionally creates a colorbar.
         """
         ret = super(ColorbarPlot, self)._init_glyph(plot, mapping, properties)
-        if self.colorbar and 'color_mapper' in self.handles:
-            self._draw_colorbar(plot, self.handles['color_mapper'])
+        if self.colorbar:
+            for k, v in list(self.handles.items()):
+                if not k.endswith('color_mapper'):
+                    continue
+                self._draw_colorbar(plot, v, k[:-12])
         return ret
 
 
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index b03b076e6a..09ea3291c3 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -532,13 +532,10 @@ def _apply_ops(self, element, ranges, style):
 
             if not isinstance(v, dim):
                 continue
-
-            dname = v.dimension.name
-            if (dname not in element and v.dimension not in self.overlay_dims and
-                not (isinstance(element, Graph) and v.dimension in element.nodes)):
+            elif (not v.applies(element) and v.dimension not in self.overlay_dims):
                 new_style.pop(k)
-                self.warning('Specified %s op %r could not be applied, %s dimension '
-                             'could not be found' % (k, v, v.dimension))
+                self.warning('Specified %s dim transform %r could not be applied, as not all '
+                             'dimensions could be resolved.' % (k, v))
                 continue
 
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index c65fe92a9b..8caf429b19 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -154,6 +154,23 @@ def cat(self, categories, empty=None):
     def bin(self, bins, labels=None):
         return dim(self, bin_fn, bins=bins, labels=labels)
 
+    def applies(self, dataset):
+        if isinstance(self.dimension, dim):
+            applies = self.dimension.applies(dataset)
+        else:
+            applies = dataset.get_dimension(self.dimension) is not None
+            if isinstance(dataset, Graph) and not applies:
+                applies = dataset.nodes.get_dimension(self.dimension) is not None
+        for op in self.ops:
+            other = op.get('other')
+            if other is None:
+                continue
+            elif isinstance(other, basestring):
+                applies &= dim(other).applies(dataset)
+            elif isinstance(other, dim):
+                applies &= other.applies(dataset)
+        return applies
+
     def eval(self, dataset, flat=False, expanded=None, ranges={}):
         if expanded is None:
             expanded = not ((dataset.interface.gridded and self.dimension in dataset.kdims) or

From 82808f6f4c8462d78a678af2a12036c5248839d4 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 01:02:43 +0000
Subject: [PATCH 060/117] Added support for normalizing dim transforms

---
 holoviews/plotting/bokeh/element.py | 34 +++++++++++-------
 holoviews/plotting/mpl/element.py   | 25 +++++++++++---
 holoviews/plotting/plot.py          | 53 ++++++++++++++++++++++-------
 3 files changed, 84 insertions(+), 28 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index ad13a2c7f6..36a2e96592 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -729,7 +729,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                 kwargs = {}
                 if val.dtype.kind not in 'if':
                     kwargs['factors'] = np.unique(val)
-                cmapper = self._get_colormapper(v.dimension, element, ranges,
+                cmapper = self._get_colormapper(v, element, ranges,
                                                 style, name=k+'_color_mapper',
                                                 group=group, **kwargs)
                 key = {'field': k, 'transform': cmapper}
@@ -1251,19 +1251,20 @@ def _draw_colorbar(self, plot, color_mapper, prefix=''):
         self.handles[prefix+'colorbar'] = color_bar
 
 
-    def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=None,
+    def _get_colormapper(self, eldim, element, ranges, style, factors=None, colors=None,
                          group=None, name='color_mapper'):
         # The initial colormapper instance is cached the first time
         # and then only updated
-        if dim is None and colors is None:
+        if eldim is None and colors is None:
             return None
 
         # Attempt to find matching colormapper on the adjoined plot
+        dim_name = repr(eldim)[1:-1] if isinstance(eldim, dim) else dim.name
         if self.adjoined:
-            dim_name = dim.name+'_'+name
+            cmapper_name = dim_name+name
             cmappers = self.adjoined.traverse(lambda x: (x.handles.get('color_dim'),
-                                                         x.handles.get(name, x.handles.get(dim_name))))
-            cmappers = [cmap for cdim, cmap in cmappers if cdim == dim]
+                                                         x.handles.get(name, x.handles.get(cmapper_name))))
+            cmappers = [cmap for cdim, cmap in cmappers if cdim == eldim]
             if cmappers:
                 cmapper = cmappers[0]
                 self.handles['color_mapper'] = cmapper
@@ -1272,11 +1273,13 @@ def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=Non
                 return None
 
         ncolors = None if factors is None else len(factors)
-        if dim:
-            if dim.name in ranges:
-                low, high = ranges[dim.name]['combined']
+        if eldim:
+            if dim_name in ranges:
+                low, high = ranges[dim_name]['combined']
+            elif isinstance(eldim, dim):
+                low, high = np.nan, np.nan
             else:
-                low, high = element.range(dim.name)
+                low, high = element.range(eldim.name)
             if self.symmetric:
                 sym_max = max(abs(low), high)
                 low, high = -sym_max, sym_max
@@ -1290,7 +1293,14 @@ def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=Non
             if factors is None:
                 factors = list(cmap)
             palette = [cmap.get(f, nan_colors.get('NaN', self._default_nan)) for f in factors]
-            factors = [dim.pprint_value(f) for f in factors]
+            if isinstance(eldim, dim):
+                if eldim.dimension in element:
+                    formatter = element.get_dimension(eldim.dimension).pprint_value
+                else:
+                    formatter = str
+            else:
+                formatter = eldim.pprint_value
+            factors = [formatter(f) for f in factors]
         else:
             categorical = ncolors is not None
             if isinstance(self.color_levels, int):
@@ -1318,7 +1328,7 @@ def _get_colormapper(self, dim, element, ranges, style, factors=None, colors=Non
         else:
             cmapper = colormapper(palette=palette, **opts)
             self.handles[name] = cmapper
-            self.handles['color_dim'] = dim
+            self.handles['color_dim'] = eldim
         return cmapper
 
 
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 09ea3291c3..84583d2473 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import, division, unicode_literals
 
 import math
+import warnings
 from types import FunctionType
 
 import param
@@ -565,7 +566,7 @@ def _apply_ops(self, element, ranges, style):
             prefix = '' if group is None else group+'_'
             if k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray) and all(not is_color(c) for c in val):
                 new_style.pop(k)
-                self._norm_kwargs(element, ranges, new_style, v.dimension, val, prefix)
+                self._norm_kwargs(element, ranges, new_style, v, val, prefix)
                 if val.dtype.kind in 'OSUM':
                     val = categorize_colors(val)
                 k = prefix+'c'
@@ -733,15 +734,31 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
         to be passed to matplotlib plot function.
         """
         clim = opts.pop(prefix+'clims', None)
+        dim_name = repr(vdim)[1:-1] if isinstance(vdim, dim) else vdim.name
         if values is None:
-            values = np.asarray(element.dimension_values(vdim))
+            if isinstance(vdim, dim):
+                values = vdim.eval(element)
+            else:
+                values = np.asarray(element.dimension_values(vdim))
         if clim is None:
             if not len(values):
                 clim = (0, 0)
                 categorical = False
             elif values.dtype.kind in 'uif':
-                if vdim.name in ranges:
-                    clim = ranges[vdim.name]['combined']
+                if dim_name in ranges:
+                    clim = ranges[dim_name]['combined']
+                elif isinstance(vdim, dim):
+                    if values.dtype.kind == 'M':
+                        clim = values.min(), values.max()
+                    elif len(values) == 0:
+                        clim = np.NaN, np.NaN
+                    else:
+                        try:
+                            with warnings.catch_warnings():
+                                warnings.filterwarnings('ignore', r'All-NaN (slice|axis) encountered')
+                                drange = (np.nanmin(values), np.nanmax(values))
+                        except:
+                            clim = np.NaN, np.NaN
                 else:
                     clim = element.range(vdim)
                 if self.logz:
diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index 1705b86b3e..6a082e2791 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -4,6 +4,7 @@
 of this Plot baseclass.
 """
 
+import warnings
 from itertools import groupby, product
 from collections import Counter, defaultdict
 
@@ -19,7 +20,8 @@
 from ..core.overlay import NdOverlay
 from ..core.spaces import HoloMap, DynamicMap
 from ..core.util import stream_parameters, isfinite
-from ..element import Table
+from ..element import Table, Graph
+from ..util.ops import dim
 from .util import (get_dynamic_mode, initialize_unbounded, dim_axis_label,
                    attach_streams, traverse_setter, get_nested_streams,
                    compute_overlayable_zorders, get_plot_frame,
@@ -436,24 +438,51 @@ def _get_norm_opts(self, obj):
         return norm_opts
 
 
-    @staticmethod
-    def _compute_group_range(group, elements, ranges):
+    @classmethod
+    def _compute_group_range(cls, group, elements, ranges):
         # Iterate over all elements in a normalization group
         # and accumulate their ranges into the supplied dictionary.
         elements = [el for el in elements if el is not None]
         group_ranges = OrderedDict()
         for el in elements:
             if isinstance(el, (Empty, Table)): continue
-            for dim in el.dimensions('ranges'):
-                data_range = el.range(dim, dimension_range=False)
-                if dim.name not in group_ranges:
-                    group_ranges[dim.name] = {'data': [], 'hard': [], 'soft': []}
-                group_ranges[dim.name]['data'].append(data_range)
-                group_ranges[dim.name]['hard'].append(dim.range)
-                group_ranges[dim.name]['soft'].append(dim.soft_range)
+            opts = cls.lookup_options(el, 'style')
+
+            # Compute normalization for color dim transforms
+            for k, v in opts.kwargs.items():
+                if not isinstance(v, dim) or 'color' not in k:
+                    continue
+                if isinstance(v, dim) and v.applies(el):
+                    dim_name = repr(v)[1:-1]
+                    values = v.eval(el)
+                    if values.dtype.kind == 'M':
+                        drange = values.min(), values.max()
+                    elif len(values) == 0:
+                        drange = np.NaN, np.NaN
+                    else:
+                        try:
+                            with warnings.catch_warnings():
+                                warnings.filterwarnings('ignore', r'All-NaN (slice|axis) encountered')
+                                drange = (np.nanmin(values), np.nanmax(values))
+                        except:
+                            continue
+                    if dim_name not in group_ranges:
+                        group_ranges[dim_name] = {'data': [], 'hard': [], 'soft': []}
+                    group_ranges[dim_name]['data'].append(drange)
+                    group_ranges[dim_name]['hard'].append((None, None))
+                    group_ranges[dim_name]['soft'].append((None, None))
+
+            # Compute dimension normalization
+            for el_dim in el.dimensions('ranges'):
+                data_range = el.range(el_dim, dimension_range=False)
+                if el_dim.name not in group_ranges:
+                    group_ranges[el_dim.name] = {'data': [], 'hard': [], 'soft': []}
+                group_ranges[el_dim.name]['data'].append(data_range)
+                group_ranges[el_dim.name]['hard'].append(el_dim.range)
+                group_ranges[el_dim.name]['soft'].append(el_dim.soft_range)
 
         dim_ranges = []
-        for dim, values in group_ranges.items():
+        for gdim, values in group_ranges.items():
             hard_range = util.max_range(values['hard'], combined=False)
             soft_range = util.max_range(values['soft'])
             data_range = util.max_range(values['data'])
@@ -461,7 +490,7 @@ def _compute_group_range(group, elements, ranges):
                                             hard_range, soft_range)
             dranges = {'data': data_range, 'hard': hard_range,
                        'soft': soft_range, 'combined': combined}
-            dim_ranges.append((dim, dranges))
+            dim_ranges.append((gdim, dranges))
         ranges[group] = OrderedDict(dim_ranges)
 
 

From 8144864df7c5306045df6684c39c7971f0b35506 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 01:03:07 +0000
Subject: [PATCH 061/117] Better handling for filled and non-filled glyphs

---
 holoviews/plotting/bokeh/element.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 36a2e96592..dcde5f1d7d 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -740,14 +740,16 @@ def _apply_ops(self, element, source, ranges, style, group=None):
             for s in ('alpha', 'color'):
                 if prefix+s != style or style not in source.data:
                     continue
+                supports_fill = any(o.startswith(prefix+'fill') and getattr(self, 'filled', True)
+                                    for o in self.style_opts)
                 fill_style = new_style.get(prefix+'fill_'+s)
-                if fill_style and validate(s, fill_style):
+                if ((fill_style is not None and validate(s, fill_style))
+                    or (fill_style is None and supports_fill)):
                     new_style[prefix+'fill_'+s] = val
 
                 # If glyph has fill and line style is set skip setting line color
                 line_style = new_style.get(prefix+'line_'+s)
-                if any(o.startswith(prefix+'fill') and getattr(self, 'filled', True)
-                       for o in self.style_opts) and line_style is not None:
+                if supports_fill and line_style is not None:
                     continue
                 if line_style and validate(s, line_style):
                     new_style[prefix+'line_'+s] = val

From 8f89a0e4bef7228699a97c1718a87113073a1bbd Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 01:03:20 +0000
Subject: [PATCH 062/117] Handle alpha validation

---
 holoviews/plotting/bokeh/styles.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/holoviews/plotting/bokeh/styles.py b/holoviews/plotting/bokeh/styles.py
index a86a5c5552..69a80b21c3 100644
--- a/holoviews/plotting/bokeh/styles.py
+++ b/holoviews/plotting/bokeh/styles.py
@@ -5,7 +5,7 @@
 import numpy as np
 
 from bokeh.core.properties import (
-    Angle, Color, DashPattern, FontSize, MarkerType, Size
+    Angle, Color, DashPattern, FontSize, MarkerType, Percent, Size
 )
 
 try:
@@ -83,6 +83,7 @@ def mpl_to_bokeh(properties):
 
 # Validation
 
+alpha     = Percent()
 angle     = Angle()
 color     = Color()
 dash_pattern = DashPattern()
@@ -92,6 +93,7 @@ def mpl_to_bokeh(properties):
 
 validators = {
     'angle'     : angle.is_valid,
+    'alpha'     : alpha.is_valid,
     'color'     : lambda x: (
         color.is_valid(x) or (isinstance(x, basestring) and RGB_HEX_REGEX.match(x))
     ),

From 5868705c35371c02dd30fb2aaf78d3d7d9dbd7d9 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 01:03:39 +0000
Subject: [PATCH 063/117] Added unit tests for stats elements

---
 .../plotting/bokeh/testboxwhiskerplot.py      |  53 ++++++++-
 .../tests/plotting/bokeh/testviolinplot.py    | 103 ++++++++++++++++++
 2 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/holoviews/tests/plotting/bokeh/testboxwhiskerplot.py b/holoviews/tests/plotting/bokeh/testboxwhiskerplot.py
index c880d574d5..07431d0e4a 100644
--- a/holoviews/tests/plotting/bokeh/testboxwhiskerplot.py
+++ b/holoviews/tests/plotting/bokeh/testboxwhiskerplot.py
@@ -7,7 +7,7 @@
 from .testplot import TestBokehPlot, bokeh_renderer
 
 try:
-    from bokeh.models import ColumnDataSource
+    from bokeh.models import ColumnDataSource, CategoricalColorMapper, LinearColorMapper
 except:
     pass
 
@@ -42,3 +42,54 @@ def test_box_whisker_padding_square(self):
         y_range = plot.handles['y_range']
         self.assertEqual(y_range.start, 0.8)
         self.assertEqual(y_range.end, 3.2)
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_box_whisker_linear_color_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5), 5)
+        box = BoxWhisker((a, b, np.arange(25)), ['a', 'b'], 'd').options(box_color='b')
+        plot = bokeh_renderer.get_plot(box)
+        source = plot.handles['vbar_1_source']
+        cmapper = plot.handles['box_color_color_mapper']
+        glyph = plot.handles['vbar_1_glyph']
+        self.assertEqual(source.data['box_color'], np.arange(5))
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 4)
+        self.assertEqual(glyph.fill_color, {'field': 'box_color', 'transform': cmapper})
+
+    def test_box_whisker_categorical_color_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(['A', 'B', 'C', 'D', 'E'], 5)
+        box = BoxWhisker((a, b, np.arange(25)), ['a', 'b'], 'd').options(box_color='b')
+        plot = bokeh_renderer.get_plot(box)
+        source = plot.handles['vbar_1_source']
+        glyph = plot.handles['vbar_1_glyph']
+        cmapper = plot.handles['box_color_color_mapper']
+        self.assertEqual(source.data['box_color'], b[::5])
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C', 'D', 'E'])
+        self.assertEqual(glyph.fill_color, {'field': 'box_color', 'transform': cmapper})
+
+    def test_box_whisker_alpha_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5)/10., 5)
+        box = BoxWhisker((a, b, np.arange(25)), ['a', 'b'], 'd').options(box_alpha='b')
+        plot = bokeh_renderer.get_plot(box)
+        source = plot.handles['vbar_1_source']
+        glyph = plot.handles['vbar_1_glyph']
+        self.assertEqual(source.data['box_alpha'], np.arange(5)/10.)
+        self.assertEqual(glyph.fill_alpha, {'field': 'box_alpha'})
+
+    def test_box_whisker_line_width_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5), 5)
+        box = BoxWhisker((a, b, np.arange(25)), ['a', 'b'], 'd').options(box_line_width='b')
+        plot = bokeh_renderer.get_plot(box)
+        source = plot.handles['vbar_1_source']
+        glyph = plot.handles['vbar_1_glyph']
+        self.assertEqual(source.data['box_line_width'], np.arange(5))
+        self.assertEqual(glyph.line_width, {'field': 'box_line_width'})
diff --git a/holoviews/tests/plotting/bokeh/testviolinplot.py b/holoviews/tests/plotting/bokeh/testviolinplot.py
index 1a0db7e249..ebb07cffce 100644
--- a/holoviews/tests/plotting/bokeh/testviolinplot.py
+++ b/holoviews/tests/plotting/bokeh/testviolinplot.py
@@ -7,6 +7,11 @@
 
 from .testplot import TestBokehPlot, bokeh_renderer
 
+try:
+    from bokeh.models import LinearColorMapper, CategoricalColorMapper
+except:
+    pass
+
 
 class TestBokehViolinPlot(TestBokehPlot):
 
@@ -77,3 +82,101 @@ def test_violin_empty(self):
         patch_source = plot.handles['patches_1_source']
         self.assertEqual(patch_source.data['xs'], [[]])
         self.assertEqual(patch_source.data['ys'], [np.array([])])
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_violin_linear_color_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5), 5)
+        violin = Violin((a, b, np.arange(25)), ['a', 'b'], 'd').options(violin_color='b')
+        plot = bokeh_renderer.get_plot(violin)
+        source = plot.handles['patches_1_source']
+        cmapper = plot.handles['violin_color_color_mapper']
+        glyph = plot.handles['patches_1_glyph']
+        self.assertEqual(source.data['violin_color'], np.arange(5))
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 4)
+        self.assertEqual(glyph.fill_color, {'field': 'violin_color', 'transform': cmapper})
+
+    def test_violin_categorical_color_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(['A', 'B', 'C', 'D', 'E'], 5)
+        violin = Violin((a, b, np.arange(25)), ['a', 'b'], 'd').options(violin_color='b')
+        plot = bokeh_renderer.get_plot(violin)
+        source = plot.handles['patches_1_source']
+        glyph = plot.handles['patches_1_glyph']
+        cmapper = plot.handles['violin_color_color_mapper']
+        self.assertEqual(source.data['violin_color'], b[::5])
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C', 'D', 'E'])
+        self.assertEqual(glyph.fill_color, {'field': 'violin_color', 'transform': cmapper})
+
+    def test_violin_alpha_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5)/10., 5)
+        violin = Violin((a, b, np.arange(25)), ['a', 'b'], 'd').options(violin_alpha='b')
+        plot = bokeh_renderer.get_plot(violin)
+        source = plot.handles['patches_1_source']
+        glyph = plot.handles['patches_1_glyph']
+        self.assertEqual(source.data['violin_alpha'], np.arange(5)/10.)
+        self.assertEqual(glyph.fill_alpha, {'field': 'violin_alpha'})
+
+    def test_violin_line_width_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5), 5)
+        violin = Violin((a, b, np.arange(25)), ['a', 'b'], 'd').options(violin_line_width='b')
+        plot = bokeh_renderer.get_plot(violin)
+        source = plot.handles['patches_1_source']
+        glyph = plot.handles['patches_1_glyph']
+        self.assertEqual(source.data['violin_line_width'], np.arange(5))
+        self.assertEqual(glyph.line_width, {'field': 'violin_line_width'})
+
+    def test_violin_box_linear_color_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5), 5)
+        violin = Violin((a, b, np.arange(25)), ['a', 'b'], 'd').options(box_color='b')
+        plot = bokeh_renderer.get_plot(violin)
+        source = plot.handles['vbar_1_source']
+        cmapper = plot.handles['box_color_color_mapper']
+        glyph = plot.handles['vbar_1_glyph']
+        self.assertEqual(source.data['box_color'], np.arange(5))
+        self.assertTrue(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 0)
+        self.assertEqual(cmapper.high, 4)
+        self.assertEqual(glyph.fill_color, {'field': 'box_color', 'transform': cmapper})
+
+    def test_violin_box_categorical_color_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(['A', 'B', 'C', 'D', 'E'], 5)
+        violin = Violin((a, b, np.arange(25)), ['a', 'b'], 'd').options(box_color='b')
+        plot = bokeh_renderer.get_plot(violin)
+        source = plot.handles['vbar_1_source']
+        glyph = plot.handles['vbar_1_glyph']
+        cmapper = plot.handles['box_color_color_mapper']
+        self.assertEqual(source.data['box_color'], b[::5])
+        self.assertTrue(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C', 'D', 'E'])
+        self.assertEqual(glyph.fill_color, {'field': 'box_color', 'transform': cmapper})
+
+    def test_violin_box_alpha_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5)/10., 5)
+        violin = Violin((a, b, np.arange(25)), ['a', 'b'], 'd').options(box_alpha='b')
+        plot = bokeh_renderer.get_plot(violin)
+        source = plot.handles['vbar_1_source']
+        glyph = plot.handles['vbar_1_glyph']
+        self.assertEqual(source.data['box_alpha'], np.arange(5)/10.)
+        self.assertEqual(glyph.fill_alpha, {'field': 'box_alpha'})
+
+    def test_violin_box_line_width_op(self):
+        a = np.repeat(np.arange(5), 5)
+        b = np.repeat(np.arange(5), 5)
+        violin = Violin((a, b, np.arange(25)), ['a', 'b'], 'd').options(box_line_width='b')
+        plot = bokeh_renderer.get_plot(violin)
+        source = plot.handles['vbar_1_source']
+        glyph = plot.handles['vbar_1_glyph']
+        self.assertEqual(source.data['box_line_width'], np.arange(5))
+        self.assertEqual(glyph.line_width, {'field': 'box_line_width'})

From c30e29e90a45e3cefd6e2adcd9b47bdfb776b08f Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 01:34:42 +0000
Subject: [PATCH 064/117] Small fix

---
 holoviews/plotting/bokeh/element.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index dcde5f1d7d..714e3f6aa6 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -1261,7 +1261,7 @@ def _get_colormapper(self, eldim, element, ranges, style, factors=None, colors=N
             return None
 
         # Attempt to find matching colormapper on the adjoined plot
-        dim_name = repr(eldim)[1:-1] if isinstance(eldim, dim) else dim.name
+        dim_name = repr(eldim)[1:-1] if isinstance(eldim, dim) else eldim.name
         if self.adjoined:
             cmapper_name = dim_name+name
             cmappers = self.adjoined.traverse(lambda x: (x.handles.get('color_dim'),

From 61e6419f6aa9ec14429a2ac61da99d70d54e7de9 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 01:35:10 +0000
Subject: [PATCH 065/117] Added HexTilePlot unit tests

---
 .../tests/plotting/bokeh/testhextilesplot.py  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/holoviews/tests/plotting/bokeh/testhextilesplot.py b/holoviews/tests/plotting/bokeh/testhextilesplot.py
index ea46f419e2..aece7957f1 100644
--- a/holoviews/tests/plotting/bokeh/testhextilesplot.py
+++ b/holoviews/tests/plotting/bokeh/testhextilesplot.py
@@ -101,3 +101,28 @@ def test_hex_tiles_hover_weighted(self):
         dims, opts = plot._hover_opts(tiles)
         self.assertEqual(dims, [Dimension('z')])
         self.assertEqual(opts, {})
+
+    ###########################
+    #    Styling mapping      #
+    ###########################
+
+    def test_hex_tile_line_width_op(self):
+        hextiles = HexTiles(np.random.randn(1000, 2)).options(line_width='Count')
+        plot = list(bokeh_renderer.get_plot(hextiles).subplots.values())[0]
+        glyph = plot.handles['glyph']
+        cds = plot.handles['cds']
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
+
+    def test_hex_tile_alpha_op(self):
+        hextiles = HexTiles(np.random.randn(1000, 2)).options(alpha='Count')
+        plot = list(bokeh_renderer.get_plot(hextiles).subplots.values())[0]
+        glyph = plot.handles['glyph']
+        cds = plot.handles['cds']
+        self.assertEqual(glyph.fill_alpha, {'field': 'alpha'})
+
+    def test_hex_tile_scale_op(self):
+        hextiles = HexTiles(np.random.randn(1000, 2)).options(scale='Count')
+        plot = list(bokeh_renderer.get_plot(hextiles).subplots.values())[0]
+        glyph = plot.handles['glyph']
+        cds = plot.handles['cds']
+        self.assertEqual(glyph.scale, {'field': 'scale'})

From 5828804fe3fdd55a7089f88fcf8fe287a9f942ee Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 01:50:25 +0000
Subject: [PATCH 066/117] Fixed flakes

---
 holoviews/plotting/mpl/element.py                   |  2 +-
 holoviews/plotting/plot.py                          |  2 +-
 holoviews/tests/plotting/bokeh/testhextilesplot.py  |  3 ---
 .../tests/plotting/matplotlib/testerrorbarplot.py   |  1 -
 .../tests/plotting/matplotlib/testgraphplot.py      |  4 ++--
 holoviews/tests/plotting/matplotlib/testlabels.py   |  1 +
 .../tests/plotting/matplotlib/testspikeplot.py      |  1 -
 .../plotting/matplotlib/testvectorfieldplot.py      | 11 -----------
 holoviews/util/ops.py                               | 13 +++++++++++++
 9 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 84583d2473..a28c945b06 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -756,7 +756,7 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
                         try:
                             with warnings.catch_warnings():
                                 warnings.filterwarnings('ignore', r'All-NaN (slice|axis) encountered')
-                                drange = (np.nanmin(values), np.nanmax(values))
+                                clim = (np.nanmin(values), np.nanmax(values))
                         except:
                             clim = np.NaN, np.NaN
                 else:
diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index 6a082e2791..c4d2767814 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -20,7 +20,7 @@
 from ..core.overlay import NdOverlay
 from ..core.spaces import HoloMap, DynamicMap
 from ..core.util import stream_parameters, isfinite
-from ..element import Table, Graph
+from ..element import Table
 from ..util.ops import dim
 from .util import (get_dynamic_mode, initialize_unbounded, dim_axis_label,
                    attach_streams, traverse_setter, get_nested_streams,
diff --git a/holoviews/tests/plotting/bokeh/testhextilesplot.py b/holoviews/tests/plotting/bokeh/testhextilesplot.py
index aece7957f1..a569148e77 100644
--- a/holoviews/tests/plotting/bokeh/testhextilesplot.py
+++ b/holoviews/tests/plotting/bokeh/testhextilesplot.py
@@ -110,19 +110,16 @@ def test_hex_tile_line_width_op(self):
         hextiles = HexTiles(np.random.randn(1000, 2)).options(line_width='Count')
         plot = list(bokeh_renderer.get_plot(hextiles).subplots.values())[0]
         glyph = plot.handles['glyph']
-        cds = plot.handles['cds']
         self.assertEqual(glyph.line_width, {'field': 'line_width'})
 
     def test_hex_tile_alpha_op(self):
         hextiles = HexTiles(np.random.randn(1000, 2)).options(alpha='Count')
         plot = list(bokeh_renderer.get_plot(hextiles).subplots.values())[0]
         glyph = plot.handles['glyph']
-        cds = plot.handles['cds']
         self.assertEqual(glyph.fill_alpha, {'field': 'alpha'})
 
     def test_hex_tile_scale_op(self):
         hextiles = HexTiles(np.random.randn(1000, 2)).options(scale='Count')
         plot = list(bokeh_renderer.get_plot(hextiles).subplots.values())[0]
         glyph = plot.handles['glyph']
-        cds = plot.handles['cds']
         self.assertEqual(glyph.scale, {'field': 'scale'})
diff --git a/holoviews/tests/plotting/matplotlib/testerrorbarplot.py b/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
index 655ff6a998..7cf6f1caed 100644
--- a/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
+++ b/holoviews/tests/plotting/matplotlib/testerrorbarplot.py
@@ -2,7 +2,6 @@
 
 from holoviews.core.spaces import HoloMap
 from holoviews.element import ErrorBars
-from holoviews.plotting.util import hex2rgb
 
 from .testplot import TestMPLPlot, mpl_renderer
 
diff --git a/holoviews/tests/plotting/matplotlib/testgraphplot.py b/holoviews/tests/plotting/matplotlib/testgraphplot.py
index fb62a1d978..9ccf914e93 100644
--- a/holoviews/tests/plotting/matplotlib/testgraphplot.py
+++ b/holoviews/tests/plotting/matplotlib/testgraphplot.py
@@ -388,7 +388,7 @@ def test_trimesh_op_node_alpha(self):
         nodes = [(-1, -1, 0, 0.2), (0, 0, 1, 0.6), (0, 1, 2, 1), (1, 0, 3, 0.3)]
         trimesh = TriMesh((edges, Nodes(nodes, vdims='alpha'))).options(node_alpha='alpha')
         with self.assertRaises(Exception):
-            mpl_renderer.get_plot(graph)
+            mpl_renderer.get_plot(trimesh)
 
     def test_trimesh_op_node_line_width(self):
         edges = [(0, 1, 2), (1, 2, 3)]
@@ -439,7 +439,7 @@ def test_trimesh_op_edge_alpha(self):
         nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
         trimesh = TriMesh((edges, nodes), vdims='alpha').options(edge_alpha='alpha')
         with self.assertRaises(Exception):
-            mpl_renderer.get_plot(graph)
+            mpl_renderer.get_plot(trimesh)
 
     def test_trimesh_op_edge_line_width(self):
         edges = [(0, 1, 2, 7), (1, 2, 3, 3)]
diff --git a/holoviews/tests/plotting/matplotlib/testlabels.py b/holoviews/tests/plotting/matplotlib/testlabels.py
index 2b7eb0a1bb..cc2f3c6759 100644
--- a/holoviews/tests/plotting/matplotlib/testlabels.py
+++ b/holoviews/tests/plotting/matplotlib/testlabels.py
@@ -106,6 +106,7 @@ def test_label_size_op(self):
                         vdims='size').options(size='size')
         plot = mpl_renderer.get_plot(labels)
         artist = plot.handles['artist']
+        self.assertEqual([a.get_fontsize() for a in artist], [8, 6, 12])
 
     def test_label_size_op_update(self):
         labels = HoloMap({
diff --git a/holoviews/tests/plotting/matplotlib/testspikeplot.py b/holoviews/tests/plotting/matplotlib/testspikeplot.py
index 24964d394f..c0985d5cbd 100644
--- a/holoviews/tests/plotting/matplotlib/testspikeplot.py
+++ b/holoviews/tests/plotting/matplotlib/testspikeplot.py
@@ -3,7 +3,6 @@
 from holoviews.core.overlay import NdOverlay
 from holoviews.core.spaces import HoloMap
 from holoviews.element import Spikes
-from holoviews.plotting.util import hex2rgb
 
 from ..utils import ParamLogStream
 from .testplot import TestMPLPlot, mpl_renderer
diff --git a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
index b4bb52687e..9d733f0663 100644
--- a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
+++ b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
@@ -44,17 +44,6 @@ def test_vectorfield_color_op_update(self):
             [1, 0, 0, 1]
         ]))
 
-    def test_vectorfield_color_op(self):
-        vectorfield = VectorField([(0, 0, 0, 1, '#000000'), (0, 1, 0, 1,'#FF0000'), (0, 2, 0, 1,'#00FF00')],
-                                  vdims=['A', 'M', 'color']).options(color='color')
-        plot = mpl_renderer.get_plot(vectorfield)
-        artist = plot.handles['artist']
-        self.assertEqual(artist.get_facecolors(), np.array([
-            [0, 0, 0, 1],
-            [1, 0, 0, 1],
-            [0, 1, 0, 1]
-        ]))
-
     def test_vectorfield_linear_color_op_update(self):
         vectorfield = HoloMap({
             0: VectorField([(0, 0, 0, 1, 0), (0, 1, 0, 1, 1), (0, 2, 0, 1, 2)],
diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 8caf429b19..063a0fb8be 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -56,6 +56,11 @@ def int_fn(values):
 
 
 class dim(object):
+    """
+    dim transform objects are a way to express deferred transformations
+    on HoloViews element types. It supports all mathematical operations,
+    NumPy ufuncs and provides a number of useful methods.
+    """
 
     _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn,
                     str: str_fn, int: int_fn}
@@ -154,6 +159,14 @@ def cat(self, categories, empty=None):
     def bin(self, bins, labels=None):
         return dim(self, bin_fn, bins=bins, labels=labels)
 
+    @property
+    def dimensions(self):
+        dims = []
+        if isinstance(self.dimension, dim):
+            dims += self.dimension.dimensions
+        else:
+            dims.append(self.dimension)
+
     def applies(self, dataset):
         if isinstance(self.dimension, dim):
             applies = self.dimension.applies(dataset)

From e2700a1855a27d2109750e66bae146677aed00d3 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 02:33:22 +0000
Subject: [PATCH 067/117] Fixed unit tests

---
 holoviews/plotting/mpl/chart.py                   |  9 +++++----
 holoviews/plotting/mpl/sankey.py                  |  2 +-
 holoviews/tests/plotting/bokeh/testbarplot.py     | 10 ----------
 holoviews/tests/plotting/matplotlib/testlabels.py |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index bd78ee2a12..3f02abadad 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -632,10 +632,7 @@ def _compute_styles(self, element, ranges, style):
                 style['c'] = categorize_colors(cs)
             self._norm_kwargs(element, ranges, style, cdim)
         elif color is not None:
-            if np.isscalar(color):
-                style['c'] = color
-            else:
-                style['color'] = color
+            style['color'] = color
         style['edgecolors'] = style.pop('edgecolors', style.pop('edgecolor', 'none'))
 
         ms = style.get('s', mpl.rcParams['lines.markersize'])
@@ -671,6 +668,10 @@ def update_handles(self, key, axis, element, ranges, style):
             paths.norm = style['norm']
         if 'linewidth' in style:
             paths.set_linewidths(style['linewidth'])
+        if 'edgecolors' in style:
+            paths.set_edgecolors(style['edgecolors'])
+        if 'facecolors' in style:
+            paths.set_edgecolors(style['facecolors'])
 
 
 
diff --git a/holoviews/plotting/mpl/sankey.py b/holoviews/plotting/mpl/sankey.py
index 9a3baed705..6e23ae6dd3 100644
--- a/holoviews/plotting/mpl/sankey.py
+++ b/holoviews/plotting/mpl/sankey.py
@@ -106,7 +106,7 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         groups = [g for g in self._style_groups if g != 'node']
         node_opts = {k[5:] if 'node_' in k else k: v
                      for k, v in plot_kwargs.items()
-                     if not (any(k.startswith(p) for p in groups) or 'size' in k)}
+                     if not (any(k.startswith(p) for p in groups) or 's' == k)}
         rects = [Rectangle(**rect) for rect in plot_args['rects']]
         artists['rects'] = ax.add_collection(PatchCollection(rects, **node_opts))
         artists['labels'] = self._update_labels(ax, plot_args, plot_kwargs)
diff --git a/holoviews/tests/plotting/bokeh/testbarplot.py b/holoviews/tests/plotting/bokeh/testbarplot.py
index 9f0b4872b3..6e57fc0001 100644
--- a/holoviews/tests/plotting/bokeh/testbarplot.py
+++ b/holoviews/tests/plotting/bokeh/testbarplot.py
@@ -242,13 +242,3 @@ def test_bars_color_index_color_clash(self):
                    "and declare a color_index, ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
-
-    def test_bars_color_index_color_no_clash(self):
-        bars = Bars([(0, 0, 0), (0, 1, 1), (0, 2, 2)],
-                    vdims=['y', 'color']).options(line_color='color', color_index='color')
-        plot = bokeh_renderer.get_plot(bars)
-        glyph = plot.handles['glyph']
-        cmapper = plot.handles['line_color_color_mapper']
-        cmapper2 = plot.handles['color_mapper']
-        self.assertEqual(glyph.line_color, {'field': 'line_color', 'transform': cmapper})
-        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper2})
diff --git a/holoviews/tests/plotting/matplotlib/testlabels.py b/holoviews/tests/plotting/matplotlib/testlabels.py
index cc2f3c6759..5da51f7915 100644
--- a/holoviews/tests/plotting/matplotlib/testlabels.py
+++ b/holoviews/tests/plotting/matplotlib/testlabels.py
@@ -106,7 +106,7 @@ def test_label_size_op(self):
                         vdims='size').options(size='size')
         plot = mpl_renderer.get_plot(labels)
         artist = plot.handles['artist']
-        self.assertEqual([a.get_fontsize() for a in artist], [8, 6, 12])
+        self.assertEqual([a.get_fontsize() for a in artist], [8, 12, 6])
 
     def test_label_size_op_update(self):
         labels = HoloMap({

From 47f65bebcdc096c21fed98ea940bd2761abf336a Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 04:05:33 +0000
Subject: [PATCH 068/117] Added unit tests for contour and polygon plots

---
 holoviews/plotting/bokeh/path.py              |  13 +-
 holoviews/plotting/mpl/element.py             |  10 +-
 holoviews/plotting/mpl/path.py                |  37 +++-
 .../tests/plotting/bokeh/testpathplot.py      | 135 ++++++++++++
 .../tests/plotting/matplotlib/testpathplot.py | 196 ++++++++++++++++++
 5 files changed, 375 insertions(+), 16 deletions(-)

diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index b6ce88645b..f74ea56551 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -7,8 +7,10 @@
 
 from ...core import util
 from ...element import Polygons
+from ...util.ops import dim
 from .element import ColorbarPlot, LegendPlot
-from .styles import expand_batched_style, line_properties, fill_properties, mpl_to_bokeh
+from .styles import (expand_batched_style, line_properties, fill_properties,
+                     mpl_to_bokeh, validate)
 from .util import bokeh_version, multi_polygons_data
 
 
@@ -53,9 +55,9 @@ def _get_hover_data(self, data, element):
     def get_data(self, element, ranges, style):
         color = style.get('color', None)
         cdim = None
-        if isinstance(color, util.basestring):
+        if isinstance(color, util.basestring) and validate('color', color) == False:
             cdim = element.get_dimension(color)
-        if cdim is None:
+        elif self.color_index is not None:
             cdim = element.get_dimension(self.color_index)
         inds = (1, 0) if self.invert_axes else (0, 1)
         mapping = dict(self._mapping)
@@ -182,7 +184,10 @@ def get_data(self, element, ranges, style):
                 xs, ys = ys, xs
             data = dict(xs=xs, ys=ys)
         mapping = dict(self._mapping)
-        if None not in [element.level, self.color_index] and element.vdims:
+        color = style.get('color')
+        if (isinstance(color, dim) and color.applies(element)) or color in element:
+            cdim = None
+        elif None not in [element.level, self.color_index] and element.vdims:
             cdim = element.vdims[0]
         else:
             cidx = self.color_index+2 if isinstance(self.color_index, int) else self.color_index
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index a28c945b06..3e270c974e 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -564,7 +564,8 @@ def _apply_ops(self, element, ranges, style):
             groups = [sg for sg in style_groups if k.startswith(sg)]
             group = groups[0] if groups else None
             prefix = '' if group is None else group+'_'
-            if k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray) and all(not is_color(c) for c in val):
+            if (k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray)
+                and any(not is_color(c) for c in val)):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v, val, prefix)
                 if val.dtype.kind in 'OSUM':
@@ -739,7 +740,12 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
             if isinstance(vdim, dim):
                 values = vdim.eval(element)
             else:
-                values = np.asarray(element.dimension_values(vdim))
+                expanded = not (
+                    element.interface.multi and
+                    (element.level is not None or
+                     element.interface.isscalar(element, vdim.name))
+                )
+                values = np.asarray(element.dimension_values(vdim, expanded=expanded))
         if clim is None:
             if not len(values):
                 clim = (0, 0)
diff --git a/holoviews/plotting/mpl/path.py b/holoviews/plotting/mpl/path.py
index b01fc3b359..d4fb499eae 100644
--- a/holoviews/plotting/mpl/path.py
+++ b/holoviews/plotting/mpl/path.py
@@ -70,6 +70,12 @@ def update_handles(self, key, axis, element, ranges, style):
         if 'norm' in style:
             artist.set_norm(style['norm'])
         artist.set_visible(style.get('visible', True))
+        if 'colors' in style:
+            artist.set_edgecolors(style['colors'])
+        if 'facecolors' in style:
+            artist.set_facecolors(style['facecolors'])
+        if 'linewidth' in style:
+            artist.set_linewidths(style['linewidth'])
         return axis_kwargs
 
 
@@ -85,27 +91,37 @@ def _finalize_artist(self, element):
             cdim = element.get_dimension(cidx)
             self._draw_colorbar(cdim)
 
-    def get_data(self, element, ranges, style):
-        with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
-
-        if None not in [element.level, self.color_index]:
-            cdim = element.vdims[0]
-        else:
-            cidx = self.color_index+2 if isinstance(self.color_index, int) else self.color_index
-            cdim = element.get_dimension(cidx)
+    def init_artists(self, ax, plot_args, plot_kwargs):
+        line_segments = LineCollection(*plot_args, **plot_kwargs)
+        ax.add_collection(line_segments)
+        return {'artist': line_segments}
 
+    def get_data(self, element, ranges, style):
         if isinstance(element, Polygons):
+            color_prop = 'facecolors'
             subpaths = polygons_to_path_patches(element)
             paths = [path for subpath in subpaths for path in subpath]
             if self.invert_axes:
                 for p in paths:
                     p._path.vertices = p._path.vertices[:, ::-1]
         else:
+            color_prop = 'colors'
             paths = element.split(datatype='array', dimensions=element.kdims)
             if self.invert_axes:
                 paths = [p[:, ::-1] for p in paths]
 
+        with abbreviated_exception():
+            style = self._apply_ops(element, ranges, style)
+        if 'c' in style:
+            style['array'] = style.pop('c')
+        if isinstance(style.get('color'), np.ndarray):
+            style[color_prop] = style.pop('color')
+        if None not in [element.level, self.color_index]:
+            cdim = element.vdims[0]
+        else:
+            cidx = self.color_index+2 if isinstance(self.color_index, int) else self.color_index
+            cdim = element.get_dimension(cidx)
+
         if cdim is None:
             return (paths,), style, {}
 
@@ -140,7 +156,8 @@ class PolygonPlot(ContourPlot):
         Whether to show legend for the plot.""")
 
     style_opts = ['alpha', 'cmap', 'facecolor', 'edgecolor', 'linewidth',
-                  'hatch', 'linestyle', 'joinstyle', 'fill', 'capstyle']
+                  'hatch', 'linestyle', 'joinstyle', 'fill', 'capstyle',
+                  'color']
 
     def init_artists(self, ax, plot_args, plot_kwargs):
         polys = PatchCollection(*plot_args, **plot_kwargs)
diff --git a/holoviews/tests/plotting/bokeh/testpathplot.py b/holoviews/tests/plotting/bokeh/testpathplot.py
index 7a9dba00b6..284d7f186e 100644
--- a/holoviews/tests/plotting/bokeh/testpathplot.py
+++ b/holoviews/tests/plotting/bokeh/testpathplot.py
@@ -9,6 +9,12 @@
 
 from .testplot import TestBokehPlot, bokeh_renderer
 
+try:
+    from bokeh.models import LinearColorMapper, CategoricalColorMapper
+except:
+    pass
+
+
 
 class TestPathPlot(TestBokehPlot):
 
@@ -194,6 +200,73 @@ def test_multi_polygon_hole_plot(self):
         self.assertEqual(source.data['ys'], [[[np.array([2, 0, 7]), np.array([2, 3, 1.6]),
                                                np.array([4.5, 5, 3.5])], [np.array([7, 5, 2])]]])
 
+    def test_polygons_color_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'green'},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'red'}
+        ], vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(polygons)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        self.assertEqual(glyph.line_color, 'black')
+        self.assertEqual(glyph.fill_color, {'field': 'color'})
+        self.assertEqual(cds.data['color'], np.array(['green', 'red']))
+
+    def test_polygons_linear_color_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 3}
+        ], vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(polygons)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertEqual(glyph.line_color, 'black')
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(cds.data['color'], np.array([7, 3]))
+        self.assertIsInstance(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 3)
+        self.assertEqual(cmapper.high, 7)
+
+    def test_polygons_categorical_color_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'b'},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'a'}
+        ], vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(polygons)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertEqual(glyph.line_color, 'black')
+        self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(cds.data['color'], np.array(['b', 'a']))
+        self.assertIsInstance(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['a', 'b'])
+
+    def test_polygons_alpha_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'alpha': 0.7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'alpha': 0.3}
+        ], vdims='alpha').options(alpha='alpha')
+        plot = bokeh_renderer.get_plot(polygons)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        self.assertEqual(glyph.line_alpha, {'field': 'alpha'})
+        self.assertEqual(glyph.fill_alpha, {'field': 'alpha'})
+        self.assertEqual(cds.data['alpha'], np.array([0.7, 0.3]))
+
+    def test_polygons_line_width_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'line_width': 7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'line_width': 3}
+        ], vdims='line_width').options(line_width='line_width')
+        plot = bokeh_renderer.get_plot(polygons)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
+        self.assertEqual(cds.data['line_width'], np.array([7, 3]))
+
+
 
 class TestContoursPlot(TestBokehPlot):
 
@@ -204,3 +277,65 @@ def test_empty_contours_plot(self):
         self.assertEqual(len(source.data['xs']), 0)
         self.assertEqual(len(source.data['ys']), 0)
         self.assertEqual(len(source.data['Intensity']), 0)
+
+    def test_contours_color_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'green'},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'red'}
+        ], vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(contours)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        self.assertEqual(glyph.line_color, {'field': 'color'})
+        self.assertEqual(cds.data['color'], np.array(['green', 'red']))
+
+    def test_contours_linear_color_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 3}
+        ], vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(contours)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(cds.data['color'], np.array([7, 3]))
+        self.assertIsInstance(cmapper, LinearColorMapper)
+        self.assertEqual(cmapper.low, 3)
+        self.assertEqual(cmapper.high, 7)
+
+    def test_contours_categorical_color_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'b'},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'a'}
+        ], vdims='color').options(color='color')
+        plot = bokeh_renderer.get_plot(contours)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(cds.data['color'], np.array(['b', 'a']))
+        self.assertIsInstance(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['a', 'b'])
+
+    def test_contours_alpha_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'alpha': 0.7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'alpha': 0.3}
+        ], vdims='alpha').options(alpha='alpha')
+        plot = bokeh_renderer.get_plot(contours)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        self.assertEqual(glyph.line_alpha, {'field': 'alpha'})
+        self.assertEqual(cds.data['alpha'], np.array([0.7, 0.3]))
+
+    def test_contours_line_width_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'line_width': 7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'line_width': 3}
+        ], vdims='line_width').options(line_width='line_width')
+        plot = bokeh_renderer.get_plot(contours)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        self.assertEqual(glyph.line_width, {'field': 'line_width'})
+        self.assertEqual(cds.data['line_width'], np.array([7, 3]))
diff --git a/holoviews/tests/plotting/matplotlib/testpathplot.py b/holoviews/tests/plotting/matplotlib/testpathplot.py
index 3a8610ebd8..eef5bedadb 100644
--- a/holoviews/tests/plotting/matplotlib/testpathplot.py
+++ b/holoviews/tests/plotting/matplotlib/testpathplot.py
@@ -1,6 +1,7 @@
 import numpy as np
 
 from holoviews.core import NdOverlay
+from holoviews.core.spaces import HoloMap
 from holoviews.element import Polygons, Contours
 
 from .testplot import TestMPLPlot, mpl_renderer
@@ -56,6 +57,95 @@ def test_multi_polygon_hole_plot(self):
         self.assertEqual(path2.vertices, np.array([(6, 7), (7, 5), (3, 2)]))
         self.assertEqual(path2.codes, np.array([1, 2, 2]))
 
+    def test_polygons_color_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'green'},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'red'}
+        ], vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(polygons)
+        artist = plot.handles['artist']
+        colors = np.array([[0. , 0.501961, 0. , 1. ],
+                           [1. , 0. , 0. , 1. ]])
+        self.assertEqual(artist.get_facecolors(), colors)
+
+    def test_polygons_color_op_update(self):
+        polygons = HoloMap({
+            0: Polygons([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'green'},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'red'}
+            ], vdims='color'),
+            1: Polygons([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'blue'},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'green'}
+            ], vdims='color'),
+        }).options(color='color')
+        plot = mpl_renderer.get_plot(polygons)
+        artist = plot.handles['artist']
+        colors = np.array([[0, 0.501961, 0, 1],
+                           [1, 0, 0, 1]])
+        self.assertEqual(artist.get_facecolors(), colors)
+        plot.update((1,))
+        colors = np.array([[0, 0, 1, 1],
+                           [0, 0.501961, 0, 1]])
+        self.assertEqual(artist.get_facecolors(), colors)
+
+    def test_polygons_linear_color_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 3}
+        ], vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(polygons)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([7, 3]))
+        self.assertEqual(artist.get_clim(), (3, 7))
+
+    def test_polygons_linear_color_op_update(self):
+        polygons = HoloMap({
+            0: Polygons([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 7},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 3}
+            ], vdims='color'),
+            1: Polygons([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 2},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 5}
+            ], vdims='color'),
+        }).options(color='color', framewise=True)
+        plot = mpl_renderer.get_plot(polygons)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([7, 3]))
+        self.assertEqual(artist.get_clim(), (3, 7))
+        plot.update((1,))
+        self.assertEqual(artist.get_array(), np.array([2, 5]))
+        self.assertEqual(artist.get_clim(), (2, 5))
+
+    def test_polygons_categorical_color_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'b'},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'a'}
+        ], vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(polygons)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([1, 0]))
+        self.assertEqual(artist.get_clim(), (0, 1))
+
+    def test_polygons_alpha_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'alpha': 0.7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'alpha': 0.3}
+        ], vdims='alpha').options(alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(polygons)
+
+    def test_polygons_line_width_op(self):
+        polygons = Polygons([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'line_width': 7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'line_width': 3}
+        ], vdims='line_width').options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(polygons)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [7, 3])
+
+
 
 class TestContoursPlot(TestMPLPlot):
 
@@ -66,3 +156,109 @@ def test_contours_categorical_color(self):
         plot = mpl_renderer.get_plot(path)
         artist = plot.handles['artist']
         self.assertEqual(artist.get_array(), np.array([1, 0, 1]))
+        self.assertEqual(artist.get_clim(), (0, 1))
+
+    def test_contours_color_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'green'},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'red'}
+        ], vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(contours)
+        artist = plot.handles['artist']
+        colors = np.array([[0. , 0.501961, 0. , 1. ],
+                           [1. , 0. , 0. , 1. ]])
+        self.assertEqual(artist.get_edgecolors(), colors)
+
+    def test_contours_color_op_update(self):
+        contours = HoloMap({
+            0: Contours([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'green'},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'red'}
+            ], vdims='color'),
+            1: Contours([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'blue'},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'green'}
+            ], vdims='color'),
+        }).options(color='color')
+        plot = mpl_renderer.get_plot(contours)
+        artist = plot.handles['artist']
+        colors = np.array([[0, 0.501961, 0, 1],
+                           [1, 0, 0, 1]])
+        self.assertEqual(artist.get_edgecolors(), colors)
+        plot.update((1,))
+        colors = np.array([[0, 0, 1, 1],
+                           [0, 0.501961, 0, 1]])
+        self.assertEqual(artist.get_edgecolors(), colors)
+
+    def test_contours_linear_color_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 3}
+        ], vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(contours)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([7, 3]))
+        self.assertEqual(artist.get_clim(), (3, 7))
+
+    def test_contours_linear_color_op_update(self):
+        contours = HoloMap({
+            0: Contours([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 7},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 3}
+            ], vdims='color'),
+            1: Contours([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 2},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 5}
+            ], vdims='color'),
+        }).options(color='color', framewise=True)
+        plot = mpl_renderer.get_plot(contours)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([7, 3]))
+        self.assertEqual(artist.get_clim(), (3, 7))
+        plot.update((1,))
+        self.assertEqual(artist.get_array(), np.array([2, 5]))
+        self.assertEqual(artist.get_clim(), (2, 5))
+
+    def test_contours_categorical_color_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'b'},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 'a'}
+        ], vdims='color').options(color='color')
+        plot = mpl_renderer.get_plot(contours)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_array(), np.array([1, 0]))
+        self.assertEqual(artist.get_clim(), (0, 1))
+
+    def test_contours_alpha_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'alpha': 0.7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'alpha': 0.3}
+        ], vdims='alpha').options(alpha='alpha')
+        with self.assertRaises(Exception):
+            mpl_renderer.get_plot(contours)
+
+    def test_contours_line_width_op(self):
+        contours = Contours([
+            {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'line_width': 7},
+            {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'line_width': 3}
+        ], vdims='line_width').options(linewidth='line_width')
+        plot = mpl_renderer.get_plot(contours)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [7, 3])
+
+    def test_contours_line_width_op_update(self):
+        contours = HoloMap({
+            0: Contours([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'line_width': 7},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'line_width': 3}
+            ], vdims='line_width'),
+            1: Contours([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'line_width': 2},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'line_width': 5}
+            ], vdims='line_width'),
+        }).options(linewidth='line_width', framewise=True)
+        plot = mpl_renderer.get_plot(contours)
+        artist = plot.handles['artist']
+        self.assertEqual(artist.get_linewidths(), [7, 3])
+        plot.update((1,))
+        self.assertEqual(artist.get_linewidths(), [2, 5])

From 4638c2b502950f1487fc40071ecb8db7a0cc6100 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 04:17:40 +0000
Subject: [PATCH 069/117] Fixed issue in SankeyPlot

---
 holoviews/plotting/mpl/sankey.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/plotting/mpl/sankey.py b/holoviews/plotting/mpl/sankey.py
index 6e23ae6dd3..b3efe63efa 100644
--- a/holoviews/plotting/mpl/sankey.py
+++ b/holoviews/plotting/mpl/sankey.py
@@ -106,7 +106,7 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         groups = [g for g in self._style_groups if g != 'node']
         node_opts = {k[5:] if 'node_' in k else k: v
                      for k, v in plot_kwargs.items()
-                     if not (any(k.startswith(p) for p in groups) or 's' == k)}
+                     if not (any(k.startswith(p) for p in groups) or k in ('s', 'node_s'))}
         rects = [Rectangle(**rect) for rect in plot_args['rects']]
         artists['rects'] = ax.add_collection(PatchCollection(rects, **node_opts))
         artists['labels'] = self._update_labels(ax, plot_args, plot_kwargs)

From 040effa90eee359636f56dc1a80b8ab5023eda66 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 13:13:34 +0000
Subject: [PATCH 070/117] Added docs to dim transforms

---
 holoviews/util/ops.py | 123 ++++++++++++++++++++++++++++++++----------
 1 file changed, 94 insertions(+), 29 deletions(-)

diff --git a/holoviews/util/ops.py b/holoviews/util/ops.py
index 063a0fb8be..8b075cf590 100644
--- a/holoviews/util/ops.py
+++ b/holoviews/util/ops.py
@@ -12,12 +12,48 @@
 
 
 def norm_fn(values, min=None, max=None):
+    """
+    min-max normalizes to scale data into 0-1 range.
+
+    Arguments
+    ---------
+    values: np.ndarray
+       Array of values to be binned
+    min: float (optional)
+       Lower bound of normalization range
+    max: float (optional)
+       Upper bound of normalization range
+
+    Returns
+    -------
+    normalized: np.ndarray
+       Array of normalized values
+    """
     min = np.min(values) if min is None else min
     max = np.max(values) if max is None else max
     return (values - min) / (max-min)
 
 
 def bin_fn(values, bins, labels=None):
+    """
+    Bins data into declared bins. By default each bin is labelled
+    with bin center values but an explicit list of bin labels may be
+    defined.
+
+    Arguments
+    ---------
+    values: np.ndarray
+       Array of values to be binned
+    bins: np.ndarray or list
+       Bin edges to place bins into
+    labels: np.ndarray or list (optional)
+       Labels for bins should have length N-1 compared to bins
+
+    Returns
+    -------
+    binned: np.ndarray
+       Array of binned values
+    """
     bins = np.asarray(bins)
     if labels is None:
         labels = (bins[:-1] + np.diff(bins)/2.)
@@ -32,6 +68,24 @@ def bin_fn(values, bins, labels=None):
 
 
 def cat_fn(values, categories, empty=None):
+    """
+    Replaces discrete values in input array into a fixed set of
+    categories defined either as a list or dictionary.
+
+    Arguments
+    ---------
+    values: np.ndarray
+       Array of values to be categorized
+    categories: list or dict
+       Categories to assign to input values
+    empty: any (optional)
+       Value assigned to input values no category could be assigned to
+
+    Returns
+    -------
+    categorized: np.ndarray
+       Array of categorized values
+    """
     uniq_cats = list(unique_iterator(values))
     cats = []
     for c in values:
@@ -47,23 +101,16 @@ def cat_fn(values, categories, empty=None):
     return np.asarray(cats)
 
 
-def str_fn(values):
-    return np.asarray([str(v) for v in values])
-
-
-def int_fn(values):
-    return values.astype(int)
-
 
 class dim(object):
     """
     dim transform objects are a way to express deferred transformations
-    on HoloViews element types. It supports all mathematical operations,
-    NumPy ufuncs and provides a number of useful methods.
+    on HoloViews Datasets. It supports all mathematical operations,
+    NumPy ufuncs and provides a number of useful methods for normalizing,
+    binning and categorizing data.
     """
 
-    _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn,
-                    str: str_fn, int: int_fn}
+    _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn}
 
     def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
         ops = []
@@ -77,7 +124,7 @@ def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
         if isinstance(fn, str) or fn in self._op_registry:
             fn = self._op_registry.get(fn)
             if fn is None:
-                raise ValueError('Operation function %s not found' % fn)
+                raise ValueError('dim transform %s not found' % fn)
         if fn is not None:
             ops = ops + [{'other': other, 'fn': fn, 'kwargs': kwargs,
                           'reverse': reverse}]
@@ -86,8 +133,8 @@ def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
     @classmethod
     def resolve_spec(cls, op_spec):
         """
-        Converts an op spec, i.e. a string or tuple declaring an op
-        or a nested spec of ops into an op instance.
+        Converts a dim transform spec, i.e. a string or tuple, into
+        a dim instance.
         """
         if isinstance(op_spec, basestring):
             return cls(op_spec)
@@ -149,25 +196,45 @@ def astype(self, dtype):  return dim(self, np.asarray, dtype=dtype)
 
     def norm(self):
         """
-        Normalizes the data into the given range
+        min-max normalizes to scale data into 0-1 range.
         """
         return dim(self, norm_fn)
 
     def cat(self, categories, empty=None):
+        """
+        Bins data into declared bins. By default each bin is labelled
+        with bin center values but an explicit list of bin labels may be
+        defined.
+
+        Arguments
+        ---------
+        bins: np.ndarray or list
+           Bin edges to place bins into
+        labels: np.ndarray or list (optional)
+           Labels for bins should have length N-1 compared to bins
+        """
         return dim(self, cat_fn, categories=categories, empty=empty)
 
     def bin(self, bins, labels=None):
-        return dim(self, bin_fn, bins=bins, labels=labels)
-
-    @property
-    def dimensions(self):
-        dims = []
-        if isinstance(self.dimension, dim):
-            dims += self.dimension.dimensions
-        else:
-            dims.append(self.dimension)
+        """
+        Replaces discrete values in input array into a fixed set of
+        categories defined either as a list or dictionary.
+
+        Arguments
+        ---------
+        categories: list or dict
+           Categories to assign to input values
+        empty: any (optional)
+           Value assigned to input values no category could be assigned to
+        """
+        return dim(self, bin_fn, bins, labels=labels)
 
     def applies(self, dataset):
+        """
+        Determines whether the dim transform can be applied to the
+        Dataset, i.e. whether all referenced dimensions can be
+        resolved.
+        """
         if isinstance(self.dimension, dim):
             applies = self.dimension.applies(dataset)
         else:
@@ -185,6 +252,9 @@ def applies(self, dataset):
         return applies
 
     def eval(self, dataset, flat=False, expanded=None, ranges={}):
+        """
+        Evaluates the transform on the supplied dataset.
+        """
         if expanded is None:
             expanded = not ((dataset.interface.gridded and self.dimension in dataset.kdims) or
                             (dataset.interface.multi and dataset.interface.isscalar(dataset, self.dimension)))
@@ -217,8 +287,3 @@ def __repr__(self):
                                                          arg=arg, kwargs=kwargs)
         return op_repr
 
-
-class norm(dim):
-
-    def __init__(self, obj, **kwargs):
-        super(norm, self).__init__(obj, norm_fn, **kwargs)

From 67826db5b7e079f42aa80e608b94b965cc6d3a83 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 13:20:37 +0000
Subject: [PATCH 071/117] Renamed ops to transform

---
 holoviews/__init__.py                   | 2 +-
 holoviews/plotting/bokeh/chart.py       | 2 +-
 holoviews/plotting/bokeh/element.py     | 2 +-
 holoviews/plotting/bokeh/path.py        | 2 +-
 holoviews/plotting/mpl/chart.py         | 2 +-
 holoviews/plotting/mpl/element.py       | 5 +++--
 holoviews/plotting/plot.py              | 2 +-
 holoviews/util/parser.py                | 5 ++---
 holoviews/util/{ops.py => transform.py} | 0
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename holoviews/util/{ops.py => transform.py} (100%)

diff --git a/holoviews/__init__.py b/holoviews/__init__.py
index c789fc02b2..6159884f28 100644
--- a/holoviews/__init__.py
+++ b/holoviews/__init__.py
@@ -29,7 +29,7 @@
 from .element import __all__ as elements_list
 from .util import (extension, renderer, output, opts,    # noqa (API import)
                    render, save)
-from .util.ops import dim                                # noqa (API import)
+from .util.transform import dim                          # noqa (API import)
 
 # Suppress warnings generated by NumPy in matplotlib
 # Expected to be fixed in next matplotlib release
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index a898b40cd6..276864fd3b 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -12,7 +12,7 @@
 from ...core.util import max_range, basestring, dimension_sanitizer, isfinite, range_pad
 from ...element import Bars
 from ...operation import interpolate_curve
-from ...util.ops import dim
+from ...util.transform import dim
 from ..util import compute_sizes, get_min_distance, dim_axis_label, get_axis_padding
 from .element import ElementPlot, ColorbarPlot, LegendPlot
 from .styles import (expand_batched_style, line_properties, fill_properties,
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 714e3f6aa6..bdb6eddaa2 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -29,7 +29,7 @@
 from ...core import util
 from ...element import Graph, VectorField
 from ...streams import Buffer
-from ...util.ops import dim
+from ...util.transform import dim
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import BokehPlot, TOOLS
diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index f74ea56551..51f47e89ba 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -7,7 +7,7 @@
 
 from ...core import util
 from ...element import Polygons
-from ...util.ops import dim
+from ...util.transform import dim
 from .element import ColorbarPlot, LegendPlot
 from .styles import (expand_batched_style, line_properties, fill_properties,
                      mpl_to_bokeh, validate)
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index 3f02abadad..95bd5ae67c 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -18,7 +18,7 @@
 )
 from ...element import Raster, HeatMap
 from ...operation import interpolate_curve
-from ...util.ops import dim
+from ...util.transform import dim
 from ..plot import PlotSelector
 from ..util import compute_sizes, get_sideplot_ranges, get_min_distance
 from .element import ElementPlot, ColorbarPlot, LegendPlot
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 3e270c974e..d9c0f266fc 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -12,11 +12,11 @@
 from matplotlib.dates import date2num
 
 from ...core import util
-from ...core import (OrderedDict, NdOverlay, DynamicMap,
+from ...core import (OrderedDict, NdOverlay, DynamicMap, Dataset,
                      CompositeOverlay, Element3D, Element)
 from ...core.options import abbreviated_exception
 from ...element import Graph
-from ...util.ops import dim
+from ...util.transform import dim
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import MPLPlot, mpl_rc_context
@@ -741,6 +741,7 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
                 values = vdim.eval(element)
             else:
                 expanded = not (
+                    isinstance(element, Dataset) and
                     element.interface.multi and
                     (element.level is not None or
                      element.interface.isscalar(element, vdim.name))
diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index c4d2767814..930760e87f 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -21,7 +21,7 @@
 from ..core.spaces import HoloMap, DynamicMap
 from ..core.util import stream_parameters, isfinite
 from ..element import Table
-from ..util.ops import dim
+from ..util.transform import dim
 from .util import (get_dynamic_mode, initialize_unbounded, dim_axis_label,
                    attach_streams, traverse_setter, get_nested_streams,
                    compute_overlayable_zorders, get_plot_frame,
diff --git a/holoviews/util/parser.py b/holoviews/util/parser.py
index 5305c2e856..7d7c8c4534 100644
--- a/holoviews/util/parser.py
+++ b/holoviews/util/parser.py
@@ -17,7 +17,7 @@
 from ..core.options import Options, Cycle, Palette
 from ..core.util import merge_option_dicts
 from ..operation import Compositor
-from .ops import dim, norm
+from .transform import dim
 
 ascii_uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 allowed = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!#$%&\()*+,-./:;<=>?@\\^_`{|}~'
@@ -36,8 +36,7 @@ class Parser(object):
     """
 
     # Static namespace set in __init__.py of the extension
-    namespace = {'np': np, 'Cycle': Cycle, 'Palette': Palette, 'dim': dim,
-                 'norm': norm}
+    namespace = {'np': np, 'Cycle': Cycle, 'Palette': Palette, 'dim': dim}
     # If True, raise SyntaxError on eval error otherwise warn
     abort_on_eval_failure = False
 
diff --git a/holoviews/util/ops.py b/holoviews/util/transform.py
similarity index 100%
rename from holoviews/util/ops.py
rename to holoviews/util/transform.py

From 122d8c069a079b32e7cb8882d9913f429b6ca55e Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 14:14:25 +0000
Subject: [PATCH 072/117] Added dim transform unit tests

---
 .../tests/{testutils.py => util/__init__.py}  |   0
 holoviews/tests/util/testtransform.py         | 171 ++++++++++++++++++
 holoviews/util/transform.py                   |  48 ++---
 3 files changed, 197 insertions(+), 22 deletions(-)
 rename holoviews/tests/{testutils.py => util/__init__.py} (100%)
 create mode 100644 holoviews/tests/util/testtransform.py

diff --git a/holoviews/tests/testutils.py b/holoviews/tests/util/__init__.py
similarity index 100%
rename from holoviews/tests/testutils.py
rename to holoviews/tests/util/__init__.py
diff --git a/holoviews/tests/util/testtransform.py b/holoviews/tests/util/testtransform.py
new file mode 100644
index 0000000000..ef48d563db
--- /dev/null
+++ b/holoviews/tests/util/testtransform.py
@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+"""
+Unit tests for dim transforms
+"""
+from __future__ import division
+
+import numpy as np
+
+from holoviews.core.data import Dataset
+from holoviews.element.comparison import ComparisonTestCase
+from holoviews.util.transform import dim
+
+
+class TestDimTransforms(ComparisonTestCase):
+
+    def setUp(self):
+        self.linear_ints = np.arange(1, 11)
+        self.linear_floats = np.arange(1, 11)/10.
+        self.negative = -self.linear_floats
+        self.repeating = ['A', 'B', 'C', 'A', 'B', 'C', 'A', 'B', 'C', 'A']
+        self.dataset = Dataset(
+            (self.linear_ints, self.linear_floats, self.negative, self.repeating),
+            ['int', 'float', 'negative', 'categories']
+        )
+
+    # Unary operators
+
+    def test_abs_transform(self):
+        self.assertEqual(abs(dim('negative')).eval(self.dataset), self.linear_floats)
+
+    def test_neg_transform(self):
+        self.assertEqual(-dim('negative').eval(self.dataset), self.linear_floats)
+
+    # Binary operators
+
+    def test_add_transform(self):
+        self.assertEqual((dim('float')+1).eval(self.dataset), self.linear_floats+1)
+
+    def test_div_transform(self):
+        self.assertEqual((dim('int')/10.).eval(self.dataset), self.linear_floats)
+
+    def test_floor_div_transform(self):
+        self.assertEqual((dim('int')//2).eval(self.dataset), self.linear_ints//2)
+
+    def test_mod_transform(self):
+        self.assertEqual((dim('int')%2).eval(self.dataset), self.linear_ints%2)
+
+    def test_mul_transform(self):
+        self.assertEqual((dim('float')*10.).eval(self.dataset), self.linear_ints)
+
+    def test_pow_transform(self):
+        self.assertEqual((dim('int')**2).eval(self.dataset), self.linear_ints**2)
+
+    def test_sub_transform(self):
+        self.assertEqual((dim('int')-10).eval(self.dataset), self.linear_ints-10)
+
+    # Reverse binary operators
+
+    def test_radd_transform(self):
+        self.assertEqual((1+dim('float')).eval(self.dataset), 1+self.linear_floats)
+
+    def test_rdiv_transform(self):
+        self.assertEqual((10./dim('int')).eval(self.dataset), 10./self.linear_ints)
+
+    def test_rfloor_div_transform(self):
+        self.assertEqual((2//dim('int')).eval(self.dataset), 2//self.linear_ints)
+
+    def test_rmod_transform(self):
+        self.assertEqual((2%dim('int')).eval(self.dataset), 2%self.linear_ints)
+
+    def test_rmul_transform(self):
+        self.assertEqual((10.*dim('float')).eval(self.dataset), self.linear_ints)
+
+    def test_rsub_transform(self):
+        self.assertEqual((10-dim('int')).eval(self.dataset), 10-self.linear_ints)
+
+    # NumPy operations
+
+    def test_ufunc_transform(self):
+        self.assertEqual(np.sin(dim('float')).eval(self.dataset), np.sin(self.linear_floats))
+
+    def test_astype_transform(self):
+        self.assertEqual(dim('int').astype(str).eval(self.dataset),
+                         self.linear_ints.astype(str))
+
+    def test_cumsum_transform(self):
+        self.assertEqual(dim('float').cumsum().eval(self.dataset),
+                         self.linear_floats.cumsum())
+
+    def test_max_transform(self):
+        self.assertEqual(dim('float').max().eval(self.dataset),
+                         self.linear_floats.max())
+
+    def test_min_transform(self):
+        self.assertEqual(dim('float').min().eval(self.dataset),
+                         self.linear_floats.min())
+    
+    def test_round_transform(self):
+        self.assertEqual(dim('float').round().eval(self.dataset),
+                         self.linear_floats.round())
+
+    def test_sum_transform(self):
+        self.assertEqual(dim('float').sum().eval(self.dataset),
+                         self.linear_floats.sum())
+
+    def test_std_transform(self):
+        self.assertEqual(dim('float').std().eval(self.dataset),
+                         self.linear_floats.std())
+        
+    def test_var_transform(self):
+        self.assertEqual(dim('float').var().eval(self.dataset),
+                         self.linear_floats.var())
+
+    # Custom functions
+
+    def test_norm_transform(self):
+        self.assertEqual(dim('int').norm().eval(self.dataset),
+                         (self.linear_ints-1)/9.)
+
+    def test_bin_transform(self):
+        self.assertEqual(dim('int').bin([0, 5, 10]).eval(self.dataset),
+                         np.array([2.5, 2.5, 2.5, 2.5, 2.5, 7.5, 7.5, 7.5, 7.5, 7.5]))
+
+    def test_bin_transform_with_labels(self):
+        self.assertEqual(dim('int').bin([0, 5, 10], ['A', 'B']).eval(self.dataset),
+                         np.array(['A', 'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', 'B']))
+
+    def test_cat_transform_list(self):
+        self.assertEqual(dim('categories').cat(['circle', 'square', 'triangle']).eval(self.dataset),
+                         np.array((['circle', 'square', 'triangle']*3)+['circle']))
+
+    def test_cat_transform_dict(self):
+        self.assertEqual(dim('categories').cat({'A': 'circle', 'B': 'square', 'C': 'triangle'}).eval(self.dataset),
+                         np.array((['circle', 'square', 'triangle']*3)+['circle']))
+
+    def test_cat_transform_dict_with_empty(self):
+        self.assertEqual(dim('categories').cat({'A': 'circle', 'B': 'square'}, empty='triangle').eval(self.dataset),
+                         np.array((['circle', 'square', 'triangle']*3)+['circle']))
+
+    # Complex expressions
+
+    def test_multi_operator_expression(self):
+        self.assertEqual((((dim('float')-2)*3)**2).eval(self.dataset),
+                         ((self.linear_floats-2)*3)**2)
+
+    def test_multi_dim_expression(self):
+        self.assertEqual((dim('int')-dim('float')).eval(self.dataset),
+                         self.linear_ints-self.linear_floats)
+
+    # Repr method
+
+    def test_dim_repr(self):
+        self.assertEqual(repr(dim('float')), "'float'")
+
+    def test_multi_operator_expression_repr(self):
+        self.assertEqual(repr(((dim('float')-2)*3)**2),
+                         "pow(mul(sub('float', 2), 3), 2)")
+
+    # Applies method
+
+    def test_multi_dim_expression_applies(self):
+        self.assertEqual((dim('int')-dim('float')).applies(self.dataset),
+                         True)
+
+    def test_multi_dim_expression_not_applies(self):
+        self.assertEqual((dim('foo')-dim('bar')).applies(self.dataset),
+                         False)
+
+    def test_multi_dim_expression_partial_applies(self):
+        self.assertEqual((dim('int')-dim('bar')).applies(self.dataset),
+                         False)
diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index 8b075cf590..6107b6f981 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -163,9 +163,9 @@ def __pos__(self): return dim(self, operator.pos)
     def __add__(self, other):       return dim(self, operator.add, other)
     def __div__(self, other):       return dim(self, operator.div, other)
     def __floordiv__(self, other):  return dim(self, operator.floordiv, other)
-    def __pow__(self, other):       return dim(self, operator.pow, other)
     def __mod__(self, other):       return dim(self, operator.mod, other)
     def __mul__(self, other):       return dim(self, operator.mul, other)
+    def __pow__(self, other):       return dim(self, operator.pow, other)
     def __sub__(self, other):       return dim(self, operator.sub, other)
     def __truediv__(self, other):   return dim(self, operator.truediv, other)
 
@@ -184,21 +184,31 @@ def __array_ufunc__(self, *args, **kwargs):
         kwargs = {k: v for k, v in kwargs.items() if v is not None}
         return dim(self, ufunc, **kwargs)
 
-    def max(self, **kwargs):  return dim(self, np.max, **kwargs)
-    def mean(self, **kwargs): return dim(self, np.mean, **kwargs)
-    def min(self, **kwargs):  return dim(self, np.min, **kwargs)
-    def sum(self, **kwargs):  return dim(self, np.sum, **kwargs)
-    def std(self, **kwargs):  return dim(self, np.std, **kwargs)
-    def var(self, **kwargs):  return dim(self, np.var, **kwargs)
-    def astype(self, dtype):  return dim(self, np.asarray, dtype=dtype)
+    def astype(self, dtype):     return dim(self, np.asarray, dtype=dtype)
+    def cumsum(self, **kwargs):  return dim(self, np.cumsum, **kwargs)
+    def max(self, **kwargs):     return dim(self, np.max, **kwargs)
+    def mean(self, **kwargs):    return dim(self, np.mean, **kwargs)
+    def min(self, **kwargs):     return dim(self, np.min, **kwargs)
+    def round(self, decimals=0): return dim(self, np.round, decimals=decimals)
+    def sum(self, **kwargs):     return dim(self, np.sum, **kwargs)
+    def std(self, **kwargs):     return dim(self, np.std, **kwargs)
+    def var(self, **kwargs):     return dim(self, np.var, **kwargs)
 
     ## Custom functions
 
-    def norm(self):
+    def bin(self, bins, labels=None):
         """
-        min-max normalizes to scale data into 0-1 range.
+        Replaces discrete values in input array into a fixed set of
+        categories defined either as a list or dictionary.
+
+        Arguments
+        ---------
+        categories: list or dict
+           Categories to assign to input values
+        empty: any (optional)
+           Value assigned to input values no category could be assigned to
         """
-        return dim(self, norm_fn)
+        return dim(self, bin_fn, bins, labels=labels)
 
     def cat(self, categories, empty=None):
         """
@@ -215,20 +225,14 @@ def cat(self, categories, empty=None):
         """
         return dim(self, cat_fn, categories=categories, empty=empty)
 
-    def bin(self, bins, labels=None):
+    def norm(self):
         """
-        Replaces discrete values in input array into a fixed set of
-        categories defined either as a list or dictionary.
-
-        Arguments
-        ---------
-        categories: list or dict
-           Categories to assign to input values
-        empty: any (optional)
-           Value assigned to input values no category could be assigned to
+        min-max normalizes to scale data into 0-1 range.
         """
-        return dim(self, bin_fn, bins, labels=labels)
+        return dim(self, norm_fn)
 
+    # Other methods
+    
     def applies(self, dataset):
         """
         Determines whether the dim transform can be applied to the

From daffaaef58545540277b9130ce078a8400aff45c Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 16:42:11 +0000
Subject: [PATCH 073/117] Removed support for dim tuple spec

---
 holoviews/plotting/bokeh/element.py |  5 -----
 holoviews/plotting/mpl/element.py   |  5 -----
 holoviews/util/transform.py         | 16 ----------------
 3 files changed, 26 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index bdb6eddaa2..c6ce309ec6 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -667,11 +667,6 @@ def _apply_ops(self, element, source, ranges, style, group=None):
                     v = dim(v)
                 elif any(d==v for d in self.overlay_dims):
                     v = dim([d for d in self.overlay_dims if d==v][0])
-            elif isinstance(v, tuple) and v and isinstance(v[0], (util.basestring, tuple, dim)):
-                try:
-                    v = dim.resolve_spec(v)
-                except:
-                    continue
 
             if (not isinstance(v, dim) or (group is not None and not k.startswith(group)) or
                 (k == 'marker' and v.dimension.name in markers)):
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index d9c0f266fc..92d365db42 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -525,11 +525,6 @@ def _apply_ops(self, element, ranges, style):
                     v = dim(v)
                 elif any(d==v for d in self.overlay_dims):
                     v = dim([d for d in self.overlay_dims if d==v][0])
-            elif isinstance(v, tuple) and v and isinstance(v[0], (util.basestring, tuple, dim)):
-                try:
-                    v = dim.resolve_spec(v)
-                except:
-                    continue
 
             if not isinstance(v, dim):
                 continue
diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index 6107b6f981..f7e33335de 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -130,22 +130,6 @@ def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
                           'reverse': reverse}]
         self.ops = ops
 
-    @classmethod
-    def resolve_spec(cls, op_spec):
-        """
-        Converts a dim transform spec, i.e. a string or tuple, into
-        a dim instance.
-        """
-        if isinstance(op_spec, basestring):
-            return cls(op_spec)
-        elif isinstance(op_spec, tuple):
-            combined = zip_longest(op_spec, (None, None, None, {}))
-            obj, fn, other, kwargs = (o2 if o1 is None else o1 for o1, o2 in combined)
-            if isinstance(obj, tuple):
-                obj = cls.resolve_spec(obj)
-            return cls(obj, fn, other, **kwargs)
-        return op_spec
-
     @classmethod
     def register(cls, key, function):
         """

From a5f4d46cb18836e8f18ab045cbc35b4ff0698d1c Mon Sep 17 00:00:00 2001
From: "James A. Bednar" <jbednar@users.noreply.github.com>
Date: Mon, 19 Nov 2018 20:02:24 +0000
Subject: [PATCH 074/117] Apply suggestions from code review

Co-Authored-By: philippjfr <philippjfr@continuum.io>
---
 examples/reference/elements/bokeh/Spikes.ipynb         | 2 +-
 examples/reference/elements/matplotlib/Histogram.ipynb | 2 +-
 examples/reference/elements/matplotlib/Spikes.ipynb    | 2 +-
 examples/user_guide/Styling_Plots.ipynb                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/reference/elements/bokeh/Spikes.ipynb b/examples/reference/elements/bokeh/Spikes.ipynb
index bf73094b72..6797e1021c 100644
--- a/examples/reference/elements/bokeh/Spikes.ipynb
+++ b/examples/reference/elements/bokeh/Spikes.ipynb
@@ -83,7 +83,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Another possibility is to draw a set of Spikes offset by a position, this can be useful for plotting neuron spike trains or other events. Here we generate 10 separate random spike trains and distribute them evenly across the space by setting their ``position``. By declaring some ``yticks``, each spike train can be labeled individually:"
+    "Another possibility is to draw a set of Spikes offset by a position, which can be useful for plotting discrete events like neurons firing. Here we generate 10 separate random spike trains and distribute them evenly across the space by setting their ``position``. By declaring some ``yticks``, each spike train can be labeled individually:"
    ]
   },
   {
diff --git a/examples/reference/elements/matplotlib/Histogram.ipynb b/examples/reference/elements/matplotlib/Histogram.ipynb
index 2e0e3eff83..365864537e 100644
--- a/examples/reference/elements/matplotlib/Histogram.ipynb
+++ b/examples/reference/elements/matplotlib/Histogram.ipynb
@@ -67,7 +67,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Like most other elements a ``Histogram`` also supports using ``dim`` transforms to map dimensions to visual attributes. To demonstrate this we will use the ``bin`` op to bin the 'y' values into positive and negative values and map those to a 'blue' and 'red' ``fill_color``:"
+    "Like most other elements a ``Histogram`` also supports using ``dim`` transforms to map dimensions to visual attributes. To demonstrate this we will use the ``bin`` transform to bin the 'y' values into positive and negative values and map those to a 'blue' and 'red' ``fill_color``:"
    ]
   },
   {
diff --git a/examples/reference/elements/matplotlib/Spikes.ipynb b/examples/reference/elements/matplotlib/Spikes.ipynb
index b47b1bfbad..28f48c7497 100644
--- a/examples/reference/elements/matplotlib/Spikes.ipynb
+++ b/examples/reference/elements/matplotlib/Spikes.ipynb
@@ -83,7 +83,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Another possibility is to draw a set of Spikes offset by a position, this can be useful for plotting neuron spike trains or other events. Here we generate 10 separate random spike trains and distribute them evenly across the space by setting their ``position``. By declaring some ``yticks``, each spike train can be labeled individually:"
+    "Another possibility is to draw a set of Spikes offset by a position, which can be useful for plotting discrete events like neurons firing. Here we generate 10 separate random spike trains and distribute them evenly across the space by setting their ``position``. By declaring some ``yticks``, each spike train can be labeled individually:"
    ]
   },
   {
diff --git a/examples/user_guide/Styling_Plots.ipynb b/examples/user_guide/Styling_Plots.ipynb
index 9a7add522e..9860a65363 100644
--- a/examples/user_guide/Styling_Plots.ipynb
+++ b/examples/user_guide/Styling_Plots.ipynb
@@ -179,7 +179,7 @@
     "\n",
     "## Colormapping\n",
     "\n",
-    "Color cycles and styles are useful for categorical plots and when overlaying multiple subsets, but when we want to map data values to a color it is better to use HoloViews' facilities for color mapping. Certain image-like types will apply colormapping automatically; e.g. for ``Image``, ``QuadMesh`` or ``HeatMap`` types the first value dimension is automatically mapped to the color. In other cases the values to colormap can be declared by mapping a ``color`` style option to an existing dimension.\n",
+    "Color cycles and styles are useful for categorical plots and when overlaying multiple subsets, but when we want to map data values to a color it is better to use HoloViews' facilities for color mapping. Certain image-like types will apply colormapping automatically; e.g. for ``Image``, ``QuadMesh`` or ``HeatMap`` types the first value dimension is automatically mapped to the color. In other cases the values to colormap can be declared by providing a ``color`` style option that specifies which dimension to map into the color value.\n",
     "\n",
     "#### Named colormaps\n",
     "\n",

From 0a31fe4a7645a3a5d7515a549d611414b72305a6 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 19:17:29 +0000
Subject: [PATCH 075/117] Renamed apply_ops to apply_transforms

---
 holoviews/plotting/bokeh/element.py  |  4 ++--
 holoviews/plotting/bokeh/stats.py    |  2 +-
 holoviews/plotting/mpl/annotation.py |  2 +-
 holoviews/plotting/mpl/chart.py      | 16 ++++++++--------
 holoviews/plotting/mpl/element.py    |  2 +-
 holoviews/plotting/mpl/graphs.py     |  2 +-
 holoviews/plotting/mpl/path.py       |  4 ++--
 holoviews/plotting/mpl/stats.py      |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index c6ce309ec6..34458ab89a 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -658,7 +658,7 @@ def _init_glyph(self, plot, mapping, properties):
         return renderer, renderer.glyph
 
 
-    def _apply_ops(self, element, source, ranges, style, group=None):
+    def _apply_transforms(self, element, source, ranges, style, group=None):
         new_style = dict(style)
         prefix = group+'_' if group else ''
         for k, v in dict(style).items():
@@ -754,7 +754,7 @@ def _apply_ops(self, element, source, ranges, style, group=None):
 
     def _glyph_properties(self, plot, element, source, ranges, style, group=None):
         with abbreviated_exception():
-            new_style = self._apply_ops(element, source, ranges, style, group)
+            new_style = self._apply_transforms(element, source, ranges, style, group)
         properties = dict(new_style, source=source)
         if self.show_legend:
             if self.overlay_dims:
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index b4739410ad..be653de565 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -104,7 +104,7 @@ def _glyph_properties(self, plot, element, source, ranges, style, group=None):
         else:
             element = element.clone([(element.aggregate(function=np.mean),)])
         with abbreviated_exception():
-            new_style = self._apply_ops(element, source, ranges, style, group)
+            new_style = self._apply_transforms(element, source, ranges, style, group)
         properties = dict(new_style, source=source)
         if self.show_legend and not element.kdims:
             properties['legend'] = element.label
diff --git a/holoviews/plotting/mpl/annotation.py b/holoviews/plotting/mpl/annotation.py
index 63639347b8..ffa6c11f5d 100644
--- a/holoviews/plotting/mpl/annotation.py
+++ b/holoviews/plotting/mpl/annotation.py
@@ -110,7 +110,7 @@ class LabelsPlot(ColorbarPlot):
 
     def get_data(self, element, ranges, style):
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
 
         xs, ys = (element.dimension_values(i) for i in range(2))
         tdim = element.get_dimension(2)
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index 95bd5ae67c..eec7785bc4 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -74,7 +74,7 @@ class CurvePlot(ChartPlot):
 
     def get_data(self, element, ranges, style):
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
 
         if 'steps' in self.interpolation:
             element = interpolate_curve(element, interpolation=self.interpolation)
@@ -135,7 +135,7 @@ def init_artists(self, ax, plot_data, plot_kwargs):
 
     def get_data(self, element, ranges, style):
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
         color = style.get('color')
         if isinstance(color, np.ndarray):
             style['ecolor'] = color
@@ -218,7 +218,7 @@ class AreaPlot(ChartPlot):
 
     def get_data(self, element, ranges, style):
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
 
         xs = element.dimension_values(0)
         ys = [element.dimension_values(vdim) for vdim in element.vdims]
@@ -346,7 +346,7 @@ def initialize_plot(self, ranges=None):
             self.plotfn = self.handles['axis'].bar
 
         with abbreviated_exception():
-            style = self._apply_ops(hist, ranges, style)
+            style = self._apply_transforms(hist, ranges, style)
             if 'vmin' in style:
                 raise ValueError('Mapping a continuous dimension to a '
                                  'color on a HistogramPlot is not '
@@ -610,7 +610,7 @@ def get_data(self, element, ranges, style):
         xs, ys = (element.dimension_values(i) for i in range(2))
         self._compute_styles(element, ranges, style)
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
         return (ys, xs) if self.invert_axes else (xs, ys), style, {}
 
 
@@ -766,7 +766,7 @@ def get_data(self, element, ranges, style):
             style['headaxislength'] = 0
 
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
         style.update(dict(scale=input_scale, angles=angles,
                           units='x', scale_units='x'))
 
@@ -992,7 +992,7 @@ def _create_bars(self, axis, element):
                     style = dict(style_opts, label='' if label in labels else label,
                                  **dict(zip(sopts, color_groups[tuple(style_key)])))
                     with abbreviated_exception():
-                        style = self._apply_ops(element, {}, style)
+                        style = self._apply_transforms(element, {}, style)
                     bar = axis.bar([xpos], [val], width=width, bottom=prev,
                                    **style)
 
@@ -1124,7 +1124,7 @@ def get_data(self, element, ranges, style):
             self._norm_kwargs(element, ranges, style, cdim)
 
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
         return (clean_spikes,), style, {'dimensions': dims}
 
 
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 92d365db42..1ee61ae486 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -517,7 +517,7 @@ def update_handles(self, key, axis, element, ranges, style):
         return axis_kwargs
 
 
-    def _apply_ops(self, element, ranges, style):
+    def _apply_transforms(self, element, ranges, style):
         new_style = dict(style)
         for k, v in style.items():
             if isinstance(v, util.basestring):
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index dbb4f24933..e11a6093cf 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -103,7 +103,7 @@ def _compute_styles(self, element, ranges, style):
 
     def get_data(self, element, ranges, style):
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
 
         xidx, yidx = (1, 0) if self.invert_axes else (0, 1)
         pxs, pys = (element.nodes.dimension_values(i) for i in range(2))
diff --git a/holoviews/plotting/mpl/path.py b/holoviews/plotting/mpl/path.py
index d4fb499eae..26c7dbc090 100644
--- a/holoviews/plotting/mpl/path.py
+++ b/holoviews/plotting/mpl/path.py
@@ -33,7 +33,7 @@ def _finalize_artist(self, element):
 
     def get_data(self, element, ranges, style):
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
 
         cdim = element.get_dimension(self.color_index)
         if cdim: cidx = element.get_dimension_index(cdim)
@@ -111,7 +111,7 @@ def get_data(self, element, ranges, style):
                 paths = [p[:, ::-1] for p in paths]
 
         with abbreviated_exception():
-            style = self._apply_ops(element, ranges, style)
+            style = self._apply_transforms(element, ranges, style)
         if 'c' in style:
             style['array'] = style.pop('c')
         if isinstance(style.get('color'), np.ndarray):
diff --git a/holoviews/plotting/mpl/stats.py b/holoviews/plotting/mpl/stats.py
index fea21126a8..ba12042fb3 100644
--- a/holoviews/plotting/mpl/stats.py
+++ b/holoviews/plotting/mpl/stats.py
@@ -211,7 +211,7 @@ def get_data(self, element, ranges, style):
             element = element.aggregate(function=np.mean)
         else:
             element = element.clone([(element.aggregate(function=np.mean),)])
-        new_style = self._apply_ops(element, ranges, style)
+        new_style = self._apply_transforms(element, ranges, style)
         style = {k: v for k, v in new_style.items()
                  if k not in ['zorder', 'label']}
         style['vert'] = not self.invert_axes

From 3c224affc91b56dcb3b24c6219be1e98790aa44a Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 19:21:30 +0000
Subject: [PATCH 076/117] Renamed _no_op_styles

---
 holoviews/plotting/bokeh/annotation.py |  2 +-
 holoviews/plotting/bokeh/chart.py      | 10 +++++-----
 holoviews/plotting/bokeh/element.py    |  6 +++---
 holoviews/plotting/bokeh/graphs.py     |  2 +-
 holoviews/plotting/bokeh/hex_tiles.py  |  2 +-
 holoviews/plotting/bokeh/raster.py     |  6 +++---
 holoviews/plotting/bokeh/stats.py      |  2 +-
 holoviews/plotting/mpl/annotation.py   |  2 +-
 holoviews/plotting/mpl/chart.py        | 12 ++++++------
 holoviews/plotting/mpl/element.py      |  4 ++--
 holoviews/plotting/mpl/graphs.py       |  6 ++++--
 holoviews/plotting/mpl/hex_tiles.py    |  2 +-
 holoviews/plotting/mpl/stats.py        |  7 ++++---
 13 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/holoviews/plotting/bokeh/annotation.py b/holoviews/plotting/bokeh/annotation.py
index 20d276b125..f33bbbe365 100644
--- a/holoviews/plotting/bokeh/annotation.py
+++ b/holoviews/plotting/bokeh/annotation.py
@@ -85,7 +85,7 @@ class LabelsPlot(ColorbarPlot, AnnotationPlot):
 
     style_opts = text_properties + ['cmap', 'angle']
 
-    _no_op_styles = ['cmap']
+    _nonvectorized_styles = ['cmap']
 
     _plot_methods = dict(single='text', batched='text')
     _batched_style_opts = text_properties
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 276864fd3b..2b191ed34e 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -175,7 +175,7 @@ class VectorFieldPlot(ColorbarPlot):
 
     style_opts = line_properties + ['scale', 'cmap']
 
-    _no_op_styles = ['scale', 'cmap']
+    _nonvectorized_styles = ['scale', 'cmap']
 
     _plot_methods = dict(single='segment')
 
@@ -274,7 +274,7 @@ class CurvePlot(ElementPlot):
         'steps-pre' and 'steps-post'.""")
 
     style_opts = line_properties
-    _no_op_styles = line_properties
+    _nonvectorized_styles = line_properties
     
     _plot_methods = dict(single='line', batched='multi_line')
     _batched_style_opts = line_properties
@@ -343,7 +343,7 @@ class HistogramPlot(ColorbarPlot):
     style_opts = line_properties + fill_properties + ['cmap']
     _plot_methods = dict(single='quad')
 
-    _no_op_styles = ['line_dash']
+    _nonvectorized_styles = ['line_dash']
 
     def get_data(self, element, ranges, style):
         if self.invert_axes:
@@ -448,7 +448,7 @@ class ErrorPlot(ColorbarPlot):
 
     style_opts = line_properties + ['lower_head', 'upper_head']
 
-    _no_op_styles = ['line_dash']
+    _nonvectorized_styles = ['line_dash']
 
     _mapping = dict(base="base", upper="upper", lower="lower")
 
@@ -714,7 +714,7 @@ class BarPlot(ColorbarPlot, LegendPlot):
 
     style_opts = line_properties + fill_properties + ['width', 'bar_width', 'cmap']
 
-    _no_op_styles = ['bar_width', 'cmap', 'width']
+    _nonvectorized_styles = ['bar_width', 'cmap', 'width']
 
     _plot_methods = dict(single=('vbar', 'hbar'))
 
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 34458ab89a..4aabdb385a 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -119,7 +119,7 @@ class ElementPlot(BokehPlot, GenericElementPlot):
     _categorical = False
 
     # Declare which styles cannot be mapped to a non-scalar dimension
-    _no_op_styles = []
+    _nonvectorized_styles = []
 
     # Declares the default types for continuous x- and y-axes
     _x_range_type = Range1d
@@ -686,7 +686,7 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
                 val = val if np.isscalar(val) else val[0]
 
             if not np.isscalar(val):
-                if k in self._no_op_styles:
+                if k in self._nonvectorized_styles:
                     element = type(element).__name__
                     raise ValueError('Mapping a dimension to the "{style}" '
                                      'style option is not supported by the '
@@ -1224,7 +1224,7 @@ class ColorbarPlot(ElementPlot):
 
     _default_nan = '#8b8b8b'
 
-    _no_op_styles = ['cmap', 'palette']
+    _nonvectorized_styles = ['cmap', 'palette']
 
     def _draw_colorbar(self, plot, color_mapper, prefix=''):
         if CategoricalColorMapper and isinstance(color_mapper, CategoricalColorMapper):
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 8fd97c3c26..1b7a4dee49 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -46,7 +46,7 @@ class GraphPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
                   ['node_'+p for p in fill_properties+line_properties] +
                   ['node_size', 'cmap', 'edge_cmap'])
 
-    _no_op_styles =  ['cmap', 'edge_cmap']
+    _nonvectorized_styles =  ['cmap', 'edge_cmap']
 
     # Filled is only supported for subclasses
     filled = False
diff --git a/holoviews/plotting/bokeh/hex_tiles.py b/holoviews/plotting/bokeh/hex_tiles.py
index 32a8a2fe99..67f712025f 100644
--- a/holoviews/plotting/bokeh/hex_tiles.py
+++ b/holoviews/plotting/bokeh/hex_tiles.py
@@ -137,7 +137,7 @@ class HexTilesPlot(ColorbarPlot):
 
     style_opts = ['cmap', 'color', 'scale'] + line_properties + fill_properties
 
-    _no_op_styles = ['cmap', 'line_dash']
+    _nonvectorized_styles = ['cmap', 'line_dash']
 
     def _hover_opts(self, element):
         if self.aggregator is np.size:
diff --git a/holoviews/plotting/bokeh/raster.py b/holoviews/plotting/bokeh/raster.py
index 0632b07fe1..47b2c48e6a 100644
--- a/holoviews/plotting/bokeh/raster.py
+++ b/holoviews/plotting/bokeh/raster.py
@@ -19,7 +19,7 @@ class RasterPlot(ColorbarPlot):
 
     style_opts = ['cmap', 'alpha']
 
-    _no_op_styles = style_opts
+    _nonvectorized_styles = style_opts
 
     _plot_methods = dict(single='image')
 
@@ -80,7 +80,7 @@ class RGBPlot(ElementPlot):
 
     style_opts = ['alpha']
 
-    _no_op_styles = style_opts
+    _nonvectorized_styles = style_opts
 
     _plot_methods = dict(single='image_rgba')
 
@@ -140,7 +140,7 @@ class QuadMeshPlot(ColorbarPlot):
 
     style_opts = ['cmap', 'color'] + line_properties + fill_properties
 
-    _no_op_styles = style_opts
+    _nonvectorized_styles = style_opts
 
     _plot_methods = dict(single='quad')
 
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index be653de565..ff69152a00 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -80,7 +80,7 @@ class BoxWhiskerPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
                   ['outlier_'+p for p in fill_properties+line_properties] +
                   ['width', 'box_width', 'cmap'])
 
-    _no_op_styles = ['box_width', 'width', 'cmap']
+    _nonvectorized_styles = ['box_width', 'width', 'cmap']
 
     _stream_data = False # Plot does not support streaming data
 
diff --git a/holoviews/plotting/mpl/annotation.py b/holoviews/plotting/mpl/annotation.py
index ffa6c11f5d..a1e2bbbaa2 100644
--- a/holoviews/plotting/mpl/annotation.py
+++ b/holoviews/plotting/mpl/annotation.py
@@ -104,7 +104,7 @@ class LabelsPlot(ColorbarPlot):
     style_opts = ['alpha', 'color', 'family', 'weight', 'size', 'visible',
                   'horizontalalignment', 'verticalalignment', 'cmap', 'rotation']
 
-    _no_op_styles = ['cmap']
+    _nonvectorized_styles = ['cmap']
 
     _plot_methods = dict(single='annotate')
 
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index eec7785bc4..f18149795e 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -68,7 +68,7 @@ class CurvePlot(ChartPlot):
 
     style_opts = ['alpha', 'color', 'visible', 'linewidth', 'linestyle', 'marker', 'ms']
 
-    _no_op_styles = style_opts
+    _nonvectorized_styles = style_opts
 
     _plot_methods = dict(single='plot')
 
@@ -212,7 +212,7 @@ class AreaPlot(ChartPlot):
                   'hatch', 'linestyle', 'joinstyle',
                   'fill', 'capstyle', 'interpolate']
 
-    _no_op_styles = style_opts
+    _nonvectorized_styles = style_opts
 
     _plot_methods = dict(single='fill_between')
 
@@ -306,7 +306,7 @@ class HistogramPlot(ColorbarPlot):
                   'edgecolor', 'log', 'capsize', 'error_kw', 'hatch',
                   'linewidth']
 
-    _no_op_styles = ['alpha', 'log', 'error_kw', 'hatch', 'visible', 'align']
+    _nonvectorized_styles = ['alpha', 'log', 'error_kw', 'hatch', 'visible', 'align']
 
     def __init__(self, histograms, **params):
         self.center = False
@@ -600,7 +600,7 @@ class PointPlot(ChartPlot, ColorbarPlot):
                   'linewidth', 'marker', 'size', 'visible',
                   'cmap', 'vmin', 'vmax', 'norm']
 
-    _no_ops_styles = ['alpha', 'marker', 'cmap', 'vmin', 'vmax',
+    _nonvectorized_styles = ['alpha', 'marker', 'cmap', 'vmin', 'vmax',
                       'norm', 'visible']
 
     _disabled_opts = ['size']
@@ -719,7 +719,7 @@ class VectorFieldPlot(ColorbarPlot):
                   'scale', 'headlength', 'headaxislength', 'pivot',
                   'width', 'headwidth', 'norm']
 
-    _no_op_styles = ['alpha', 'marker', 'cmap', 'visible', 'norm',
+    _nonvectorized_styles = ['alpha', 'marker', 'cmap', 'visible', 'norm',
                      'pivot', 'scale', 'headlength', 'headaxislength',
                      'headwidth']
 
@@ -827,7 +827,7 @@ class BarPlot(LegendPlot):
     style_opts = ['alpha', 'color', 'align', 'visible', 'edgecolor',
                   'log', 'facecolor', 'capsize', 'error_kw', 'hatch']
 
-    _no_op_styles = style_opts
+    _nonvectorized_styles = style_opts
 
     legend_specs = dict(LegendPlot.legend_specs, **{
         'top':    dict(bbox_to_anchor=(0., 1.02, 1., .102),
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 1ee61ae486..0a16fd18ad 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -77,7 +77,7 @@ class ElementPlot(GenericElementPlot, MPLPlot):
     style_opts = []
 
     # Declare which styles cannot be mapped to a non-scalar dimension
-    _no_op_styles = ['marker', 'alpha', 'cmap', 'angle']
+    _nonvectorized_styles = ['marker', 'alpha', 'cmap', 'angle']
 
     # Whether plot has axes, disables setting axis limits, labels and ticks
     _has_axes = True
@@ -542,7 +542,7 @@ def _apply_transforms(self, element, ranges, style):
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
 
-            if not np.isscalar(val) and k in self._no_op_styles:
+            if not np.isscalar(val) and k in self._nonvectorized_styles:
                 element = type(element).__name__
                 raise ValueError('Mapping a dimension to the "{style}" '
                                  'style option is not supported by the '
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index e11a6093cf..ff8ce38ab7 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -29,8 +29,10 @@ class GraphPlot(ColorbarPlot):
 
     _style_groups = ['node', 'edge']
 
-    _no_op_styles = ['edge_alpha', 'edge_linestyle', 'edge_cmap', 'cmap',
-                     'visible', 'node_marker']
+    _nonvectorized_styles = [
+        'edge_alpha', 'edge_linestyle', 'edge_cmap', 'cmap', 'visible',
+        'node_marker'
+    ]
 
     filled = False
 
diff --git a/holoviews/plotting/mpl/hex_tiles.py b/holoviews/plotting/mpl/hex_tiles.py
index b511580c1e..f12e22a589 100644
--- a/holoviews/plotting/mpl/hex_tiles.py
+++ b/holoviews/plotting/mpl/hex_tiles.py
@@ -31,7 +31,7 @@ class HexTilesPlot(ColorbarPlot):
 
     style_opts = ['edgecolors', 'alpha', 'linewidths', 'marginals']
 
-    _no_op_styles = style_opts
+    _nonvectorized_styles = style_opts
 
     _plot_methods = dict(single='hexbin')
 
diff --git a/holoviews/plotting/mpl/stats.py b/holoviews/plotting/mpl/stats.py
index ba12042fb3..7d8af76327 100644
--- a/holoviews/plotting/mpl/stats.py
+++ b/holoviews/plotting/mpl/stats.py
@@ -59,7 +59,7 @@ class BoxPlot(ChartPlot):
                   'whiskerprops', 'capprops', 'flierprops',
                   'medianprops', 'meanprops', 'meanline']
 
-    _no_op_styles = style_opts
+    _nonvectorized_styles = style_opts
 
     _plot_methods = dict(single='boxplot')
 
@@ -155,8 +155,9 @@ class ViolinPlot(BoxPlot):
     style_opts = ['showmeans', 'facecolors', 'showextrema', 'bw_method',
                   'widths', 'stats_color', 'box_color', 'alpha', 'edgecolors']
 
-    _no_op_styles = [s for s in style_opts
-                     if s not in ('facecolors', 'edgecolors', 'widths')]
+    _nonvectorized_styles = [
+        s for s in style_opts if s not in ('facecolors', 'edgecolors', 'widths')
+    ]
 
     def init_artists(self, ax, plot_args, plot_kwargs):
         box_color = plot_kwargs.pop('box_color', 'black')

From 6981eb9150627b280eeb680880b2ce38b2c01745 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 19:21:41 +0000
Subject: [PATCH 077/117] Fixed flake

---
 holoviews/util/transform.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index f7e33335de..838de8d894 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -1,8 +1,4 @@
 import operator
-try:
-    from itertools import zip_longest as zip_longest
-except:
-    from itertools import izip_longest as zip_longest
 
 import numpy as np
 

From 43a2448d3667374c6042d7429bb6ebdea83a18cb Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Mon, 19 Nov 2018 19:22:19 +0000
Subject: [PATCH 078/117] Fixed scalar dim transform normalization

---
 holoviews/plotting/plot.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index 930760e87f..219e9188ac 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -457,6 +457,8 @@ def _compute_group_range(cls, group, elements, ranges):
                     values = v.eval(el)
                     if values.dtype.kind == 'M':
                         drange = values.min(), values.max()
+                    elif util.isscalar(values):
+                        drange = values, values
                     elif len(values) == 0:
                         drange = np.NaN, np.NaN
                     else:

From 056a0b5ef74759efbe133b164c2e70da9974f97d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Tue, 20 Nov 2018 03:48:52 +0000
Subject: [PATCH 079/117] Renamed dim.eval to dim.apply

---
 holoviews/plotting/bokeh/element.py   |  6 +--
 holoviews/plotting/mpl/element.py     |  6 +--
 holoviews/plotting/plot.py            |  9 ++--
 holoviews/tests/util/testtransform.py | 64 +++++++++++++--------------
 holoviews/util/transform.py           |  6 +--
 5 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 4aabdb385a..35ce7e89d8 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -680,7 +680,7 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
                 val = self.overlay_dims[v.dimension]
             else:
-                val = v.eval(element, ranges=ranges, flat=True)
+                val = v.apply(element, ranges=ranges, flat=True)
 
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
@@ -1256,7 +1256,7 @@ def _get_colormapper(self, eldim, element, ranges, style, factors=None, colors=N
             return None
 
         # Attempt to find matching colormapper on the adjoined plot
-        dim_name = repr(eldim)[1:-1] if isinstance(eldim, dim) else eldim.name
+        dim_name = repr(eldim) if isinstance(eldim, dim) else eldim.name
         if self.adjoined:
             cmapper_name = dim_name+name
             cmappers = self.adjoined.traverse(lambda x: (x.handles.get('color_dim'),
@@ -1336,7 +1336,7 @@ def _get_color_data(self, element, ranges, style, name='color', factors=None, co
         color = style.get(name, None)
         if cdim and ((isinstance(color, util.basestring) and color in element) or isinstance(color, dim)):
             self.warning("Cannot declare style mapping for '%s' option "
-                         "and declare a color_index, ignoring the color_index."
+                         "and declare a color_index; ignoring the color_index."
                          % name)
             cdim = None
         if not cdim:
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 0a16fd18ad..7b7b5768ce 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -537,7 +537,7 @@ def _apply_transforms(self, element, ranges, style):
             if len(v.ops) == 0 and v.dimension in self.overlay_dims:
                 val = self.overlay_dims[v.dimension]
             else:
-                val = v.eval(element, ranges)
+                val = v.apply(element, ranges)
 
             if len(np.unique(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
@@ -730,10 +730,10 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
         to be passed to matplotlib plot function.
         """
         clim = opts.pop(prefix+'clims', None)
-        dim_name = repr(vdim)[1:-1] if isinstance(vdim, dim) else vdim.name
+        dim_name = repr(vdim) if isinstance(vdim, dim) else vdim.name
         if values is None:
             if isinstance(vdim, dim):
-                values = vdim.eval(element)
+                values = vdim.apply(element, flat=True)
             else:
                 expanded = not (
                     isinstance(element, Dataset) and
diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index 219e9188ac..34d43f30cf 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -447,14 +447,15 @@ def _compute_group_range(cls, group, elements, ranges):
         for el in elements:
             if isinstance(el, (Empty, Table)): continue
             opts = cls.lookup_options(el, 'style')
+            plot_opts = cls.lookup_options(el, 'plot')
 
             # Compute normalization for color dim transforms
-            for k, v in opts.kwargs.items():
-                if not isinstance(v, dim) or 'color' not in k:
+            for k, v in dict(opts.kwargs, **plot_opts.kwargs).items():
+                if not isinstance(v, dim) or ('color' not in k and k != 'magnitude'):
                     continue
                 if isinstance(v, dim) and v.applies(el):
-                    dim_name = repr(v)[1:-1]
-                    values = v.eval(el)
+                    dim_name = repr(v)
+                    values = v.apply(el)
                     if values.dtype.kind == 'M':
                         drange = values.min(), values.max()
                     elif util.isscalar(values):
diff --git a/holoviews/tests/util/testtransform.py b/holoviews/tests/util/testtransform.py
index ef48d563db..ebf235d1b4 100644
--- a/holoviews/tests/util/testtransform.py
+++ b/holoviews/tests/util/testtransform.py
@@ -26,125 +26,125 @@ def setUp(self):
     # Unary operators
 
     def test_abs_transform(self):
-        self.assertEqual(abs(dim('negative')).eval(self.dataset), self.linear_floats)
+        self.assertEqual(abs(dim('negative')).apply(self.dataset), self.linear_floats)
 
     def test_neg_transform(self):
-        self.assertEqual(-dim('negative').eval(self.dataset), self.linear_floats)
+        self.assertEqual(-dim('negative').apply(self.dataset), self.linear_floats)
 
     # Binary operators
 
     def test_add_transform(self):
-        self.assertEqual((dim('float')+1).eval(self.dataset), self.linear_floats+1)
+        self.assertEqual((dim('float')+1).apply(self.dataset), self.linear_floats+1)
 
     def test_div_transform(self):
-        self.assertEqual((dim('int')/10.).eval(self.dataset), self.linear_floats)
+        self.assertEqual((dim('int')/10.).apply(self.dataset), self.linear_floats)
 
     def test_floor_div_transform(self):
-        self.assertEqual((dim('int')//2).eval(self.dataset), self.linear_ints//2)
+        self.assertEqual((dim('int')//2).apply(self.dataset), self.linear_ints//2)
 
     def test_mod_transform(self):
-        self.assertEqual((dim('int')%2).eval(self.dataset), self.linear_ints%2)
+        self.assertEqual((dim('int')%2).apply(self.dataset), self.linear_ints%2)
 
     def test_mul_transform(self):
-        self.assertEqual((dim('float')*10.).eval(self.dataset), self.linear_ints)
+        self.assertEqual((dim('float')*10.).apply(self.dataset), self.linear_ints)
 
     def test_pow_transform(self):
-        self.assertEqual((dim('int')**2).eval(self.dataset), self.linear_ints**2)
+        self.assertEqual((dim('int')**2).apply(self.dataset), self.linear_ints**2)
 
     def test_sub_transform(self):
-        self.assertEqual((dim('int')-10).eval(self.dataset), self.linear_ints-10)
+        self.assertEqual((dim('int')-10).apply(self.dataset), self.linear_ints-10)
 
     # Reverse binary operators
 
     def test_radd_transform(self):
-        self.assertEqual((1+dim('float')).eval(self.dataset), 1+self.linear_floats)
+        self.assertEqual((1+dim('float')).apply(self.dataset), 1+self.linear_floats)
 
     def test_rdiv_transform(self):
-        self.assertEqual((10./dim('int')).eval(self.dataset), 10./self.linear_ints)
+        self.assertEqual((10./dim('int')).apply(self.dataset), 10./self.linear_ints)
 
     def test_rfloor_div_transform(self):
-        self.assertEqual((2//dim('int')).eval(self.dataset), 2//self.linear_ints)
+        self.assertEqual((2//dim('int')).apply(self.dataset), 2//self.linear_ints)
 
     def test_rmod_transform(self):
-        self.assertEqual((2%dim('int')).eval(self.dataset), 2%self.linear_ints)
+        self.assertEqual((2%dim('int')).apply(self.dataset), 2%self.linear_ints)
 
     def test_rmul_transform(self):
-        self.assertEqual((10.*dim('float')).eval(self.dataset), self.linear_ints)
+        self.assertEqual((10.*dim('float')).apply(self.dataset), self.linear_ints)
 
     def test_rsub_transform(self):
-        self.assertEqual((10-dim('int')).eval(self.dataset), 10-self.linear_ints)
+        self.assertEqual((10-dim('int')).apply(self.dataset), 10-self.linear_ints)
 
     # NumPy operations
 
     def test_ufunc_transform(self):
-        self.assertEqual(np.sin(dim('float')).eval(self.dataset), np.sin(self.linear_floats))
+        self.assertEqual(np.sin(dim('float')).apply(self.dataset), np.sin(self.linear_floats))
 
     def test_astype_transform(self):
-        self.assertEqual(dim('int').astype(str).eval(self.dataset),
+        self.assertEqual(dim('int').astype(str).apply(self.dataset),
                          self.linear_ints.astype(str))
 
     def test_cumsum_transform(self):
-        self.assertEqual(dim('float').cumsum().eval(self.dataset),
+        self.assertEqual(dim('float').cumsum().apply(self.dataset),
                          self.linear_floats.cumsum())
 
     def test_max_transform(self):
-        self.assertEqual(dim('float').max().eval(self.dataset),
+        self.assertEqual(dim('float').max().apply(self.dataset),
                          self.linear_floats.max())
 
     def test_min_transform(self):
-        self.assertEqual(dim('float').min().eval(self.dataset),
+        self.assertEqual(dim('float').min().apply(self.dataset),
                          self.linear_floats.min())
     
     def test_round_transform(self):
-        self.assertEqual(dim('float').round().eval(self.dataset),
+        self.assertEqual(dim('float').round().apply(self.dataset),
                          self.linear_floats.round())
 
     def test_sum_transform(self):
-        self.assertEqual(dim('float').sum().eval(self.dataset),
+        self.assertEqual(dim('float').sum().apply(self.dataset),
                          self.linear_floats.sum())
 
     def test_std_transform(self):
-        self.assertEqual(dim('float').std().eval(self.dataset),
+        self.assertEqual(dim('float').std().apply(self.dataset),
                          self.linear_floats.std())
         
     def test_var_transform(self):
-        self.assertEqual(dim('float').var().eval(self.dataset),
+        self.assertEqual(dim('float').var().apply(self.dataset),
                          self.linear_floats.var())
 
     # Custom functions
 
     def test_norm_transform(self):
-        self.assertEqual(dim('int').norm().eval(self.dataset),
+        self.assertEqual(dim('int').norm().apply(self.dataset),
                          (self.linear_ints-1)/9.)
 
     def test_bin_transform(self):
-        self.assertEqual(dim('int').bin([0, 5, 10]).eval(self.dataset),
+        self.assertEqual(dim('int').bin([0, 5, 10]).apply(self.dataset),
                          np.array([2.5, 2.5, 2.5, 2.5, 2.5, 7.5, 7.5, 7.5, 7.5, 7.5]))
 
     def test_bin_transform_with_labels(self):
-        self.assertEqual(dim('int').bin([0, 5, 10], ['A', 'B']).eval(self.dataset),
+        self.assertEqual(dim('int').bin([0, 5, 10], ['A', 'B']).apply(self.dataset),
                          np.array(['A', 'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', 'B']))
 
     def test_cat_transform_list(self):
-        self.assertEqual(dim('categories').cat(['circle', 'square', 'triangle']).eval(self.dataset),
+        self.assertEqual(dim('categories').cat(['circle', 'square', 'triangle']).apply(self.dataset),
                          np.array((['circle', 'square', 'triangle']*3)+['circle']))
 
     def test_cat_transform_dict(self):
-        self.assertEqual(dim('categories').cat({'A': 'circle', 'B': 'square', 'C': 'triangle'}).eval(self.dataset),
+        self.assertEqual(dim('categories').cat({'A': 'circle', 'B': 'square', 'C': 'triangle'}).apply(self.dataset),
                          np.array((['circle', 'square', 'triangle']*3)+['circle']))
 
     def test_cat_transform_dict_with_empty(self):
-        self.assertEqual(dim('categories').cat({'A': 'circle', 'B': 'square'}, empty='triangle').eval(self.dataset),
+        self.assertEqual(dim('categories').cat({'A': 'circle', 'B': 'square'}, empty='triangle').apply(self.dataset),
                          np.array((['circle', 'square', 'triangle']*3)+['circle']))
 
     # Complex expressions
 
     def test_multi_operator_expression(self):
-        self.assertEqual((((dim('float')-2)*3)**2).eval(self.dataset),
+        self.assertEqual((((dim('float')-2)*3)**2).apply(self.dataset),
                          ((self.linear_floats-2)*3)**2)
 
     def test_multi_dim_expression(self):
-        self.assertEqual((dim('int')-dim('float')).eval(self.dataset),
+        self.assertEqual((dim('int')-dim('float')).apply(self.dataset),
                          self.linear_ints-self.linear_floats)
 
     # Repr method
diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index 838de8d894..8194dc3ff3 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -235,7 +235,7 @@ def applies(self, dataset):
                 applies &= other.applies(dataset)
         return applies
 
-    def eval(self, dataset, flat=False, expanded=None, ranges={}):
+    def apply(self, dataset, flat=False, expanded=None, ranges={}):
         """
         Evaluates the transform on the supplied dataset.
         """
@@ -249,11 +249,11 @@ def eval(self, dataset, flat=False, expanded=None, ranges={}):
             other = o['other']
             if other is not None:
                 if isinstance(other, dim):
-                    other = other.eval(dataset, ranges)
+                    other = other.apply(dataset, flat, expanded, ranges)
                 args = (other, data) if o['reverse'] else (data, other)
             else:
                 args = (data,)
-            drange = ranges.get(self.dimension.name, {})
+            drange = ranges.get(str(self), {})
             drange = drange.get('combined', drange)
             if o['fn'] == norm_fn and drange != {}:
                 data = o['fn'](data, *drange)

From 14af370738ce9d467ba8d3b191f46b46b5dfe448 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Tue, 20 Nov 2018 03:51:59 +0000
Subject: [PATCH 080/117] Marked old plot options as deprecated

---
 .../gallery/demos/bokeh/quiver_demo.ipynb     |   4 +-
 .../demos/matplotlib/quiver_demo.ipynb        |   2 +-
 .../elements/bokeh/VectorField.ipynb          |  10 +-
 .../elements/matplotlib/VectorField.ipynb     |  10 +-
 holoviews/plotting/bokeh/annotation.py        |  10 +-
 holoviews/plotting/bokeh/chart.py             | 108 +++++++++------
 holoviews/plotting/bokeh/graphs.py            |  28 ++--
 holoviews/plotting/bokeh/hex_tiles.py         |  26 ++--
 holoviews/plotting/bokeh/path.py              |  20 +--
 holoviews/plotting/bokeh/stats.py             |  16 ++-
 holoviews/plotting/mpl/chart.py               | 128 +++++++++++-------
 holoviews/plotting/mpl/graphs.py              |   8 +-
 holoviews/tests/plotting/bokeh/testbarplot.py |   2 +-
 .../tests/plotting/bokeh/testcurveplot.py     |   2 +-
 holoviews/tests/plotting/bokeh/testlabels.py  |   2 +-
 .../tests/plotting/bokeh/testpointplot.py     |   4 +-
 .../tests/plotting/bokeh/testspikesplot.py    |   2 +-
 .../plotting/bokeh/testvectorfieldplot.py     |   2 +-
 .../plotting/matplotlib/testcurveplot.py      |   2 +-
 .../plotting/matplotlib/testpointplot.py      |   6 +-
 .../plotting/matplotlib/testspikeplot.py      |   2 +-
 .../matplotlib/testvectorfieldplot.py         |   2 +-
 22 files changed, 241 insertions(+), 155 deletions(-)

diff --git a/examples/gallery/demos/bokeh/quiver_demo.ipynb b/examples/gallery/demos/bokeh/quiver_demo.ipynb
index d1fd9164a8..4e4bd61167 100644
--- a/examples/gallery/demos/bokeh/quiver_demo.ipynb
+++ b/examples/gallery/demos/bokeh/quiver_demo.ipynb
@@ -77,8 +77,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [width=500 size_index=3 pivot='tip'] (color='Magnitude') Points (color='black')\n",
-    "hv.VectorField((xs, ys, angle, mag), label=\"pivot='tip'; scales with x view\") * hv.Points((X.flat, Y.flat))"
+    "%%opts VectorField [width=500 magnitude='Magnitude' pivot='tip'] (line_width=2 color='Magnitude') Points (color='black')\n",
+    "hv.Points((X.flat, Y.flat)) * hv.VectorField((xs, ys, angle, mag), label=\"pivot='tip'; scales with x view\")"
    ]
   }
  ],
diff --git a/examples/gallery/demos/matplotlib/quiver_demo.ipynb b/examples/gallery/demos/matplotlib/quiver_demo.ipynb
index bce0418387..6475e44c26 100644
--- a/examples/gallery/demos/matplotlib/quiver_demo.ipynb
+++ b/examples/gallery/demos/matplotlib/quiver_demo.ipynb
@@ -77,7 +77,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [aspect=1.5 fig_size=200 size_index=3] (color='Magnitude' pivot='tip') Points (color='black' s=5)\n",
+    "%%opts VectorField [aspect=1.5 fig_size=200 magnitude='Magnitude'] (color='Magnitude' pivot='tip') Points (color='black' s=5)\n",
     "hv.VectorField((xs, ys, angle, mag), label=\"pivot='tip'; scales with x view\") * hv.Points((X.flat, Y.flat))"
    ]
   }
diff --git a/examples/reference/elements/bokeh/VectorField.ipynb b/examples/reference/elements/bokeh/VectorField.ipynb
index fbe157b80a..08d57340d7 100644
--- a/examples/reference/elements/bokeh/VectorField.ipynb
+++ b/examples/reference/elements/bokeh/VectorField.ipynb
@@ -37,7 +37,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3]\n",
+    "%%opts VectorField [magnitude='Magnitude']\n",
     "x,y  = np.mgrid[-10:10,-10:10] * 0.25\n",
     "sine_rings  = np.sin(x**2+y**2)*np.pi+np.pi\n",
     "exp_falloff = 1/np.exp((x**2+y**2)/8)\n",
@@ -61,7 +61,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3] VectorField.A (color='Angle') VectorField.M (color='Magnitude')\n",
+    "%%opts VectorField [magnitude='Magnitude'] VectorField.A (color='Angle') VectorField.M (color='Magnitude')\n",
     "hv.VectorField(vector_data, group='A') + hv.VectorField(vector_data, group='M')"
    ]
   },
@@ -69,7 +69,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "By default the arrows are rescaled to the minimum distance between individual arrows, to disable this rescaling set ``rescale=False`` and adjust the ``scale`` manually (smaller values result in larger arrows). This allows fixed scaling even when plotting arrows in an animation. Here we will vary the arrow angle with a Phase dimension and also add this angle to the magnitude data, showing the arrow angles and magnitudes varying. Due to the fixed scaling we can make out the differences across frames:"
+    "By default the magnitudes are rescaled to the minimum distance between individual arrows, to disable this rescaling set ``rescale_lengths=False`` use a dimension value transform to scale the size of the arrows, e.g. below we normalize the `'Magnitude'` dimension values and then scale them by a factor of `0.2`. This allows fixed scaling even when plotting arrows in an animation. Here we will vary the arrow angle with a Phase dimension and also add this angle to the magnitude data, showing the arrow angles and magnitudes varying. Due to the fixed scaling we can make out the differences across frames:"
    ]
   },
   {
@@ -78,7 +78,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3 rescale_lengths=False] (scale=4, color='Angle')\n",
+    "%%opts VectorField [magnitude=dim('Magnitude').norm()*0.2 rescale_lengths=False] (color='Angle')\n",
     "hv.HoloMap({phase: hv.VectorField([x, y,(vector_data[2]+phase)%np.pi*2, vector_data[3]+np.abs(phase)])\n",
     "            for phase in np.linspace(-np.pi,np.pi,5)}, kdims='Phase')"
    ]
@@ -119,7 +119,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [width=500 size_index=3 pivot='tip'] (cmap='fire' scale=0.8 color='Magnitude') Points (color='black' size=1)\n",
+    "%%opts VectorField [width=500 magnitude='Magnitude' pivot='tip'] (cmap='fire' line_width=1.5 color='Magnitude') Points (color='black' size=1)\n",
     "hv.VectorField((xs, ys, angle, mag)) * hv.Points((X.flat, Y.flat))"
    ]
   },
diff --git a/examples/reference/elements/matplotlib/VectorField.ipynb b/examples/reference/elements/matplotlib/VectorField.ipynb
index 3c74609d34..99a121f3c4 100644
--- a/examples/reference/elements/matplotlib/VectorField.ipynb
+++ b/examples/reference/elements/matplotlib/VectorField.ipynb
@@ -37,7 +37,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3]\n",
+    "%%opts VectorField [magnitude='Magnitude']\n",
     "x,y  = np.mgrid[-10:10,-10:10] * 0.25\n",
     "sine_rings  = np.sin(x**2+y**2)*np.pi+np.pi\n",
     "exp_falloff = 1/np.exp((x**2+y**2)/8)\n",
@@ -61,7 +61,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3] VectorField.A (color='Angle') VectorField.M (color='Magnitude')\n",
+    "%%opts VectorField [magnitude='Magnitude'] VectorField.A (color='Angle') VectorField.M (color='Magnitude')\n",
     "hv.VectorField(vector_data, group='A') + hv.VectorField(vector_data, group='M')"
    ]
   },
@@ -69,7 +69,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "By default the arrows are rescaled to the minimum distance between individual arrows, to disable this rescaling set ``rescale=False`` and adjust the ``scale`` manually (smaller values result in larger arrows). This allows fixed scaling even when plotting arrows in an animation. Here we will vary the arrow angle with a Phase dimension and also add this angle to the magnitude data, showing the arrow angles and magnitudes varying. Due to the fixed scaling we can make out the differences across frames:"
+    "By default the magnitudes are rescaled to the minimum distance between individual arrows, to disable this rescaling set ``rescale_lengths=False`` use a dimension value transform to scale the size of the arrows, e.g. below we normalize the `'Magnitude'` dimension values and then scale them by a factor of `0.2`. This allows fixed scaling even when plotting arrows in an animation. Here we will vary the arrow angle with a Phase dimension and also add this angle to the magnitude data, showing the arrow angles and magnitudes varying. Due to the fixed scaling we can make out the differences across frames:"
    ]
   },
   {
@@ -78,7 +78,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3 rescale_lengths=False] (scale=4 color='Angle')\n",
+    "%%opts VectorField [magnitude=dim('Magnitude').norm()*0.2 rescale_lengths=False] (color='Angle')\n",
     "hv.HoloMap({phase: hv.VectorField([x, y,(vector_data[2]+phase)%np.pi*2, vector_data[3]+np.abs(phase)])\n",
     "            for phase in np.linspace(-np.pi,np.pi,5)}, kdims='Phase')"
    ]
@@ -119,7 +119,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts VectorField [size_index=3 aspect=2 fig_size=300] (pivot='tip' cmap='fire' scale=0.8 color='Magnitude') Points (color='black' s=1)\n",
+    "%%opts VectorField [magnitude='Magnitude' aspect=2 fig_size=300] (pivot='tip' cmap='fire' scale=0.8 color='Magnitude') Points (color='black' s=1)\n",
     "hv.VectorField((xs, ys, angle, mag)) * hv.Points((X.flat, Y.flat))"
    ]
   },
diff --git a/holoviews/plotting/bokeh/annotation.py b/holoviews/plotting/bokeh/annotation.py
index f33bbbe365..79f71bd756 100644
--- a/holoviews/plotting/bokeh/annotation.py
+++ b/holoviews/plotting/bokeh/annotation.py
@@ -70,10 +70,6 @@ def get_extents(self, element, ranges=None, range_type='combined'):
 
 class LabelsPlot(ColorbarPlot, AnnotationPlot):
 
-    color_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                      allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
-
     show_legend = param.Boolean(default=False, doc="""
         Whether to show legend for the plot.""")
 
@@ -83,6 +79,12 @@ class LabelsPlot(ColorbarPlot, AnnotationPlot):
     yoffset = param.Number(default=None, doc="""
       Amount of offset to apply to labels along x-axis.""")
 
+    # Deprecated options
+
+    color_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `color=dim('color')`""")
+
     style_opts = text_properties + ['cmap', 'angle']
 
     _nonvectorized_styles = ['cmap']
diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 2b191ed34e..1b981e22da 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -8,8 +8,9 @@
 from bokeh.models.tools import BoxSelectTool
 from bokeh.transform import jitter
 
-from ...core import Dataset, OrderedDict
-from ...core.util import max_range, basestring, dimension_sanitizer, isfinite, range_pad
+from ...core.data import Dataset
+from ...core.dimension import dimension_name
+from ...core.util import OrderedDict, max_range, basestring, dimension_sanitizer, isfinite, range_pad
 from ...element import Bars
 from ...operation import interpolate_curve
 from ...util.transform import dim
@@ -22,22 +23,24 @@
 
 class PointPlot(LegendPlot, ColorbarPlot):
 
+    jitter = param.Number(default=None, bounds=(0, None), doc="""
+      The amount of jitter to apply to offset the points along the x-axis.""")
+
+    # Deprecated parameters
+
     color_index = param.ClassSelector(default=None, class_=(basestring, int),
                                       allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
+        Deprecated in favor of color style mapping, e.g. `color=dim('color')`""")
 
     size_index = param.ClassSelector(default=None, class_=(basestring, int),
                                      allow_None=True, doc="""
-      Index of the dimension from which the sizes will the drawn.""")
+        Deprecated in favor of size style mapping, e.g. `size=dim('size')`""")
 
     scaling_method = param.ObjectSelector(default="area",
                                           objects=["width", "area"],
                                           doc="""
-      Determines whether the `scaling_factor` should be applied to
-      the width or area of each point (default: "area").""")
-
-    jitter = param.Number(default=None, bounds=(0, None), doc="""
-      The amount of jitter to apply to offset the points along the x-axis.""")
+        Deprecated in favor of size style mapping, e.g.
+        size=dim('size')**2.""")
 
     scaling_factor = param.Number(default=1, bounds=(0, None), doc="""
       Scaling factor which is applied to either the width or area
@@ -59,7 +62,7 @@ def _get_size_data(self, element, ranges, style):
         ms = style.get('size', np.sqrt(6))
         if sdim and ((isinstance(ms, basestring) and ms in element) or isinstance(ms, dim)):
             self.warning("Cannot declare style mapping for 'size' option "
-                         "and declare a size_index, ignoring the size_index.")
+                         "and declare a size_index; ignoring the size_index.")
             sdim = None
         if not sdim or self.static_source:
             return data, mapping
@@ -149,29 +152,42 @@ def get_batched_data(self, element, ranges):
 class VectorFieldPlot(ColorbarPlot):
 
     arrow_heads = param.Boolean(default=True, doc="""
-       Whether or not to draw arrow heads.""")
+        Whether or not to draw arrow heads.""")
+
+    magnitude = param.ClassSelector(class_=(basestring, dim), doc="""
+        Dimension or dimension value transform that declares the magnitude
+        of each vector. Magnitude is expected to be scaled between 0-1,
+        by default the magnitudes are rescaled relative to the minimum
+        distance between vectors, this can be disabled with the
+        rescale_lengths option.""")
+
+    pivot = param.ObjectSelector(default='mid', objects=['mid', 'tip', 'tail'],
+                                 doc="""
+        The point around which the arrows should pivot valid options
+        include 'mid', 'tip' and 'tail'.""")
+
+    rescale_lengths = param.Boolean(default=True, doc="""
+        Whether the lengths will be rescaled to take into account the
+        smallest non-zero distance between two vectors.""")
+
+    # Deprecated parameters
 
     color_index = param.ClassSelector(default=None, class_=(basestring, int),
                                       allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
+        Deprecated in favor of dimension value transform on color option,
+        e.g. `color=dim('Magnitude')`.
+        """)
 
     size_index = param.ClassSelector(default=None, class_=(basestring, int),
                                      allow_None=True, doc="""
-      Index of the dimension from which the sizes will the drawn.""")
+        Deprecated in favor of the magnitude option, e.g.
+        `magnitude=dim('Magnitude')`.
+        """)
 
     normalize_lengths = param.Boolean(default=True, doc="""
-       Whether to normalize vector magnitudes automatically. If False,
-       it will be assumed that the lengths have already been correctly
-       normalized.""")
-
-    pivot = param.ObjectSelector(default='mid', objects=['mid', 'tip', 'tail'],
-                                 doc="""
-       The point around which the arrows should pivot valid options
-       include 'mid', 'tip' and 'tail'.""")
-
-    rescale_lengths = param.Boolean(default=True, doc="""
-       Whether the lengths will be rescaled to take into account the
-       smallest non-zero distance between two vectors.""")
+        Deprecated in favor of rescaling length using dimension value
+        transforms using the magnitude option, e.g.
+        `dim('Magnitude').norm()`.""")
 
     style_opts = line_properties + ['scale', 'cmap']
 
@@ -180,13 +196,25 @@ class VectorFieldPlot(ColorbarPlot):
     _plot_methods = dict(single='segment')
 
     def _get_lengths(self, element, ranges):
-        mag_dim = element.get_dimension(self.size_index)
+        size_dim = element.get_dimension(self.size_index)
+        mag_dim = self.magnitude
+        if size_dim and mag_dim:
+            self.warning("Cannot declare style mapping for 'magnitude' option "
+                         "and declare a size_index; ignoring the size_index.")
+        elif size_dim:
+            mag_dim = size_dim
+        elif isinstance(mag_dim, basestring):
+            mag_dim = element.get_dimension(mag_dim)
+
         (x0, x1), (y0, y1) = (element.range(i) for i in range(2))
         if mag_dim:
-            magnitudes = element.dimension_values(mag_dim)
-            _, max_magnitude = ranges[mag_dim.name]['combined']
-            if self.normalize_lengths and max_magnitude != 0:
-                magnitudes = magnitudes / max_magnitude
+            if isinstance(mag_dim, dim):
+                magnitudes = mag_dim.apply(element, flat=True)
+            else:
+                magnitudes = element.dimension_values(mag_dim)
+                _, max_magnitude = ranges[dimension_name(mag_dim)]['combined']
+                if self.normalize_lengths and max_magnitude != 0:
+                    magnitudes = magnitudes / max_magnitude
             if self.rescale_lengths:
                 base_dist = get_min_distance(element)
                 magnitudes *= base_dist
@@ -593,10 +621,6 @@ def get_data(self, element, ranges, style):
 
 class SpikesPlot(ColorbarPlot):
 
-    color_index = param.ClassSelector(default=None, allow_None=True,
-                                      class_=(basestring, int), doc="""
-      Index of the dimension from which the color will the drawn""")
-
     spike_length = param.Number(default=0.5, doc="""
       The length of each spike if Spikes object is one dimensional.""")
 
@@ -606,6 +630,12 @@ class SpikesPlot(ColorbarPlot):
     show_legend = param.Boolean(default=True, doc="""
         Whether to show legend for the plot.""")
 
+    # Deprecated parameters
+
+    color_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `color=dim('color')`""")
+
     style_opts = (['color', 'cmap', 'palette'] + line_properties)
 
     _plot_methods = dict(single='segment')
@@ -697,13 +727,15 @@ class BarPlot(ColorbarPlot, LegendPlot):
     mapped onto separate groups, categories and stacks.
     """
 
-    color_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                      allow_None=True, doc="""
-       Index of the dimension from which the color will the drawn""")
-
     stacked = param.Boolean(default=False, doc="""
        Whether the bars should be stacked or grouped.""")
 
+    # Deprecated parameters
+
+    color_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `color=dim('color')`""")
+
     group_index = param.ClassSelector(default=1, class_=(basestring, int),
                                       allow_None=True, doc="""
        Deprecated; use stacked option instead.""")
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 1b7a4dee49..2246487abf 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -20,14 +20,6 @@
 
 class GraphPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
 
-    color_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                      allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
-
-    edge_color_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                      allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
-
     selection_policy = param.ObjectSelector(default='nodes', objects=['edges', 'nodes', None], doc="""
         Determines policy for inspection of graph components, i.e. whether to highlight
         nodes or edges when selecting connected edges and nodes respectively.""")
@@ -39,6 +31,16 @@ class GraphPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
     tools = param.List(default=['hover', 'tap'], doc="""
         A list of plugin tools to use on the plot.""")
 
+    # Deprecated options
+
+    color_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `node_color=dim('color')`""")
+
+    edge_color_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `edge_color=dim('color')`""")
+
     # Map each glyph to a style group
     _style_groups = {'scatter': 'node', 'multi_line': 'edge', 'patches': 'edge', 'bezier': 'edge'}
 
@@ -316,13 +318,15 @@ def _init_glyphs(self, plot, element, ranges, source):
 
 class ChordPlot(GraphPlot):
 
-    label_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                      allow_None=True, doc="""
-      Index of the dimension from which the node labels will be drawn""")
-
     show_frame = param.Boolean(default=False, doc="""
         Whether or not to show a complete frame around the plot.""")
 
+    # Deprecated options
+
+    label_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+      Index of the dimension from which the node labels will be drawn""")
+    
     # Map each glyph to a style group
     _style_groups = {'scatter': 'node', 'multi_line': 'edge', 'text': 'label',
                      'arc': 'arc'}
diff --git a/holoviews/plotting/bokeh/hex_tiles.py b/holoviews/plotting/bokeh/hex_tiles.py
index 67f712025f..aeb0620611 100644
--- a/holoviews/plotting/bokeh/hex_tiles.py
+++ b/holoviews/plotting/bokeh/hex_tiles.py
@@ -99,16 +99,26 @@ class HexTilesPlot(ColorbarPlot):
       reduction is allowed, defaulting to np.size to count the number
       of values in each bin.""")
 
-    color_index = param.ClassSelector(default=2, class_=(basestring, int),
-                                     allow_None=True, doc="""
-      Index of the dimension from which the colors will the drawn.""")
-
     gridsize = param.ClassSelector(default=50, class_=(int, tuple), doc="""
       Number of hexagonal bins along x- and y-axes. Defaults to uniform
       sampling along both axes when setting and integer but independent
       bin sampling can be specified a tuple of integers corresponding to
       the number of bins along each axis.""")
 
+    min_count = param.Number(default=None, doc="""
+      The display threshold before a bin is shown, by default bins with
+      a count of less than 1 are hidden.""")
+
+    orientation = param.ObjectSelector(default='pointy', objects=['flat', 'pointy'],
+                                       doc="""
+      The orientation of hexagon bins. By default the pointy side is on top.""")
+
+    # Deprecated options
+
+    color_index = param.ClassSelector(default=2, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `color=dim('color')`""")
+
     max_scale = param.Number(default=0.9, bounds=(0, None), doc="""
       When size_index is enabled this defines the maximum size of each
       bin relative to uniform tile size, i.e. for a value of 1, the
@@ -121,14 +131,6 @@ class HexTilesPlot(ColorbarPlot):
       smallest bin will match the size of bins when scaling is disabled.
       Setting value larger than 1 will result in overlapping bins.""")
 
-    min_count = param.Number(default=None, doc="""
-      The display threshold before a bin is shown, by default bins with
-      a count of less than 1 are hidden.""")
-
-    orientation = param.ObjectSelector(default='pointy', objects=['flat', 'pointy'],
-                                       doc="""
-      The orientation of hexagon bins. By default the pointy side is on top.""")
-
     size_index = param.ClassSelector(default=None, class_=(basestring, int),
                                      allow_None=True, doc="""
       Index of the dimension from which the sizes will the drawn.""")
diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index 51f47e89ba..3428ee9268 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -16,13 +16,15 @@
 
 class PathPlot(ColorbarPlot):
 
-    color_index = param.ClassSelector(default=None, class_=(util.basestring, int),
-                                      allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
-
     show_legend = param.Boolean(default=False, doc="""
         Whether to show legend for the plot.""")
 
+    # Deprecated options
+
+    color_index = param.ClassSelector(default=None, class_=(util.basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `color=dim('color')`""")
+
     style_opts = line_properties + ['cmap']
     _plot_methods = dict(single='multi_line', batched='multi_line')
     _mapping = dict(xs='xs', ys='ys')
@@ -130,13 +132,15 @@ def get_batched_data(self, element, ranges=None):
 
 class ContourPlot(LegendPlot, PathPlot):
 
-    color_index = param.ClassSelector(default=0, class_=(util.basestring, int),
-                                      allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
-
     show_legend = param.Boolean(default=False, doc="""
         Whether to show legend for the plot.""")
 
+    # Deprecated options
+
+    color_index = param.ClassSelector(default=0, class_=(util.basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `color=dim('color')`""")
+
     _color_style = 'line_color'
 
     def _hover_opts(self, element):
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index ff69152a00..19123a9e95 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -61,13 +61,15 @@ class BivariatePlot(PolygonPlot):
 
 class BoxWhiskerPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
 
-    color_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                      allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
-
     show_legend = param.Boolean(default=False, doc="""
         Whether to show legend for the plot.""")
 
+    # Deprecated options
+
+    color_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `box_color=dim('color')`""")
+
     # X-axis is categorical
     _x_range_type = FactorRange
 
@@ -300,6 +302,12 @@ class ViolinPlot(BoxWhiskerPlot):
     violin_width = param.Number(default=0.8, doc="""
        Relative width of the violin""")
 
+    # Deprecated options
+
+    color_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `violin_color=dim('color')`""")
+
     # Map each glyph to a style group
     _style_groups = {'patches': 'violin', 'segment': 'stats', 'vbar': 'box',
                      'scatter': 'median', 'hbar': 'box'}
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index f18149795e..065c376c12 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -10,11 +10,11 @@
 from matplotlib.collections import LineCollection
 from matplotlib.dates import DateFormatter, date2num
 
-from ...core import OrderedDict, Dimension
+from ...core.dimension import Dimension, dimension_name
 from ...core.options import Store, abbreviated_exception
 from ...core.util import (
-    match_spec, unique_iterator, basestring, max_range, isfinite,
-    datetime_types, dt_to_int, dt64_to_dt
+    OrderedDict, match_spec, unique_iterator, basestring, max_range,
+    isfinite, datetime_types, dt_to_int, dt64_to_dt
 )
 from ...element import Raster, HeatMap
 from ...operation import interpolate_curve
@@ -571,27 +571,29 @@ class PointPlot(ChartPlot, ColorbarPlot):
     how point magnitudes are rendered to different colors.
     """
 
+    show_grid = param.Boolean(default=False, doc="""
+      Whether to draw grid lines at the tick positions.""")
+
+    # Deprecated parameters
+
     color_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                  allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `color=dim('color')`""")
 
     size_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                 allow_None=True, doc="""
-      Index of the dimension from which the sizes will the drawn.""")
+                                     allow_None=True, doc="""
+        Deprecated in favor of size style mapping, e.g. `size=dim('size')`""")
 
     scaling_method = param.ObjectSelector(default="area",
                                           objects=["width", "area"],
                                           doc="""
-      Determines whether the `scaling_factor` should be applied to
-      the width or area of each point (default: "area").""")
+        Deprecated in favor of size style mapping, e.g.
+        size=dim('size')**2.""")
 
     scaling_factor = param.Number(default=1, bounds=(0, None), doc="""
       Scaling factor which is applied to either the width or area
       of each point, depending on the value of `scaling_method`.""")
 
-    show_grid = param.Boolean(default=False, doc="""
-      Whether to draw grid lines at the tick positions.""")
-
     size_fn = param.Callable(default=np.abs, doc="""
       Function applied to size values before applying scaling,
       to remove values lower than zero.""")
@@ -621,7 +623,7 @@ def _compute_styles(self, element, ranges, style):
 
         if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, dim)):
             self.warning("Cannot declare style mapping for 'color' option "
-                         "and declare a color_index, ignoring the color_index.")
+                         "and declare a color_index; ignoring the color_index.")
             cdim = None
         if cdim and cmap:
             cs = element.dimension_values(self.color_index)
@@ -639,7 +641,7 @@ def _compute_styles(self, element, ranges, style):
         sdim = element.get_dimension(self.size_index)
         if sdim and ((isinstance(ms, basestring) and ms in element) or isinstance(ms, dim)):
             self.warning("Cannot declare style mapping for 's' option "
-                         "and declare a size_index, ignoring the size_index.")
+                         "and declare a size_index; ignoring the size_index.")
             sdim = None
         if sdim:
             sizes = element.dimension_values(self.size_index)
@@ -692,67 +694,98 @@ class VectorFieldPlot(ColorbarPlot):
     to the minimum distance respectively.
     """
 
-    color_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                      allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
-
-    size_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                     allow_None=True, doc="""
-      Index of the dimension from which the sizes will the drawn.""")
-
     arrow_heads = param.Boolean(default=True, doc="""
        Whether or not to draw arrow heads. If arrowheads are enabled,
        they may be customized with the 'headlength' and
        'headaxislength' style options.""")
 
-    normalize_lengths = param.Boolean(default=True, doc="""
-       Whether to normalize vector magnitudes automatically. If False,
-       it will be assumed that the lengths have already been correctly
-       normalized.""")
+    magnitude = param.ClassSelector(class_=(basestring, dim), doc="""
+        Dimension or dimension value transform that declares the magnitude
+        of each vector. Magnitude is expected to be scaled between 0-1,
+        by default the magnitudes are rescaled relative to the minimum
+        distance between vectors, this can be disabled with the
+        rescale_lengths option.""")
 
     rescale_lengths = param.Boolean(default=True, doc="""
        Whether the lengths will be rescaled to take into account the
        smallest non-zero distance between two vectors.""")
 
+    # Deprecated parameters
+
+    color_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Deprecated in favor of dimension value transform on color option,
+        e.g. `color=dim('Magnitude')`.
+        """)
+
+    size_index = param.ClassSelector(default=None, class_=(basestring, int),
+                                     allow_None=True, doc="""
+        Deprecated in favor of the magnitude option, e.g.
+        `magnitude=dim('Magnitude')`.
+        """)
+
+    normalize_lengths = param.Boolean(default=True, doc="""
+        Deprecated in favor of rescaling length using dimension value
+        transforms using the magnitude option, e.g.
+        `dim('Magnitude').norm()`.""")
+
     style_opts = ['alpha', 'color', 'edgecolors', 'facecolors',
                   'linewidth', 'marker', 'visible', 'cmap',
                   'scale', 'headlength', 'headaxislength', 'pivot',
                   'width', 'headwidth', 'norm']
 
     _nonvectorized_styles = ['alpha', 'marker', 'cmap', 'visible', 'norm',
-                     'pivot', 'scale', 'headlength', 'headaxislength',
-                     'headwidth']
+                             'pivot', 'headlength', 'headaxislength',
+                             'headwidth']
 
     _plot_methods = dict(single='quiver')
 
-    def get_data(self, element, ranges, style):
-        input_scale = style.pop('scale', 1.0)
+    def _get_magnitudes(self, element, style, ranges):
+        size_dim = element.get_dimension(self.size_index)
+        mag_dim = self.magnitude
+        if size_dim and mag_dim:
+            self.warning("Cannot declare style mapping for 'magnitude' option "
+                         "and declare a size_index; ignoring the size_index.")
+        elif size_dim:
+            mag_dim = size_dim
+        elif isinstance(mag_dim, basestring):
+            mag_dim = element.get_dimension(mag_dim)
+        if mag_dim is not None:
+            if isinstance(mag_dim, dim):
+                magnitudes = mag_dim.apply(element, flat=True)
+            else:
+                magnitudes = element.dimension_values(mag_dim)
+                _, max_magnitude = ranges[dimension_name(mag_dim)]['combined']
+                if self.normalize_lengths and max_magnitude != 0:
+                    magnitudes = magnitudes / max_magnitude
+        else:
+            magnitudes = np.ones(len(element))
+        return magnitudes
 
+    def get_data(self, element, ranges, style):
+        # Compute coordinates
         xidx, yidx = (1, 0) if self.invert_axes else (0, 1)
         xs = element.dimension_values(xidx) if len(element.data) else []
         ys = element.dimension_values(yidx) if len(element.data) else []
+
+        # Compute vector angle and magnitude
         radians = element.dimension_values(2) if len(element.data) else []
         if self.invert_axes: radians = radians+1.5*np.pi
         angles = list(np.rad2deg(radians))
+        magnitudes = self._get_magnitudes(element, style, ranges)
+        input_scale = style.pop('scale', 1.0)
         if self.rescale_lengths:
             min_dist = get_min_distance(element)
             input_scale = input_scale / min_dist
 
-        mag_dim = element.get_dimension(self.size_index)
-        if mag_dim:
-            magnitudes = element.dimension_values(mag_dim)
-            _, max_magnitude = ranges[mag_dim.name]['combined']
-            if self.normalize_lengths and max_magnitude != 0:
-                magnitudes = magnitudes / max_magnitude
-        else:
-            magnitudes = np.ones(len(xs))
-
         args = (xs, ys, magnitudes,  [0.0] * len(element))
+
+        # Compute color
         cdim = element.get_dimension(self.color_index)
         color = style.get('color', None)
         if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, dim)):
             self.warning("Cannot declare style mapping for 'color' option "
-                         "and declare a color_index, ignoring the color_index.")
+                         "and declare a color_index; ignoring the color_index.")
             cdim = None
         if cdim:
             colors = element.dimension_values(self.color_index)
@@ -761,19 +794,18 @@ def get_data(self, element, ranges, style):
             self._norm_kwargs(element, ranges, style, cdim)
             style.pop('color', None)
 
-        if 'pivot' not in style: style['pivot'] = 'mid'
-        if not self.arrow_heads:
-            style['headaxislength'] = 0
-
+        # Process style
         with abbreviated_exception():
             style = self._apply_transforms(element, ranges, style)
-        style.update(dict(scale=input_scale, angles=angles,
-                          units='x', scale_units='x'))
-
+        style.update(dict(scale=input_scale, angles=angles, units='x', scale_units='x'))
         if 'vmin' in style:
             style['clim'] = (style.pop('vmin'), style.pop('vmax'))
         if 'c' in style:
             style['array'] = style.pop('c')
+        if 'pivot' not in style:
+            style['pivot'] = 'mid'
+        if not self.arrow_heads:
+            style['headaxislength'] = 0
 
         return args, style, {}
 
@@ -1117,7 +1149,7 @@ def get_data(self, element, ranges, style):
         color = style.get('color', None)
         if cdim and ((isinstance(color, basestring) and color in element) or isinstance(color, dim)):
             self.warning("Cannot declare style mapping for 'color' option "
-                         "and declare a color_index, ignoring the color_index.")
+                         "and declare a color_index; ignoring the color_index.")
             cdim = None
         if cdim:
             style['array'] = element.dimension_values(cdim)
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index ff8ce38ab7..80bd0be049 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -14,13 +14,15 @@
 
 class GraphPlot(ColorbarPlot):
 
+    # Deprecated options
+
     color_index = param.ClassSelector(default=None, class_=(basestring, int),
-                                  allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
+                                      allow_None=True, doc="""
+        Deprecated in favor of color style mapping, e.g. `node_color=dim('color')`""")
 
     edge_color_index = param.ClassSelector(default=None, class_=(basestring, int),
                                       allow_None=True, doc="""
-      Index of the dimension from which the color will the drawn""")
+        Deprecated in favor of color style mapping, e.g. `edge_color=dim('color')`""")
 
     style_opts = ['edge_alpha', 'edge_color', 'edge_linestyle', 'edge_linewidth',
                   'node_alpha', 'node_color', 'node_edgecolors', 'node_facecolors',
diff --git a/holoviews/tests/plotting/bokeh/testbarplot.py b/holoviews/tests/plotting/bokeh/testbarplot.py
index 6e57fc0001..a96296f2e9 100644
--- a/holoviews/tests/plotting/bokeh/testbarplot.py
+++ b/holoviews/tests/plotting/bokeh/testbarplot.py
@@ -239,6 +239,6 @@ def test_bars_color_index_color_clash(self):
             plot = bokeh_renderer.get_plot(bars)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'color' option "
-                   "and declare a color_index, ignoring the color_index.\n"
+                   "and declare a color_index; ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
diff --git a/holoviews/tests/plotting/bokeh/testcurveplot.py b/holoviews/tests/plotting/bokeh/testcurveplot.py
index eda7801b50..5f3558d9ba 100644
--- a/holoviews/tests/plotting/bokeh/testcurveplot.py
+++ b/holoviews/tests/plotting/bokeh/testcurveplot.py
@@ -358,7 +358,7 @@ def test_op_ndoverlay_color_value(self):
         for subplot, color in zip(plot.subplots.values(), colors):
             style = dict(subplot.style[subplot.cyclic_index])
             cds = subplot.handles['cds']
-            style = subplot._apply_ops(subplot.current_frame, cds, {}, style)
+            style = subplot._apply_transforms(subplot.current_frame, cds, {}, style)
             self.assertEqual(style['color'], color)
 
     def test_curve_color_op(self):
diff --git a/holoviews/tests/plotting/bokeh/testlabels.py b/holoviews/tests/plotting/bokeh/testlabels.py
index f997655580..1d51b70796 100644
--- a/holoviews/tests/plotting/bokeh/testlabels.py
+++ b/holoviews/tests/plotting/bokeh/testlabels.py
@@ -182,6 +182,6 @@ def test_labels_color_index_color_clash(self):
             plot = bokeh_renderer.get_plot(labels)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'text_color' option "
-                   "and declare a color_index, ignoring the color_index.\n"
+                   "and declare a color_index; ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
diff --git a/holoviews/tests/plotting/bokeh/testpointplot.py b/holoviews/tests/plotting/bokeh/testpointplot.py
index 06b65f4f28..df8e59acd5 100644
--- a/holoviews/tests/plotting/bokeh/testpointplot.py
+++ b/holoviews/tests/plotting/bokeh/testpointplot.py
@@ -463,7 +463,7 @@ def test_point_color_index_color_clash(self):
             plot = bokeh_renderer.get_plot(points)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'color' option "
-                   "and declare a color_index, ignoring the color_index.\n"
+                   "and declare a color_index; ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
 
@@ -484,6 +484,6 @@ def test_point_size_index_size_clash(self):
             plot = bokeh_renderer.get_plot(points)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'size' option "
-                   "and declare a size_index, ignoring the size_index.\n"
+                   "and declare a size_index; ignoring the size_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
diff --git a/holoviews/tests/plotting/bokeh/testspikesplot.py b/holoviews/tests/plotting/bokeh/testspikesplot.py
index f794d4ecb2..b1ebb6b475 100644
--- a/holoviews/tests/plotting/bokeh/testspikesplot.py
+++ b/holoviews/tests/plotting/bokeh/testspikesplot.py
@@ -219,6 +219,6 @@ def test_spikes_color_index_color_clash(self):
             plot = bokeh_renderer.get_plot(spikes)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'color' option "
-                   "and declare a color_index, ignoring the color_index.\n"
+                   "and declare a color_index; ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
diff --git a/holoviews/tests/plotting/bokeh/testvectorfieldplot.py b/holoviews/tests/plotting/bokeh/testvectorfieldplot.py
index 35b0218a3a..62c330bd04 100644
--- a/holoviews/tests/plotting/bokeh/testvectorfieldplot.py
+++ b/holoviews/tests/plotting/bokeh/testvectorfieldplot.py
@@ -77,6 +77,6 @@ def test_vectorfield_color_index_color_clash(self):
             plot = bokeh_renderer.get_plot(vectorfield)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'line_color' option "
-                   "and declare a color_index, ignoring the color_index.\n"
+                   "and declare a color_index; ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
diff --git a/holoviews/tests/plotting/matplotlib/testcurveplot.py b/holoviews/tests/plotting/matplotlib/testcurveplot.py
index 1eba50e40f..918c8851fb 100644
--- a/holoviews/tests/plotting/matplotlib/testcurveplot.py
+++ b/holoviews/tests/plotting/matplotlib/testcurveplot.py
@@ -165,7 +165,7 @@ def test_op_ndoverlay_color_value(self):
         plot = mpl_renderer.get_plot(overlay)
         for subplot, color in zip(plot.subplots.values(), colors):
             style = dict(subplot.style[subplot.cyclic_index])
-            style = subplot._apply_ops(subplot.current_frame, {}, style)
+            style = subplot._apply_transforms(subplot.current_frame, {}, style)
             self.assertEqual(style['color'], color)
 
     def test_curve_color_op(self):
diff --git a/holoviews/tests/plotting/matplotlib/testpointplot.py b/holoviews/tests/plotting/matplotlib/testpointplot.py
index 8b40fa0c60..c48c1f47f8 100644
--- a/holoviews/tests/plotting/matplotlib/testpointplot.py
+++ b/holoviews/tests/plotting/matplotlib/testpointplot.py
@@ -287,7 +287,7 @@ def test_op_ndoverlay_value(self):
         plot = mpl_renderer.get_plot(overlay)
         for subplot, marker in zip(plot.subplots.values(), markers):
             style = dict(subplot.style[subplot.cyclic_index])
-            style = subplot._apply_ops(subplot.current_frame, {}, style)
+            style = subplot._apply_transforms(subplot.current_frame, {}, style)
             self.assertEqual(style['marker'], marker)
 
     def test_point_color_index_color_clash(self):
@@ -297,7 +297,7 @@ def test_point_color_index_color_clash(self):
             plot = mpl_renderer.get_plot(points)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'color' option "
-                   "and declare a color_index, ignoring the color_index.\n"
+                   "and declare a color_index; ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
 
@@ -308,6 +308,6 @@ def test_point_size_index_size_clash(self):
             plot = mpl_renderer.get_plot(points)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 's' option "
-                   "and declare a size_index, ignoring the size_index.\n"
+                   "and declare a size_index; ignoring the size_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
diff --git a/holoviews/tests/plotting/matplotlib/testspikeplot.py b/holoviews/tests/plotting/matplotlib/testspikeplot.py
index c0985d5cbd..2ee2ae915c 100644
--- a/holoviews/tests/plotting/matplotlib/testspikeplot.py
+++ b/holoviews/tests/plotting/matplotlib/testspikeplot.py
@@ -195,7 +195,7 @@ def test_spikes_color_index_color_clash(self):
             plot = mpl_renderer.get_plot(spikes)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'color' option "
-                   "and declare a color_index, ignoring the color_index.\n"
+                   "and declare a color_index; ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)
 
diff --git a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
index 9d733f0663..1975e5f5c0 100644
--- a/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
+++ b/holoviews/tests/plotting/matplotlib/testvectorfieldplot.py
@@ -98,6 +98,6 @@ def test_vectorfield_color_index_color_clash(self):
             plot = mpl_renderer.get_plot(vectorfield)
         log_msg = log.stream.read()
         warning = ("%s: Cannot declare style mapping for 'color' option "
-                   "and declare a color_index, ignoring the color_index.\n"
+                   "and declare a color_index; ignoring the color_index.\n"
                    % plot.name)
         self.assertEqual(log_msg, warning)

From c23aab1bcaa6de2f9a60be31b3c4afa182e614c1 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Tue, 20 Nov 2018 04:05:08 +0000
Subject: [PATCH 081/117] Fixed handling of dim color mapping range lookup

---
 holoviews/plotting/bokeh/element.py             |  8 +++++++-
 holoviews/plotting/mpl/element.py               | 11 +++++++++--
 holoviews/tests/plotting/bokeh/testgraphplot.py |  4 +++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 35ce7e89d8..d4fff9a7c3 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -1255,8 +1255,14 @@ def _get_colormapper(self, eldim, element, ranges, style, factors=None, colors=N
         if eldim is None and colors is None:
             return None
 
+        if isinstance(eldim, dim):
+            dim_name = repr(eldim)
+            if dim_name.startswith("'") and dim_name.endswith("'"):
+                dim_name = dim_name[1:-1]
+        else:
+            dim_name = eldim.name
+
         # Attempt to find matching colormapper on the adjoined plot
-        dim_name = repr(eldim) if isinstance(eldim, dim) else eldim.name
         if self.adjoined:
             cmapper_name = dim_name+name
             cmappers = self.adjoined.traverse(lambda x: (x.handles.get('color_dim'),
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 7b7b5768ce..928c1c8b86 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -729,8 +729,13 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
         Returns valid color normalization kwargs
         to be passed to matplotlib plot function.
         """
-        clim = opts.pop(prefix+'clims', None)
-        dim_name = repr(vdim) if isinstance(vdim, dim) else vdim.name
+        if isinstance(vdim, dim):
+            dim_name = repr(vdim)
+            if dim_name.startswith("'") and dim_name.endswith("'"):
+                dim_name = dim_name[1:-1]
+        else:
+            dim_name = vdim.name
+
         if values is None:
             if isinstance(vdim, dim):
                 values = vdim.apply(element, flat=True)
@@ -742,6 +747,8 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
                      element.interface.isscalar(element, vdim.name))
                 )
                 values = np.asarray(element.dimension_values(vdim, expanded=expanded))
+
+        clim = opts.pop(prefix+'clims', None)
         if clim is None:
             if not len(values):
                 clim = (0, 0)
diff --git a/holoviews/tests/plotting/bokeh/testgraphplot.py b/holoviews/tests/plotting/bokeh/testgraphplot.py
index e6497f9279..4048ea02e1 100644
--- a/holoviews/tests/plotting/bokeh/testgraphplot.py
+++ b/holoviews/tests/plotting/bokeh/testgraphplot.py
@@ -418,7 +418,9 @@ def test_trimesh_op_edge_color_linear_mean_node(self):
         cmapper = plot.handles['edge_color_color_mapper']
         self.assertEqual(glyph.line_color, {'field': 'edge_color', 'transform': cmapper})
         self.assertEqual(cds.data['edge_color'], np.array([2, 8/3.]))
-    
+        self.assertEqual(cmapper.low, 1)
+        self.assertEqual(cmapper.high, 4)
+
     def test_trimesh_op_edge_color(self):
         edges = [(0, 1, 2, 'red'), (1, 2, 3, 'blue')]
         nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]

From 9973afbf6429aac0f6573763f096bc96dea0b403 Mon Sep 17 00:00:00 2001
From: "James A. Bednar" <jbednar@users.noreply.github.com>
Date: Tue, 20 Nov 2018 04:07:35 +0000
Subject: [PATCH 082/117] Update holoviews/util/transform.py

Co-Authored-By: philippjfr <philippjfr@continuum.io>
---
 holoviews/util/transform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index 8194dc3ff3..b47ded6b0a 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -129,7 +129,7 @@ def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
     @classmethod
     def register(cls, key, function):
         """
-        Register a custom op transform function which can from then
+        Register a custom dim transform function which can from then
         on be referenced by the key.
         """
         cls._op_registry[key] = function

From c4c1a3fefa51a96cbd606afcc1f3cedcee1189bd Mon Sep 17 00:00:00 2001
From: "James A. Bednar" <jbednar@users.noreply.github.com>
Date: Tue, 20 Nov 2018 04:07:42 +0000
Subject: [PATCH 083/117] Update holoviews/util/transform.py

Co-Authored-By: philippjfr <philippjfr@continuum.io>
---
 holoviews/util/transform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index b47ded6b0a..4f3815007e 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -102,7 +102,7 @@ class dim(object):
     """
     dim transform objects are a way to express deferred transformations
     on HoloViews Datasets. It supports all mathematical operations,
-    NumPy ufuncs and provides a number of useful methods for normalizing,
+    and NumPy ufuncs, and provide a number of useful methods for normalizing,
     binning and categorizing data.
     """
 

From 0321029973b9360bd2e998f1781548e7729494d6 Mon Sep 17 00:00:00 2001
From: "James A. Bednar" <jbednar@users.noreply.github.com>
Date: Tue, 20 Nov 2018 04:08:04 +0000
Subject: [PATCH 084/117] Update holoviews/util/transform.py

Co-Authored-By: philippjfr <philippjfr@continuum.io>
---
 holoviews/util/transform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index 4f3815007e..3baef97101 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -101,7 +101,7 @@ def cat_fn(values, categories, empty=None):
 class dim(object):
     """
     dim transform objects are a way to express deferred transformations
-    on HoloViews Datasets. It supports all mathematical operations,
+    on HoloViews Datasets. Dims support all mathematical operations
     and NumPy ufuncs, and provide a number of useful methods for normalizing,
     binning and categorizing data.
     """

From 4d167f51367ccdfd4d1d4acccd31eb6fcdadc81a Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Tue, 20 Nov 2018 13:20:55 +0000
Subject: [PATCH 085/117] Added matplotlib validator

---
 holoviews/plotting/bokeh/element.py |  7 +--
 holoviews/plotting/bokeh/styles.py  |  6 ++-
 holoviews/plotting/mpl/element.py   | 12 +++---
 holoviews/plotting/mpl/util.py      | 67 +++++++++++++++++++++++------
 4 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index d4fff9a7c3..042a129283 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -663,13 +663,14 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
         prefix = group+'_' if group else ''
         for k, v in dict(style).items():
             if isinstance(v, util.basestring):
-                if v in element or (isinstance(element, Graph) and v in element.nodes):
+                if validate(k, v) == True:
+                    continue
+                elif v in element or (isinstance(element, Graph) and v in element.nodes):
                     v = dim(v)
                 elif any(d==v for d in self.overlay_dims):
                     v = dim([d for d in self.overlay_dims if d==v][0])
 
-            if (not isinstance(v, dim) or (group is not None and not k.startswith(group)) or
-                (k == 'marker' and v.dimension.name in markers)):
+            if (not isinstance(v, dim) or (group is not None and not k.startswith(group))):
                 continue
             elif (not v.applies(element) and v.dimension not in self.overlay_dims):
                 new_style.pop(k)
diff --git a/holoviews/plotting/bokeh/styles.py b/holoviews/plotting/bokeh/styles.py
index 69a80b21c3..cc5a92a427 100644
--- a/holoviews/plotting/bokeh/styles.py
+++ b/holoviews/plotting/bokeh/styles.py
@@ -51,7 +51,9 @@
     '1': {'marker': 'triangle', 'angle': 0},
     '2': {'marker': 'triangle', 'angle': -np.pi/2},
     '3': {'marker': 'triangle', 'angle': np.pi},
-    '4': {'marker': 'triangle', 'angle': np.pi/2}
+    '4': {'marker': 'triangle', 'angle': np.pi/2},
+    'o': {'marker': 'circle'},
+    '*': {'marker': 'asterisk'},
 }
 
 
@@ -99,7 +101,7 @@ def mpl_to_bokeh(properties):
     ),
     'font_size' : font_size.is_valid,
     'line_dash' : dash_pattern.is_valid,
-    'marker'    : marker.is_valid,
+    'marker'    : lambda x: marker.is_valid(x) or x in markers,
     'size'      : size.is_valid,
 }
 
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 928c1c8b86..55a86188d5 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -20,7 +20,7 @@
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import MPLPlot, mpl_rc_context
-from .util import wrap_formatter, is_color, categorize_colors, mpl_version
+from .util import categorize_colors, mpl_version, validate, wrap_formatter
 
 
 class ElementPlot(GenericElementPlot, MPLPlot):
@@ -521,7 +521,9 @@ def _apply_transforms(self, element, ranges, style):
         new_style = dict(style)
         for k, v in style.items():
             if isinstance(v, util.basestring):
-                if v in element or (isinstance(element, Graph) and v in element.nodes):
+                if validate(k, v) == True:
+                    continue
+                elif v in element or (isinstance(element, Graph) and v in element.nodes):
                     v = dim(v)
                 elif any(d==v for d in self.overlay_dims):
                     v = dim([d for d in self.overlay_dims if d==v][0])
@@ -560,7 +562,7 @@ def _apply_transforms(self, element, ranges, style):
             group = groups[0] if groups else None
             prefix = '' if group is None else group+'_'
             if (k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray)
-                and any(not is_color(c) for c in val)):
+                and not validate('color', c)):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v, val, prefix)
                 if val.dtype.kind in 'OSUM':
@@ -580,10 +582,10 @@ def _apply_transforms(self, element, ranges, style):
             prefix = '' if group is None else group+'_'
             if k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray):
                 fill_style = new_style.get(prefix+'facecolor')
-                if fill_style and is_color(fill_style):
+                if fill_style and validate('color', fill_style):
                     new_style.pop('facecolor')
                 line_style = new_style.get(prefix+'edgecolor')
-                if line_style and is_color(line_style):
+                if line_style and validate('color', line_style):
                     new_style.pop('edgecolor')
             elif k == 'facecolors' and not isinstance(new_style.get('color', new_style.get('c')), np.ndarray):
                 # Color overrides facecolors if defined
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index 535269bf6b..c4fc2f62f7 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -7,28 +7,71 @@
 import matplotlib
 from matplotlib import ticker
 from matplotlib.colors import cnames
+from matplotlib.lines import Line2D
+from matplotlib.markers import MarkerStyle
 from matplotlib.patches import Path, PathPatch
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
-
-from ...core.util import LooseVersion, _getargspec, basestring
+from matplotlib.rcsetup import (
+    validate_capstyle, validate_color, validate_fontsize, validate_fonttype,
+    validate_hatch, validate_joinstyle
+)
+from ...core.util import LooseVersion, _getargspec, basestring, is_number
 from ...element import Raster, RGB, Polygons
 from ..util import COLOR_ALIASES, RGB_HEX_REGEX
 
 mpl_version = LooseVersion(matplotlib.__version__)
 
-def is_color(color):
+
+validators = {
+    'alpha': lambda x: is_number(x) and (0 <= x <= 1),
+    'capstyle': validate_capstyle,
+    'color': validate_color,
+    'fontsize': validate_fontsize,
+    'fonttype': validate_fonttype,
+    'hatch': validate_hatch,
+    'joinstyle': validate_joinstyle,
+    'marker': lambda x: (x in Line2D.markers or isinstance(x, MarkerStyle)
+                         or isinstance(x, Path) or
+                         (isinstance(x, basestring) and x.startswith('$')
+                          and x.endswith('$'))),
+    's': lambda x: is_number(x) and (x >= 0)
+}
+
+
+def get_validator(style):
+    for k, v in validators.items():
+        if style.endswith(k) and (len(style) != 1 or style == k):
+            return v
+
+
+def validate(style, value, vectorized=True):
     """
-    Checks if supplied object is a valid color spec.
+    Validates a style and associated value.
+
+    Arguments
+    ---------
+    style: str
+       The style to validate (e.g. 'color', 'size' or 'marker')
+    value:
+       The style value to validate
+    vectorized: bool
+       Whether validator should allow vectorized setting
+
+    Returns
+    -------
+    valid: boolean or None
+       If validation is supported returns boolean, otherwise None
     """
-    if not isinstance(color, basestring):
+    validator = get_validator(style)
+    if validator is None:
+        return None
+    if isinstance(value, (np.ndarray, list)) and vectorized:
+        return all(validator(v) for v in value)
+    try:
+        valid = validator(value)
+        return False if valid == False else True
+    except:
         return False
-    elif RGB_HEX_REGEX.match(color):
-        return True
-    elif color in COLOR_ALIASES:
-        return True
-    elif color in cnames:
-        return True
-    return False
 
 
 def categorize_colors(colors, categories=None):

From 0fe9f8ce126bb28fba129016e0477715525cea7b Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Tue, 20 Nov 2018 13:25:13 +0000
Subject: [PATCH 086/117] Fixed python2 issues

---
 holoviews/plotting/bokeh/util.py            | 4 ----
 holoviews/tests/plotting/bokeh/testutils.py | 7 ++++++-
 holoviews/util/transform.py                 | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/holoviews/plotting/bokeh/util.py b/holoviews/plotting/bokeh/util.py
index 199e8bf5e2..1002914afd 100644
--- a/holoviews/plotting/bokeh/util.py
+++ b/holoviews/plotting/bokeh/util.py
@@ -558,10 +558,6 @@ def glyph_order(keys, draw_order=[]):
     of glyph names while the keys should be glyph names with a custom
     suffix. The draw order may only match subset of the keys and any
     matched items will take precedence over other entries.
-
-    >>> glyph_order(['scatter_1', 'patch_1', 'rect_1'], \
-                    ['scatter', 'patch'])
-    ['scatter_1', 'patch_1', 'rect_1']
     """
     keys = sorted(keys)
     def order_fn(glyph):
diff --git a/holoviews/tests/plotting/bokeh/testutils.py b/holoviews/tests/plotting/bokeh/testutils.py
index 57f6bd53b3..b288ef3ce4 100644
--- a/holoviews/tests/plotting/bokeh/testutils.py
+++ b/holoviews/tests/plotting/bokeh/testutils.py
@@ -4,7 +4,7 @@
 from holoviews.element.comparison import ComparisonTestCase
 
 try:
-    from holoviews.plotting.bokeh.util import filter_batched_data
+    from holoviews.plotting.bokeh.util import filter_batched_data, glyph_order
     from holoviews.plotting.bokeh.styles import expand_batched_style
     bokeh_renderer = Store.renderers['bokeh']
 except:
@@ -78,3 +78,8 @@ def test_filter_batched_data_heterogeneous(self):
         filter_batched_data(data, mapping)
         self.assertEqual(data, {'line_color': ['red', 'red', 'blue']})
         self.assertEqual(mapping, {'line_color': {'field': 'line_color'}})
+
+    def test_glyph_order(self):
+        order = glyph_order(['scatter_1', 'patch_1', 'rect_1'],
+                            ['scatter', 'patch'])
+        self.assertEqual(order, ['scatter_1', 'patch_1', 'rect_1'])
diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index 3baef97101..05d69b585d 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import operator
 
 import numpy as np

From d7a4595dafceb8fd304ed541dc8f2dc3cf5a7ecd Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Tue, 20 Nov 2018 13:39:23 +0000
Subject: [PATCH 087/117] Fixed flakes

---
 holoviews/plotting/bokeh/element.py | 2 +-
 holoviews/plotting/mpl/element.py   | 2 +-
 holoviews/plotting/mpl/util.py      | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 042a129283..df2934b412 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -34,7 +34,7 @@
 from ..util import dynamic_update, process_cmap, color_intervals
 from .plot import BokehPlot, TOOLS
 from .styles import (
-    legend_dimensions, line_properties, markers, mpl_to_bokeh, rgba_tuple,
+    legend_dimensions, line_properties, mpl_to_bokeh, rgba_tuple,
     text_properties, validate
 )
 from .util import (
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 55a86188d5..556b407495 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -562,7 +562,7 @@ def _apply_transforms(self, element, ranges, style):
             group = groups[0] if groups else None
             prefix = '' if group is None else group+'_'
             if (k in (prefix+'c', prefix+'color') and isinstance(val, np.ndarray)
-                and not validate('color', c)):
+                and not validate('color', val)):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v, val, prefix)
                 if val.dtype.kind in 'OSUM':
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index c4fc2f62f7..91c1fa6dac 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -6,7 +6,6 @@
 import numpy as np
 import matplotlib
 from matplotlib import ticker
-from matplotlib.colors import cnames
 from matplotlib.lines import Line2D
 from matplotlib.markers import MarkerStyle
 from matplotlib.patches import Path, PathPatch
@@ -17,7 +16,6 @@
 )
 from ...core.util import LooseVersion, _getargspec, basestring, is_number
 from ...element import Raster, RGB, Polygons
-from ..util import COLOR_ALIASES, RGB_HEX_REGEX
 
 mpl_version = LooseVersion(matplotlib.__version__)
 

From 01fe7e0047fa52f97dcdfaf938e6bd7016f45e73 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Tue, 20 Nov 2018 14:01:27 +0000
Subject: [PATCH 088/117] Fixed bug in mpl validator

---
 holoviews/plotting/mpl/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index 91c1fa6dac..9ee7ff36f1 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -64,7 +64,7 @@ def validate(style, value, vectorized=True):
     if validator is None:
         return None
     if isinstance(value, (np.ndarray, list)) and vectorized:
-        return all(validator(v) for v in value)
+        return all(validate(style, v) for v in value)
     try:
         valid = validator(value)
         return False if valid == False else True

From 59017688eb29d9028de305d058b0fecb65ae5537 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Tue, 20 Nov 2018 15:34:20 +0000
Subject: [PATCH 089/117] Handle style transforms for ChordPlots

---
 .../gallery/demos/bokeh/route_chord.ipynb     |  3 +-
 .../demos/matplotlib/route_chord.ipynb        |  3 +-
 examples/reference/elements/bokeh/Chord.ipynb |  5 +-
 .../reference/elements/matplotlib/Chord.ipynb |  5 +-
 holoviews/plotting/bokeh/graphs.py            | 65 ++++++++++++++-----
 holoviews/plotting/bokeh/stats.py             |  6 +-
 holoviews/plotting/mpl/element.py             |  2 +-
 holoviews/plotting/mpl/graphs.py              | 49 ++++++++++----
 holoviews/plotting/mpl/util.py                | 20 +++++-
 9 files changed, 111 insertions(+), 47 deletions(-)

diff --git a/examples/gallery/demos/bokeh/route_chord.ipynb b/examples/gallery/demos/bokeh/route_chord.ipynb
index 5403747d33..7f06424fdb 100644
--- a/examples/gallery/demos/bokeh/route_chord.ipynb
+++ b/examples/gallery/demos/bokeh/route_chord.ipynb
@@ -57,8 +57,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Chord [edge_color_index='SourceID' label_index='City' color_index='AirportID' width=800 height=800]\n",
-    "%%opts Chord (cmap='Category20' edge_cmap='Category20')\n",
+    "%%opts Chord [labels='City' width=800 height=800] (edge_color=dim('SourceID').astype(str) node_color=dim('AirportID').astype(str) cmap='Category20')\n",
     "busiest_airports"
    ]
   }
diff --git a/examples/gallery/demos/matplotlib/route_chord.ipynb b/examples/gallery/demos/matplotlib/route_chord.ipynb
index 6d749c6166..2d7bb1872d 100644
--- a/examples/gallery/demos/matplotlib/route_chord.ipynb
+++ b/examples/gallery/demos/matplotlib/route_chord.ipynb
@@ -58,8 +58,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Chord [edge_color_index='SourceID' label_index='City' color_index='AirportID']\n",
-    "%%opts Chord (cmap='Category20' edge_cmap='Category20')\n",
+    "%%opts Chord [labels='City'] (edge_color=dim('SourceID').astype(str) node_color=dim('AirportID').astype(str) cmap='Category20')\n",
     "busiest_airports"
    ]
   }
diff --git a/examples/reference/elements/bokeh/Chord.ipynb b/examples/reference/elements/bokeh/Chord.ipynb
index 86d96df621..93e3285f45 100644
--- a/examples/reference/elements/bokeh/Chord.ipynb
+++ b/examples/reference/elements/bokeh/Chord.ipynb
@@ -89,7 +89,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Additionally we can now color the nodes and edges by their index and add some labels. The ``label_index``, ``color_index`` and ``edge_color_index`` allow specifying columns to color by."
+    "Additionally we can now color the nodes and edges by their index and add some labels. The ``labels``, ``node_color`` and ``edge_color`` options allow us to reference dimension values by name."
    ]
   },
   {
@@ -98,8 +98,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Chord [label_index='name' color_index='index' edge_color_index='source'] \n",
-    "%%opts Chord (cmap='Category20' edge_cmap='Category20')\n",
+    "%%opts Chord [labels='name'] (node_color='index' edge_color='source' cmap='Category20' edge_cmap='Category20')\n",
     "hv.Chord((links, nodes)).select(value=(5, None))"
    ]
   }
diff --git a/examples/reference/elements/matplotlib/Chord.ipynb b/examples/reference/elements/matplotlib/Chord.ipynb
index 3d470fbc00..b9625d443d 100644
--- a/examples/reference/elements/matplotlib/Chord.ipynb
+++ b/examples/reference/elements/matplotlib/Chord.ipynb
@@ -87,7 +87,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Additionally we can now color the nodes and edges by their index and add some labels. The ``label_index``, ``color_index`` and ``edge_color_index`` allow specifying columns to color by. "
+    "Additionally we can now color the nodes and edges by their index and add some labels. The ``labels``, ``node_color`` and ``edge_color`` options allow us to reference dimension values by name."
    ]
   },
   {
@@ -96,8 +96,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Chord [label_index='name' color_index='index' edge_color_index='source'] \n",
-    "%%opts Chord (cmap='Category20' edge_cmap='Category20')\n",
+    "%%opts Chord [labels='name'] (node_color='index' edge_color='source' cmap='Category20' edge_cmap='Category20')\n",
     "hv.Chord((links, nodes)).select(value=(5, None))"
    ]
   }
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 2246487abf..648ea1081d 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -11,6 +11,7 @@
 from ...core.util import (basestring, dimension_sanitizer, unique_array,
                           max_range)
 from ...core.options import Cycle
+from ...util.transform import dim
 from ..util import process_cmap
 from .chart import ColorbarPlot, PointPlot
 from .element import CompositeElementPlot, LegendPlot
@@ -46,9 +47,9 @@ class GraphPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
 
     style_opts = (['edge_'+p for p in fill_properties+line_properties] +
                   ['node_'+p for p in fill_properties+line_properties] +
-                  ['node_size', 'cmap', 'edge_cmap'])
+                  ['node_size', 'cmap', 'edge_cmap', 'node_cmap'])
 
-    _nonvectorized_styles =  ['cmap', 'edge_cmap']
+    _nonvectorized_styles =  ['cmap', 'edge_cmap', 'node_cmap']
 
     # Filled is only supported for subclasses
     filled = False
@@ -318,6 +319,9 @@ def _init_glyphs(self, plot, element, ranges, source):
 
 class ChordPlot(GraphPlot):
 
+    labels = param.ClassSelector(class_=(basestring, dim), doc="""
+        The dimension or dimension value transform used to draw labels from.""")
+
     show_frame = param.Boolean(default=False, doc="""
         Whether or not to show a complete frame around the plot.""")
 
@@ -342,15 +346,35 @@ def get_extents(self, element, ranges, range_type='combined'):
         xdim, ydim = element.nodes.kdims[:2]
         if range_type not in ('combined', 'data', 'extents'):
             return xdim.range[0], ydim.range[0], xdim.range[1], ydim.range[1]
-        rng = 1.1 if element.nodes.get_dimension(self.label_index) is None else 1.4
+        no_labels = (element.nodes.get_dimension(self.label_index) is None and
+                     self.labels is None)
+        rng = 1.1 if no_labels else 1.4
         x0, x1 = max_range([xdim.range, (-rng, rng)])
         y0, y1 = max_range([ydim.range, (-rng, rng)])
         return (x0, y0, x1, y1)
 
+    
+    def _init_glyphs(self, plot, element, ranges, source):
+        super(ChordPlot, self)._init_glyphs(plot, element, ranges, source)
+        # Ensure that arc glyph matches node style
+        if 'multi_line_2_glyph' in self.handles:
+            scatter_props = self.handles['scatter_1_glyph'].properties_with_values()
+            styles = {k.replace('fill', 'line'): v for k, v in scatter_props.items() if 'fill' in k}
+            arc_renderer = self.handles['multi_line_2_glyph_renderer']
+            scatter_renderer = self.handles['scatter_1_glyph_renderer']
+            arc_renderer.data_source = scatter_renderer.data_source
+            arc_renderer.view = scatter_renderer.view
+            self.handles['multi_line_2_glyph'].update(**styles)
+            self.handles['multi_line_2_source'] = scatter_renderer.data_source
+            
+
     def get_data(self, element, ranges, style):
         offset = style.pop('label_offset', 1.05)
         data, mapping, style = super(ChordPlot, self).get_data(element, ranges, style)
-        if 'node_fill_color' in mapping['scatter_1']:
+        node_color = style.get('node_color')
+        if ('node_fill_color' in mapping['scatter_1'] or
+            (isinstance(node_color, dim) and node_color.applies(element.nodes)) or
+            (isinstance(node_color, basestring) and node_color in elment.nodes)):
             angles = element._angles
             arcs = defaultdict(list)
             for i in range(len(element.nodes)):
@@ -362,17 +386,18 @@ def get_data(self, element, ranges, style):
             data['scatter_1'].update(arcs)
             data['multi_line_2'] = data['scatter_1']
             mapping['multi_line_2'] = {'xs': 'arc_xs', 'ys': 'arc_ys', 'line_width': 10}
-            mapping['multi_line_2']['line_color'] = mapping['scatter_1']['node_fill_color']
-            mapping['multi_line_2']['nonselection_line_color'] = mapping['scatter_1']['node_fill_color']
-            mapping['multi_line_2']['selection_line_color'] = mapping['scatter_1']['node_fill_color']
-
-        lidx = element.nodes.get_dimension(self.label_index)
-        if lidx is None:
-            if self.label_index is not None:
-                dims = element.nodes.dimensions()[2:]
-                self.warning("label_index supplied to Chord not found, "
-                             "expected one of %s, got %s." %
-                             (dims, self.label_index))
+
+        label_dim = element.get_dimension(self.label_index)
+        labels = self.labels
+        if label_dim and labels:
+            self.warning("Cannot declare style mapping for 'labels' option "
+                         "and declare a label_index; ignoring the label_index.")
+        elif label_dim:
+            labels = label_dim
+        elif isinstance(labels, basestring):
+            labels = element.nodes.get_dimension(labels)
+
+        if labels is None:
             return data, mapping, style
 
         nodes = element.nodes
@@ -383,9 +408,13 @@ def get_data(self, element, ranges, style):
                 nodes = list(np.unique([edges.dimension_values(i) for i in range(2)]))
                 nodes = element.nodes.select(**{element.nodes.kdims[2].name: nodes})
         xs, ys = (nodes.dimension_values(i)*offset for i in range(2))
-        labels = [lidx.pprint_value(v) for v in nodes.dimension_values(lidx)]
+        if isinstance(labels, dim):
+            text = labels.apply(element, flat=True)
+        else:
+            text = element.nodes.dimension_values(labels)
+            text = [labels.pprint_value(v) for v in text]
         angles = np.arctan2(ys, xs)
-        data['text_1'] = dict(x=xs, y=ys, text=[str(l) for l in labels], angle=angles)
+        data['text_1'] = dict(x=xs, y=ys, text=[str(l) for l in text], angle=angles)
         mapping['text_1'] = dict(text='text', x='x', y='y', angle='angle', text_baseline='middle')
         return data, mapping, style
 
@@ -408,7 +437,7 @@ class TriMeshPlot(GraphPlot):
 
     style_opts = (['edge_'+p for p in line_properties+fill_properties] +
                   ['node_'+p for p in fill_properties+line_properties] +
-                  ['node_size', 'cmap', 'edge_cmap'])
+                  ['node_size', 'cmap', 'edge_cmap', 'node_cmap'])
 
     # Declares that three columns in TriMesh refer to edges
     _node_columns = [0, 1, 2]
diff --git a/holoviews/plotting/bokeh/stats.py b/holoviews/plotting/bokeh/stats.py
index 19123a9e95..a318edaf92 100644
--- a/holoviews/plotting/bokeh/stats.py
+++ b/holoviews/plotting/bokeh/stats.py
@@ -80,9 +80,9 @@ class BoxWhiskerPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
     style_opts = (['whisker_'+p for p in line_properties] +
                   ['box_'+p for p in fill_properties+line_properties] +
                   ['outlier_'+p for p in fill_properties+line_properties] +
-                  ['width', 'box_width', 'cmap'])
+                  ['width', 'box_width', 'cmap', 'box_cmap'])
 
-    _nonvectorized_styles = ['box_width', 'width', 'cmap']
+    _nonvectorized_styles = ['box_width', 'width', 'cmap', 'box_cmap']
 
     _stream_data = False # Plot does not support streaming data
 
@@ -319,7 +319,7 @@ class ViolinPlot(BoxWhiskerPlot):
                   ['stats_'+p for p in line_properties] +
                   ['_'.join([glyph, p]) for p in ('color', 'alpha')
                    for glyph in ('box', 'violin', 'stats', 'median')] +
-                  ['cmap'])
+                  ['cmap', 'box_cmap', 'violin_cmap'])
 
     _stat_fns = [partial(np.percentile, q=q) for q in [25, 50, 75]]
 
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 556b407495..ce9492fb0f 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -797,7 +797,7 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
         opts[prefix+'vmin'] = clim[0]
         opts[prefix+'vmax'] = clim[1]
 
-        cmap = opts.get(prefix+'cmap', 'viridis')
+        cmap = opts.get(prefix+'cmap', opts.get('cmap', 'viridis'))
         if values.dtype.kind not in 'OSUM':
             ncolors = None
             if isinstance(self.color_levels, int):
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 80bd0be049..920e25696d 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -8,6 +8,7 @@
 from ...core.data import Dataset
 from ...core.options import Cycle, abbreviated_exception
 from ...core.util import basestring, unique_array, search_indices, max_range, is_number, isscalar
+from ...util.transform import dim
 from ..util import process_cmap
 from .element import ColorbarPlot
 
@@ -27,7 +28,7 @@ class GraphPlot(ColorbarPlot):
     style_opts = ['edge_alpha', 'edge_color', 'edge_linestyle', 'edge_linewidth',
                   'node_alpha', 'node_color', 'node_edgecolors', 'node_facecolors',
                   'node_linewidth', 'node_marker', 'node_size', 'visible', 'cmap',
-                  'edge_cmap']
+                  'edge_cmap', 'node_cmap']
 
     _style_groups = ['node', 'edge']
 
@@ -245,6 +246,11 @@ def get_data(self, element, ranges, style):
 
 class ChordPlot(GraphPlot):
 
+    labels = param.ClassSelector(class_=(basestring, dim), doc="""
+        The dimension or dimension value transform used to draw labels from.""")
+
+    # Deprecated options
+
     label_index = param.ClassSelector(default=None, class_=(basestring, int),
                                       allow_None=True, doc="""
       Index of the dimension from which the node labels will be drawn""")
@@ -260,7 +266,9 @@ def get_extents(self, element, ranges, range_type='combined'):
         xdim, ydim = element.nodes.kdims[:2]
         if range_type not in ('combined', 'data'):
             return xdim.range[0], ydim.range[0], xdim.range[1], ydim.range[1]
-        rng = 1.1 if element.nodes.get_dimension(self.label_index) is None else 1.4
+        no_labels = (element.nodes.get_dimension(self.label_index) is None and
+                     self.labels is None)
+        rng = 1.1 if no_labels else 1.4
         x0, x1 = max_range([xdim.range, (-rng, rng)])
         y0, y1 = max_range([ydim.range, (-rng, rng)])
         return (x0, y0, x1, y1)
@@ -268,7 +276,8 @@ def get_extents(self, element, ranges, range_type='combined'):
 
     def get_data(self, element, ranges, style):
         data, style, plot_kwargs = super(ChordPlot, self).get_data(element, ranges, style)
-        if isinstance(style.get('node_facecolors'), list):
+        node_color = style.get('node_c')
+        if isinstance(style.get('node_facecolors'), list) or isinstance(node_color, np.ndarray):
             angles = element._angles
             paths = []
             for i in range(len(element.nodes)):
@@ -276,17 +285,27 @@ def get_data(self, element, ranges, style):
                 vals = np.linspace(start, end, 20)
                 paths.append(np.column_stack([np.cos(vals), np.sin(vals)]))
             data['arcs'] = paths
-            style['arc_colors'] = style['node_facecolors']
+            if 'node_c' in style:
+                style['arc_array'] = node_color
+                style['arc_clim'] = style['node_vmin'], style['node_vmax']
+                style['arc_cmap'] = style['node_cmap']
+            else:
+                style['arc_colors'] = style['node_facecolors']
             style['arc_linewidth'] = 10
 
-        lidx = element.nodes.get_dimension(self.label_index)
-        if lidx is None:
-            if self.label_index is not None:
-                dims = element.nodes.dimensions()[2:]
-                self.warning("label_index supplied to Chord not found, "
-                             "expected one of %s, got %s." %
-                             (dims, self.label_index))
+        label_dim = element.get_dimension(self.label_index)
+        labels = self.labels
+        if label_dim and labels:
+            self.warning("Cannot declare style mapping for 'labels' option "
+                         "and declare a label_index; ignoring the label_index.")
+        elif label_dim:
+            labels = label_dim
+        elif isinstance(labels, basestring):
+            labels = element.nodes.get_dimension(labels)
+
+        if labels is None:
             return data, style, plot_kwargs
+
         nodes = element.nodes
         if element.vdims:
             values = element.dimension_values(element.vdims[0])
@@ -296,9 +315,13 @@ def get_data(self, element, ranges, style):
                 nodes = element.nodes.select(**{element.nodes.kdims[2].name: nodes})
         offset = style.get('label_offset', 1.05)
         xs, ys = (nodes.dimension_values(i)*offset for i in range(2))
-        labels = [lidx.pprint_value(v) for v in nodes.dimension_values(lidx)]
+        if isinstance(labels, dim):
+            text = labels.apply(element, flat=True)
+        else:
+            text = element.nodes.dimension_values(labels)
+            text = [labels.pprint_value(v) for v in text]
         angles = np.rad2deg(np.arctan2(ys, xs))
-        data['text'] = (xs, ys, labels, angles)
+        data['text'] = (xs, ys, text, angles)
         return data, style, plot_kwargs
 
 
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index 9ee7ff36f1..42e921d988 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -6,6 +6,7 @@
 import numpy as np
 import matplotlib
 from matplotlib import ticker
+from matplotlib.colors import cnames
 from matplotlib.lines import Line2D
 from matplotlib.markers import MarkerStyle
 from matplotlib.patches import Path, PathPatch
@@ -16,14 +17,29 @@
 )
 from ...core.util import LooseVersion, _getargspec, basestring, is_number
 from ...element import Raster, RGB, Polygons
+from ..util import COLOR_ALIASES, RGB_HEX_REGEX
 
 mpl_version = LooseVersion(matplotlib.__version__)
 
 
+def is_color(color):
+    """
+    Checks if supplied object is a valid color spec.
+    """
+    if not isinstance(color, basestring):
+        return False
+    elif RGB_HEX_REGEX.match(color):
+        return True
+    elif color in COLOR_ALIASES:
+        return True
+    elif color in cnames:
+        return True
+    return False
+
 validators = {
     'alpha': lambda x: is_number(x) and (0 <= x <= 1),
     'capstyle': validate_capstyle,
-    'color': validate_color,
+    'color': is_color,
     'fontsize': validate_fontsize,
     'fonttype': validate_fonttype,
     'hatch': validate_hatch,
@@ -64,7 +80,7 @@ def validate(style, value, vectorized=True):
     if validator is None:
         return None
     if isinstance(value, (np.ndarray, list)) and vectorized:
-        return all(validate(style, v) for v in value)
+        return all(validator(v) for v in value)
     try:
         valid = validator(value)
         return False if valid == False else True

From 7e0d7b3122c17153fc75084da564f3c8c39297b5 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 14:25:14 +0000
Subject: [PATCH 090/117] Use unique_array utility throughout

---
 holoviews/plotting/bokeh/element.py | 4 ++--
 holoviews/plotting/bokeh/graphs.py  | 2 +-
 holoviews/plotting/bokeh/path.py    | 2 +-
 holoviews/plotting/bokeh/sankey.py  | 4 ++--
 holoviews/plotting/mpl/element.py   | 6 +++---
 holoviews/plotting/mpl/path.py      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index df2934b412..4c7f4e5cd3 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -683,7 +683,7 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
             else:
                 val = v.apply(element, ranges=ranges, flat=True)
 
-            if len(np.unique(val)) == 1:
+            if len(util.unique_array(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
 
             if not np.isscalar(val):
@@ -724,7 +724,7 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
                 (numeric or not validate('color', val))):
                 kwargs = {}
                 if val.dtype.kind not in 'if':
-                    kwargs['factors'] = np.unique(val)
+                    kwargs['factors'] = util.unique_array(val)
                 cmapper = self._get_colormapper(v, element, ranges,
                                                 style, name=k+'_color_mapper',
                                                 group=group, **kwargs)
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 648ea1081d..f87b188f5b 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -405,7 +405,7 @@ def get_data(self, element, ranges, style):
             values = element.dimension_values(element.vdims[0])
             if values.dtype.kind in 'uif':
                 edges = Dataset(element)[values>0]
-                nodes = list(np.unique([edges.dimension_values(i) for i in range(2)]))
+                nodes = list(unique_array([edges.dimension_values(i) for i in range(2)]))
                 nodes = element.nodes.select(**{element.nodes.kdims[2].name: nodes})
         xs, ys = (nodes.dimension_values(i)*offset for i in range(2))
         if isinstance(labels, dim):
diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index 3428ee9268..b9c7d7b2c2 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -206,7 +206,7 @@ def get_data(self, element, ranges, style):
         else:
             values = element.dimension_values(cdim, expanded=False)
         data[dim_name] = values
-        factors = list(np.unique(values)) if values.dtype.kind in 'SUO' else None
+        factors = list(util.unique_array(values)) if values.dtype.kind in 'SUO' else None
         cmapper = self._get_colormapper(cdim, element, ranges, style, factors)
         mapping[self._color_style] = {'field': dim_name, 'transform': cmapper}
         self._get_hover_data(data, element)
diff --git a/holoviews/plotting/bokeh/sankey.py b/holoviews/plotting/bokeh/sankey.py
index ce4120177e..3cc8758adb 100644
--- a/holoviews/plotting/bokeh/sankey.py
+++ b/holoviews/plotting/bokeh/sankey.py
@@ -6,7 +6,7 @@
 from bokeh.models import Patches
 
 from ...core.data import Dataset
-from ...core.util import basestring, max_range, dimension_sanitizer
+from ...core.util import basestring, max_range, dimension_sanitizer, unique_array
 from .graphs import GraphPlot
 
 
@@ -94,7 +94,7 @@ def _compute_labels(self, element, data, mapping):
         lidx = element.nodes.get_dimension(self.label_index)
         if element.vdims:
             edges = Dataset(element)[element[element.vdims[0].name]>0]
-            nodes = list(np.unique([edges.dimension_values(i) for i in range(2)]))
+            nodes = list(unique_array([edges.dimension_values(i) for i in range(2)]))
             nodes = element.nodes.select(**{element.nodes.kdims[2].name: nodes})
         else:
             nodes = element
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index ce9492fb0f..2402affcde 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -541,7 +541,7 @@ def _apply_transforms(self, element, ranges, style):
             else:
                 val = v.apply(element, ranges)
 
-            if len(np.unique(val)) == 1:
+            if len(util.unique_array(val)) == 1:
                 val = val if np.isscalar(val) else val[0]
 
             if not np.isscalar(val) and k in self._nonvectorized_styles:
@@ -782,7 +782,7 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
                     clim = -np.abs(clim).max(), np.abs(clim).max()
                 categorical = False
             else:
-                clim = (0, len(np.unique(values))-1)
+                clim = (0, len(util.unique_array(values))-1)
                 categorical = True
         else:
             categorical = values.dtype.kind not in 'uif'
@@ -843,7 +843,7 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
 
         if not isinstance(cmap, mpl_colors.Colormap):
             if isinstance(cmap, dict):
-                factors = np.unique(values)
+                factors = util.unique_array(values)
                 palette = [cmap.get(f, colors.get('NaN', {'color': self._default_nan})['color'])
                            for f in factors]
             else:
diff --git a/holoviews/plotting/mpl/path.py b/holoviews/plotting/mpl/path.py
index 26c7dbc090..9ea09c807c 100644
--- a/holoviews/plotting/mpl/path.py
+++ b/holoviews/plotting/mpl/path.py
@@ -136,7 +136,7 @@ def get_data(self, element, ranges, style):
                                   for _ in range(len(sps))])
 
         if array.dtype.kind not in 'uif':
-            array = np.searchsorted(np.unique(array), array)
+            array = np.searchsorted(util.unique_array(array), array)
         style['array'] = array
         self._norm_kwargs(element, ranges, style, cdim)
         style['clim'] = style.pop('vmin'), style.pop('vmax')

From 895cb6558d05c87b9133f5b2370bfbd0cdd8fc4e Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 15:51:38 +0000
Subject: [PATCH 091/117] Added dim key lookup utility

---
 holoviews/plotting/bokeh/element.py | 10 ++--------
 holoviews/plotting/mpl/element.py   | 10 ++--------
 holoviews/plotting/util.py          | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 4c7f4e5cd3..89e5e89cd0 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -31,7 +31,7 @@
 from ...streams import Buffer
 from ...util.transform import dim
 from ..plot import GenericElementPlot, GenericOverlayPlot
-from ..util import dynamic_update, process_cmap, color_intervals
+from ..util import dynamic_update, process_cmap, color_intervals, dim_range_key
 from .plot import BokehPlot, TOOLS
 from .styles import (
     legend_dimensions, line_properties, mpl_to_bokeh, rgba_tuple,
@@ -1255,13 +1255,7 @@ def _get_colormapper(self, eldim, element, ranges, style, factors=None, colors=N
         # and then only updated
         if eldim is None and colors is None:
             return None
-
-        if isinstance(eldim, dim):
-            dim_name = repr(eldim)
-            if dim_name.startswith("'") and dim_name.endswith("'"):
-                dim_name = dim_name[1:-1]
-        else:
-            dim_name = eldim.name
+        dim_name = dim_range_key(eldim)
 
         # Attempt to find matching colormapper on the adjoined plot
         if self.adjoined:
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 2402affcde..d0a2b0561c 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -18,7 +18,7 @@
 from ...element import Graph
 from ...util.transform import dim
 from ..plot import GenericElementPlot, GenericOverlayPlot
-from ..util import dynamic_update, process_cmap, color_intervals
+from ..util import dynamic_update, process_cmap, color_intervals, dim_range_key
 from .plot import MPLPlot, mpl_rc_context
 from .util import categorize_colors, mpl_version, validate, wrap_formatter
 
@@ -731,13 +731,7 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
         Returns valid color normalization kwargs
         to be passed to matplotlib plot function.
         """
-        if isinstance(vdim, dim):
-            dim_name = repr(vdim)
-            if dim_name.startswith("'") and dim_name.endswith("'"):
-                dim_name = dim_name[1:-1]
-        else:
-            dim_name = vdim.name
-
+        dim_name = dim_range_key(vdim)
         if values is None:
             if isinstance(vdim, dim):
                 values = vdim.apply(element, flat=True)
diff --git a/holoviews/plotting/util.py b/holoviews/plotting/util.py
index aae0f50f42..14e7f059e0 100644
--- a/holoviews/plotting/util.py
+++ b/holoviews/plotting/util.py
@@ -17,6 +17,8 @@
 from ..core.util import (match_spec, wrap_tuple, basestring, get_overlay_spec,
                          unique_iterator, closest_match, is_number, isfinite)
 from ..streams import LinkedStream
+from ..util.transform import dim
+
 
 def displayable(obj):
     """
@@ -968,6 +970,19 @@ def rgb2hex(rgb):
     return "#{0:02x}{1:02x}{2:02x}".format(*(int(v*255) for v in rgb))
 
 
+def dim_range_key(eldim):
+    """
+    Returns the key to look up a dimension range.
+    """
+    if isinstance(eldim, dim):
+        dim_name = repr(eldim)
+        if dim_name.startswith("'") and dim_name.endswith("'"):
+            dim_name = dim_name[1:-1]
+    else:
+        dim_name = eldim.name
+    return dim_name
+
+
 def hex2rgb(hex):
   ''' "#FFFFFF" -> [255,255,255] '''
   # Pass 16 to the integer function for change of base

From 79990f556802348e33cb9e0f23437c8b8d1ad1f4 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 15:55:15 +0000
Subject: [PATCH 092/117] Fixed issue colormapping scalar styles

---
 holoviews/plotting/bokeh/element.py | 5 +++--
 holoviews/plotting/mpl/element.py   | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 89e5e89cd0..57b1e8c371 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -683,8 +683,9 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
             else:
                 val = v.apply(element, ranges=ranges, flat=True)
 
-            if len(util.unique_array(val)) == 1:
-                val = val if np.isscalar(val) else val[0]
+            if (not np.isscalar(val) and len(util.unique_array(val)) == 1 and
+                (not 'color' in k or validate('color', val))):
+                val = val[0]
 
             if not np.isscalar(val):
                 if k in self._nonvectorized_styles:
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index d0a2b0561c..c8918bfaec 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -541,10 +541,11 @@ def _apply_transforms(self, element, ranges, style):
             else:
                 val = v.apply(element, ranges)
 
-            if len(util.unique_array(val)) == 1:
-                val = val if np.isscalar(val) else val[0]
+            if (not np.isscalar(val) and len(util.unique_array(val)) == 1 and
+                (not 'color' in k or validate('color', val))):
+                val = val[0]
 
-            if not np.isscalar(val) and k in self._nonvectorized_styles:
+            if not np.isscalar(val) k in self._nonvectorized_styles:
                 element = type(element).__name__
                 raise ValueError('Mapping a dimension to the "{style}" '
                                  'style option is not supported by the '

From cc371f145148269dd2b22079aee13c867e39e4d8 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 15:56:20 +0000
Subject: [PATCH 093/117] Make normalization system compute factors

---
 holoviews/plotting/plot.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index 34d43f30cf..0fe7855418 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -20,7 +20,7 @@
 from ..core.overlay import NdOverlay
 from ..core.spaces import HoloMap, DynamicMap
 from ..core.util import stream_parameters, isfinite
-from ..element import Table
+from ..element import Table, Graph
 from ..util.transform import dim
 from .util import (get_dynamic_mode, initialize_unbounded, dim_axis_label,
                    attach_streams, traverse_setter, get_nested_streams,
@@ -455,7 +455,8 @@ def _compute_group_range(cls, group, elements, ranges):
                     continue
                 if isinstance(v, dim) and v.applies(el):
                     dim_name = repr(v)
-                    values = v.apply(el)
+                    values = v.apply(el, expanded=False)
+                    factors = None
                     if values.dtype.kind == 'M':
                         drange = values.min(), values.max()
                     elif util.isscalar(values):
@@ -468,12 +469,15 @@ def _compute_group_range(cls, group, elements, ranges):
                                 warnings.filterwarnings('ignore', r'All-NaN (slice|axis) encountered')
                                 drange = (np.nanmin(values), np.nanmax(values))
                         except:
-                            continue
+                            factors = util.unique_array(values)
                     if dim_name not in group_ranges:
                         group_ranges[dim_name] = {'data': [], 'hard': [], 'soft': []}
-                    group_ranges[dim_name]['data'].append(drange)
-                    group_ranges[dim_name]['hard'].append((None, None))
-                    group_ranges[dim_name]['soft'].append((None, None))
+                    if factors is not None:
+                        if 'factors' not in group_ranges[dim_name]:
+                            group_ranges[dim_name]['factors'] = []
+                        group_ranges[dim_name]['factors'].append(factors)
+                    else:
+                        group_ranges[dim_name]['data'].append(drange)
 
             # Compute dimension normalization
             for el_dim in el.dimensions('ranges'):
@@ -483,6 +487,17 @@ def _compute_group_range(cls, group, elements, ranges):
                 group_ranges[el_dim.name]['data'].append(data_range)
                 group_ranges[el_dim.name]['hard'].append(el_dim.range)
                 group_ranges[el_dim.name]['soft'].append(el_dim.soft_range)
+                if any(isinstance(r, util.basestring) for r in data_range):
+                    if 'factors' not in group_ranges[el_dim.name]:
+                        group_ranges[el_dim.name]['factors'] = []
+                    if el_dim.values not in ([], None):
+                        values = el_dim.values
+                    elif el_dim in el:
+                        values = el.dimension_values(el_dim, expanded=False)
+                    elif isinstance(el, Graph) and el_dim in el.nodes:
+                        values = el.nodes.dimension_values(el_dim, expanded=False)
+                    factors = util.unique_array(values)
+                    group_ranges[el_dim.name]['factors'].append(factors)
 
         dim_ranges = []
         for gdim, values in group_ranges.items():
@@ -493,6 +508,10 @@ def _compute_group_range(cls, group, elements, ranges):
                                             hard_range, soft_range)
             dranges = {'data': data_range, 'hard': hard_range,
                        'soft': soft_range, 'combined': combined}
+            if 'factors' in values:
+                factors = util.unique_array([
+                    v for factors in values['factors'] for v in factors])
+                dranges['factors'] = factors
             dim_ranges.append((gdim, dranges))
         ranges[group] = OrderedDict(dim_ranges)
 

From f2053e51980eab2c6bb453b56b8ff961763c446b Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 15:58:20 +0000
Subject: [PATCH 094/117] Fixes for drawing Chord arcs

---
 holoviews/plotting/bokeh/graphs.py | 33 ++++++++++-----------
 holoviews/plotting/bokeh/sankey.py |  2 +-
 holoviews/plotting/mpl/graphs.py   | 47 +++++++++++++++++-------------
 3 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index f87b188f5b..99ebe2aeb5 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -366,28 +366,25 @@ def _init_glyphs(self, plot, element, ranges, source):
             arc_renderer.view = scatter_renderer.view
             self.handles['multi_line_2_glyph'].update(**styles)
             self.handles['multi_line_2_source'] = scatter_renderer.data_source
-            
+
 
     def get_data(self, element, ranges, style):
         offset = style.pop('label_offset', 1.05)
         data, mapping, style = super(ChordPlot, self).get_data(element, ranges, style)
         node_color = style.get('node_color')
-        if ('node_fill_color' in mapping['scatter_1'] or
-            (isinstance(node_color, dim) and node_color.applies(element.nodes)) or
-            (isinstance(node_color, basestring) and node_color in elment.nodes)):
-            angles = element._angles
-            arcs = defaultdict(list)
-            for i in range(len(element.nodes)):
-                start, end = angles[i:i+2]
-                vals = np.linspace(start, end, 20)
-                xs, ys = np.cos(vals), np.sin(vals)
-                arcs['arc_xs'].append(xs)
-                arcs['arc_ys'].append(ys)
-            data['scatter_1'].update(arcs)
-            data['multi_line_2'] = data['scatter_1']
-            mapping['multi_line_2'] = {'xs': 'arc_xs', 'ys': 'arc_ys', 'line_width': 10}
-
-        label_dim = element.get_dimension(self.label_index)
+        angles = element._angles
+        arcs = defaultdict(list)
+        for i in range(len(element.nodes)):
+            start, end = angles[i:i+2]
+            vals = np.linspace(start, end, 20)
+            xs, ys = np.cos(vals), np.sin(vals)
+            arcs['arc_xs'].append(xs)
+            arcs['arc_ys'].append(ys)
+        data['scatter_1'].update(arcs)
+        data['multi_line_2'] = data['scatter_1']
+        mapping['multi_line_2'] = {'xs': 'arc_xs', 'ys': 'arc_ys', 'line_width': 10}
+
+        label_dim = element.nodes.get_dimension(self.label_index)
         labels = self.labels
         if label_dim and labels:
             self.warning("Cannot declare style mapping for 'labels' option "
@@ -405,7 +402,7 @@ def get_data(self, element, ranges, style):
             values = element.dimension_values(element.vdims[0])
             if values.dtype.kind in 'uif':
                 edges = Dataset(element)[values>0]
-                nodes = list(unique_array([edges.dimension_values(i) for i in range(2)]))
+                nodes = list(np.unique([edges.dimension_values(i) for i in range(2)]))
                 nodes = element.nodes.select(**{element.nodes.kdims[2].name: nodes})
         xs, ys = (nodes.dimension_values(i)*offset for i in range(2))
         if isinstance(labels, dim):
diff --git a/holoviews/plotting/bokeh/sankey.py b/holoviews/plotting/bokeh/sankey.py
index 3cc8758adb..7b7a1fdf41 100644
--- a/holoviews/plotting/bokeh/sankey.py
+++ b/holoviews/plotting/bokeh/sankey.py
@@ -94,7 +94,7 @@ def _compute_labels(self, element, data, mapping):
         lidx = element.nodes.get_dimension(self.label_index)
         if element.vdims:
             edges = Dataset(element)[element[element.vdims[0].name]>0]
-            nodes = list(unique_array([edges.dimension_values(i) for i in range(2)]))
+            nodes = list(np.unique([edges.dimension_values(i) for i in range(2)]))
             nodes = element.nodes.select(**{element.nodes.kdims[2].name: nodes})
         else:
             nodes = element
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 920e25696d..2f5bc2ff90 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -277,30 +277,29 @@ def get_extents(self, element, ranges, range_type='combined'):
     def get_data(self, element, ranges, style):
         data, style, plot_kwargs = super(ChordPlot, self).get_data(element, ranges, style)
         node_color = style.get('node_c')
-        if isinstance(style.get('node_facecolors'), list) or isinstance(node_color, np.ndarray):
-            angles = element._angles
-            paths = []
-            for i in range(len(element.nodes)):
-                start, end = angles[i:i+2]
-                vals = np.linspace(start, end, 20)
-                paths.append(np.column_stack([np.cos(vals), np.sin(vals)]))
-            data['arcs'] = paths
-            if 'node_c' in style:
-                style['arc_array'] = node_color
-                style['arc_clim'] = style['node_vmin'], style['node_vmax']
-                style['arc_cmap'] = style['node_cmap']
-            else:
-                style['arc_colors'] = style['node_facecolors']
-            style['arc_linewidth'] = 10
-
-        label_dim = element.get_dimension(self.label_index)
+        angles = element._angles
+        paths = []
+        for i in range(len(element.nodes)):
+            start, end = angles[i:i+2]
+            vals = np.linspace(start, end, 20)
+            paths.append(np.column_stack([np.cos(vals), np.sin(vals)]))
+        data['arcs'] = paths
+        if 'node_c' in style:
+            style['arc_array'] = style['node_c']
+            style['arc_clim'] = style['node_vmin'], style['node_vmax']
+            style['arc_cmap'] = style['node_cmap']
+        elif 'node_facecolors' in style:
+            style['arc_colors'] = style['node_facecolors']
+        style['arc_linewidth'] = 10
+
+        label_dim = element.nodes.get_dimension(self.label_index)
         labels = self.labels
         if label_dim and labels:
             self.warning("Cannot declare style mapping for 'labels' option "
                          "and declare a label_index; ignoring the label_index.")
         elif label_dim:
             labels = label_dim
-        elif isinstance(labels, basestring):
+        if isinstance(labels, basestring):
             labels = element.nodes.get_dimension(labels)
 
         if labels is None:
@@ -356,7 +355,16 @@ def _update_arcs(self, element, data, style):
         paths = data['arcs']
         edges.set_paths(paths)
         edges.set_visible(style.get('visible', True))
-
+        if 'arc_array' in style:
+            edges.set_array(style['arc_array'])
+        if 'arc_clim' in style:
+            edges.set_clim(style['arc_clim'])
+        if 'arc_norm' in style:
+            edges.set_norm(style['arc_norm'])
+        if 'arc_colors' in style:
+            edges.set_edgecolors(style['arc_colors'])
+        elif 'arc_edgecolors' in style:
+            edges.set_edgecolors(style['arc_edgecolors'])
 
     def _update_labels(self, ax, element, data, style):
         labels = self.handles.get('labels', [])
@@ -377,7 +385,6 @@ def _update_labels(self, ax, element, data, style):
             labels.append(label)
         self.handles['labels'] = labels
 
-
     def update_handles(self, key, axis, element, ranges, style):
         data, style, axis_kwargs = self.get_data(element, ranges, style)
         self._update_nodes(element, data, style)

From 9dfce9bcb8486f595b1107138cc48a0be60cf7e6 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 16:10:09 +0000
Subject: [PATCH 095/117] Fixed syntax error

---
 holoviews/plotting/mpl/element.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index c8918bfaec..951b185087 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -545,7 +545,7 @@ def _apply_transforms(self, element, ranges, style):
                 (not 'color' in k or validate('color', val))):
                 val = val[0]
 
-            if not np.isscalar(val) k in self._nonvectorized_styles:
+            if not np.isscalar(val) and k in self._nonvectorized_styles:
                 element = type(element).__name__
                 raise ValueError('Mapping a dimension to the "{style}" '
                                  'style option is not supported by the '

From 785c40a58985f6e9d40f092011914082e36c5f9e Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 16:26:56 +0000
Subject: [PATCH 096/117] Fixed factor sorting issues

---
 holoviews/plotting/bokeh/element.py           | 22 ++++++++++++++-----
 holoviews/plotting/bokeh/path.py              |  5 ++++-
 holoviews/plotting/mpl/chart.py               |  4 ++--
 holoviews/plotting/mpl/element.py             |  9 ++++++--
 holoviews/plotting/mpl/path.py                |  2 +-
 holoviews/plotting/mpl/util.py                | 11 ----------
 .../tests/plotting/bokeh/testpathplot.py      |  4 ++--
 .../plotting/matplotlib/testgraphplot.py      |  4 ++--
 .../tests/plotting/matplotlib/testpathplot.py |  6 ++---
 9 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 57b1e8c371..8a73638ffc 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -724,8 +724,13 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
             if ('color' in k and isinstance(val, np.ndarray) and
                 (numeric or not validate('color', val))):
                 kwargs = {}
-                if val.dtype.kind not in 'if':
-                    kwargs['factors'] = util.unique_array(val)
+                if val.dtype.kind not in 'ifMu':
+                    range_key = dim_range_key(v)
+                    if range_key in ranges and 'factors' in ranges[range_key]:
+                        factors = ranges[range_key]['factors']
+                    else:
+                        factors = util.unique_array(val)
+                    kwargs['factors'] = factors
                 cmapper = self._get_colormapper(v, element, ranges,
                                                 style, name=k+'_color_mapper',
                                                 group=group, **kwargs)
@@ -1347,19 +1352,24 @@ def _get_color_data(self, element, ranges, style, name='color', factors=None, co
         cdata = element.dimension_values(cdim)
         field = util.dimension_sanitizer(cdim.name)
         dtypes = 'iOSU' if int_categories else 'OSU'
+
         if factors is None and (isinstance(cdata, list) or cdata.dtype.kind in dtypes):
-            factors = list(util.unique_array(cdata))
-        if factors and int_categories and cdata.dtype.kind == 'i':
+            range_key = dim_range_key(cdim)
+            if range_key in ranges and 'factors' in ranges[range_key]:
+                factors = ranges[range_key]['factors']
+            else:
+                factors = util.unique_array(cdata)
+        if factors is not None and int_categories and cdata.dtype.kind == 'i':
             field += '_str__'
             cdata = [str(f) for f in cdata]
             factors = [str(f) for f in factors]
 
         mapper = self._get_colormapper(cdim, element, ranges, style,
                                        factors, colors)
-        if not factors and isinstance(mapper, CategoricalColorMapper):
+        if factors is None and isinstance(mapper, CategoricalColorMapper):
             field += '_str__'
             cdata = [cdim.pprint_value(c) for c in cdata]
-            factors = mapper.factors
+            factors = True
 
         data[field] = cdata
         if factors is not None and self.show_legend:
diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index b9c7d7b2c2..88fa47ec7f 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -206,7 +206,10 @@ def get_data(self, element, ranges, style):
         else:
             values = element.dimension_values(cdim, expanded=False)
         data[dim_name] = values
-        factors = list(util.unique_array(values)) if values.dtype.kind in 'SUO' else None
+        if cdim.name in ranges and 'factors' in ranges[cdim.name]:
+            factors = ranges[cdim.name]['factors']
+        else:
+            factors = util.unique_array(values) if values.dtype.kind in 'SUO' else None
         cmapper = self._get_colormapper(cdim, element, ranges, style, factors)
         mapping[self._color_style] = {'field': dim_name, 'transform': cmapper}
         self._get_hover_data(data, element)
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index 065c376c12..9224b9270f 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -24,7 +24,7 @@
 from .element import ElementPlot, ColorbarPlot, LegendPlot
 from .path  import PathPlot
 from .plot import AdjoinedPlot, mpl_rc_context
-from .util import categorize_colors, mpl_version
+from .util import mpl_version
 
 
 
@@ -631,7 +631,7 @@ def _compute_styles(self, element, ranges, style):
             if cs.dtype.kind in 'uif':
                 style['c'] = cs
             else:
-                style['c'] = categorize_colors(cs)
+                style['c'] = util.search_indices(cs, util.unique_array(array))
             self._norm_kwargs(element, ranges, style, cdim)
         elif color is not None:
             style['color'] = color
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index 951b185087..c8ec4a2f1d 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -20,7 +20,7 @@
 from ..plot import GenericElementPlot, GenericOverlayPlot
 from ..util import dynamic_update, process_cmap, color_intervals, dim_range_key
 from .plot import MPLPlot, mpl_rc_context
-from .util import categorize_colors, mpl_version, validate, wrap_formatter
+from .util import mpl_version, validate, wrap_formatter
 
 
 class ElementPlot(GenericElementPlot, MPLPlot):
@@ -567,7 +567,12 @@ def _apply_transforms(self, element, ranges, style):
                 new_style.pop(k)
                 self._norm_kwargs(element, ranges, new_style, v, val, prefix)
                 if val.dtype.kind in 'OSUM':
-                    val = categorize_colors(val)
+                    range_key = dim_range_key(v)
+                    if range_key in ranges and 'factors' in ranges[range_key]:
+                        factors = ranges[range_key]['factors']
+                    else:
+                        factors = util.unique_array(val)
+                    val = util.search_indices(val, factors)
                 k = prefix+'c'
 
             new_style[k] = val
diff --git a/holoviews/plotting/mpl/path.py b/holoviews/plotting/mpl/path.py
index 9ea09c807c..c7c04faef0 100644
--- a/holoviews/plotting/mpl/path.py
+++ b/holoviews/plotting/mpl/path.py
@@ -136,7 +136,7 @@ def get_data(self, element, ranges, style):
                                   for _ in range(len(sps))])
 
         if array.dtype.kind not in 'uif':
-            array = np.searchsorted(util.unique_array(array), array)
+            array = util.search_indices(array, util.unique_array(array))
         style['array'] = array
         self._norm_kwargs(element, ranges, style, cdim)
         style['clim'] = style.pop('vmin'), style.pop('vmax')
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index 42e921d988..8f6fa6b962 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -88,17 +88,6 @@ def validate(style, value, vectorized=True):
         return False
 
 
-def categorize_colors(colors, categories=None):
-    """
-    Takes a list of categorical values and turns them into integers
-    which can be colormapped.
-    """
-    categories = np.unique(colors) if categories is None else categories
-    sorted_colors = np.argsort(categories)
-    positions = np.searchsorted(categories, colors)
-    return sorted_colors[positions]
-
-
 def wrap_formatter(formatter):
     """
     Wraps formatting function or string in
diff --git a/holoviews/tests/plotting/bokeh/testpathplot.py b/holoviews/tests/plotting/bokeh/testpathplot.py
index 284d7f186e..a26b79e78d 100644
--- a/holoviews/tests/plotting/bokeh/testpathplot.py
+++ b/holoviews/tests/plotting/bokeh/testpathplot.py
@@ -241,7 +241,7 @@ def test_polygons_categorical_color_op(self):
         self.assertEqual(glyph.fill_color, {'field': 'color', 'transform': cmapper})
         self.assertEqual(cds.data['color'], np.array(['b', 'a']))
         self.assertIsInstance(cmapper, CategoricalColorMapper)
-        self.assertEqual(cmapper.factors, ['a', 'b'])
+        self.assertEqual(cmapper.factors, ['b', 'a'])
 
     def test_polygons_alpha_op(self):
         polygons = Polygons([
@@ -316,7 +316,7 @@ def test_contours_categorical_color_op(self):
         self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
         self.assertEqual(cds.data['color'], np.array(['b', 'a']))
         self.assertIsInstance(cmapper, CategoricalColorMapper)
-        self.assertEqual(cmapper.factors, ['a', 'b'])
+        self.assertEqual(cmapper.factors, ['b', 'a'])
 
     def test_contours_alpha_op(self):
         contours = Contours([
diff --git a/holoviews/tests/plotting/matplotlib/testgraphplot.py b/holoviews/tests/plotting/matplotlib/testgraphplot.py
index 9ccf914e93..ec058a3f87 100644
--- a/holoviews/tests/plotting/matplotlib/testgraphplot.py
+++ b/holoviews/tests/plotting/matplotlib/testgraphplot.py
@@ -260,7 +260,7 @@ def test_graph_op_edge_color_categorical(self):
         graph = Graph(edges, vdims='color').options(edge_color='color')
         plot = mpl_renderer.get_plot(graph)
         edges = plot.handles['edges']
-        self.assertEqual(edges.get_array(), np.array([2, 1, 0]))
+        self.assertEqual(edges.get_array(), np.array([0, 1, 2]))
         self.assertEqual(edges.get_clim(), (0, 2))
 
     def test_graph_op_edge_alpha(self):
@@ -372,7 +372,7 @@ def test_trimesh_op_node_color_categorical(self):
         trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(node_color='color')
         plot = mpl_renderer.get_plot(trimesh)
         artist = plot.handles['nodes']
-        self.assertEqual(artist.get_array(), np.array([1, 2, 0, 1]))
+        self.assertEqual(artist.get_array(), np.array([0, 1, 2, 0]))
         self.assertEqual(artist.get_clim(), (0, 2))
 
     def test_trimesh_op_node_size(self):
diff --git a/holoviews/tests/plotting/matplotlib/testpathplot.py b/holoviews/tests/plotting/matplotlib/testpathplot.py
index eef5bedadb..349e9eccc4 100644
--- a/holoviews/tests/plotting/matplotlib/testpathplot.py
+++ b/holoviews/tests/plotting/matplotlib/testpathplot.py
@@ -125,7 +125,7 @@ def test_polygons_categorical_color_op(self):
         ], vdims='color').options(color='color')
         plot = mpl_renderer.get_plot(polygons)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([1, 0]))
+        self.assertEqual(artist.get_array(), np.array([0, 1]))
         self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_polygons_alpha_op(self):
@@ -155,7 +155,7 @@ def test_contours_categorical_color(self):
                     vdims='z').opts(plot=dict(color_index='z'))
         plot = mpl_renderer.get_plot(path)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([1, 0, 1]))
+        self.assertEqual(artist.get_array(), np.array([0, 1, 0]))
         self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_contours_color_op(self):
@@ -226,7 +226,7 @@ def test_contours_categorical_color_op(self):
         ], vdims='color').options(color='color')
         plot = mpl_renderer.get_plot(contours)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([1, 0]))
+        self.assertEqual(artist.get_array(), np.array([0, 1]))
         self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_contours_alpha_op(self):

From 0680782c6a1a5ddef81f32e83afcd5076863321d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 17:17:15 +0000
Subject: [PATCH 097/117] Fixed colorbars on PathPlot

---
 holoviews/plotting/bokeh/path.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/holoviews/plotting/bokeh/path.py b/holoviews/plotting/bokeh/path.py
index 88fa47ec7f..a1671460c4 100644
--- a/holoviews/plotting/bokeh/path.py
+++ b/holoviews/plotting/bokeh/path.py
@@ -230,8 +230,11 @@ def _init_glyph(self, plot, mapping, properties):
         elif plot_method is None:
             plot_method = self._plot_methods.get('single')
         renderer = getattr(plot, plot_method)(**data)
-        if self.colorbar and 'color_mapper' in self.handles:
-            self._draw_colorbar(plot, self.handles['color_mapper'])
+        if self.colorbar:
+            for k, v in list(self.handles.items()):
+                if not k.endswith('color_mapper'):
+                    continue
+                self._draw_colorbar(plot, v, k[:-12])
         return renderer, renderer.glyph
 
 

From acd5f6fe549ffd13e6106fc392a561315590d983 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 17:21:12 +0000
Subject: [PATCH 098/117] Fixed flakes

---
 holoviews/plotting/bokeh/graphs.py | 1 -
 holoviews/plotting/bokeh/sankey.py | 2 +-
 holoviews/plotting/mpl/chart.py    | 5 +++--
 holoviews/plotting/mpl/graphs.py   | 1 -
 holoviews/plotting/mpl/util.py     | 5 ++---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 99ebe2aeb5..1ee5ec7609 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -371,7 +371,6 @@ def _init_glyphs(self, plot, element, ranges, source):
     def get_data(self, element, ranges, style):
         offset = style.pop('label_offset', 1.05)
         data, mapping, style = super(ChordPlot, self).get_data(element, ranges, style)
-        node_color = style.get('node_color')
         angles = element._angles
         arcs = defaultdict(list)
         for i in range(len(element.nodes)):
diff --git a/holoviews/plotting/bokeh/sankey.py b/holoviews/plotting/bokeh/sankey.py
index 7b7a1fdf41..ce4120177e 100644
--- a/holoviews/plotting/bokeh/sankey.py
+++ b/holoviews/plotting/bokeh/sankey.py
@@ -6,7 +6,7 @@
 from bokeh.models import Patches
 
 from ...core.data import Dataset
-from ...core.util import basestring, max_range, dimension_sanitizer, unique_array
+from ...core.util import basestring, max_range, dimension_sanitizer
 from .graphs import GraphPlot
 
 
diff --git a/holoviews/plotting/mpl/chart.py b/holoviews/plotting/mpl/chart.py
index 9224b9270f..35c9857b3d 100644
--- a/holoviews/plotting/mpl/chart.py
+++ b/holoviews/plotting/mpl/chart.py
@@ -14,7 +14,8 @@
 from ...core.options import Store, abbreviated_exception
 from ...core.util import (
     OrderedDict, match_spec, unique_iterator, basestring, max_range,
-    isfinite, datetime_types, dt_to_int, dt64_to_dt
+    isfinite, datetime_types, dt_to_int, dt64_to_dt, search_indices,
+    unique_array
 )
 from ...element import Raster, HeatMap
 from ...operation import interpolate_curve
@@ -631,7 +632,7 @@ def _compute_styles(self, element, ranges, style):
             if cs.dtype.kind in 'uif':
                 style['c'] = cs
             else:
-                style['c'] = util.search_indices(cs, util.unique_array(array))
+                style['c'] = search_indices(cs, unique_array(cs))
             self._norm_kwargs(element, ranges, style, cdim)
         elif color is not None:
             style['color'] = color
diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index 2f5bc2ff90..d146125bed 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -276,7 +276,6 @@ def get_extents(self, element, ranges, range_type='combined'):
 
     def get_data(self, element, ranges, style):
         data, style, plot_kwargs = super(ChordPlot, self).get_data(element, ranges, style)
-        node_color = style.get('node_c')
         angles = element._angles
         paths = []
         for i in range(len(element.nodes)):
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index 8f6fa6b962..dc785a20dc 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -12,9 +12,8 @@
 from matplotlib.patches import Path, PathPatch
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 from matplotlib.rcsetup import (
-    validate_capstyle, validate_color, validate_fontsize, validate_fonttype,
-    validate_hatch, validate_joinstyle
-)
+    validate_capstyle, validate_fontsize, validate_fonttype, validate_hatch,
+    validate_joinstyle)
 from ...core.util import LooseVersion, _getargspec, basestring, is_number
 from ...element import Raster, RGB, Polygons
 from ..util import COLOR_ALIASES, RGB_HEX_REGEX

From 9fb6db8f3fe633d0c2b80071ffb36b1a84ae04ad Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 18:15:24 +0000
Subject: [PATCH 099/117] Fixed color handling for Graphs

---
 examples/reference/elements/bokeh/Chord.ipynb |  2 +-
 .../reference/elements/matplotlib/Chord.ipynb |  2 +-
 holoviews/plotting/bokeh/graphs.py            |  5 +-
 holoviews/plotting/mpl/element.py             |  7 +-
 holoviews/plotting/plot.py                    |  8 +-
 .../tests/plotting/bokeh/testgraphplot.py     | 35 +++++++
 .../plotting/matplotlib/testgraphplot.py      | 87 ++++++++++++++++++
 holoviews/util/transform.py                   | 92 ++++++++++++-------
 8 files changed, 198 insertions(+), 40 deletions(-)

diff --git a/examples/reference/elements/bokeh/Chord.ipynb b/examples/reference/elements/bokeh/Chord.ipynb
index 93e3285f45..07db4dd5d4 100644
--- a/examples/reference/elements/bokeh/Chord.ipynb
+++ b/examples/reference/elements/bokeh/Chord.ipynb
@@ -98,7 +98,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Chord [labels='name'] (node_color='index' edge_color='source' cmap='Category20' edge_cmap='Category20')\n",
+    "%%opts Chord [labels='name'] (node_color=dim('index').astype(str) edge_color=dim('source').astype(str) cmap='Category20' edge_cmap='Category20')\n",
     "hv.Chord((links, nodes)).select(value=(5, None))"
    ]
   }
diff --git a/examples/reference/elements/matplotlib/Chord.ipynb b/examples/reference/elements/matplotlib/Chord.ipynb
index b9625d443d..aa3924ff61 100644
--- a/examples/reference/elements/matplotlib/Chord.ipynb
+++ b/examples/reference/elements/matplotlib/Chord.ipynb
@@ -96,7 +96,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Chord [labels='name'] (node_color='index' edge_color='source' cmap='Category20' edge_cmap='Category20')\n",
+    "%%opts Chord [labels='name'] (node_color=dim('index').astype(str) edge_color=dim('source').astype(str) cmap='Category20' edge_cmap='Category20')\n",
     "hv.Chord((links, nodes)).select(value=(5, None))"
    ]
   }
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 1ee5ec7609..8296eea8cb 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -81,6 +81,7 @@ def _hover_opts(self, element):
             dims = []
         return dims, {}
 
+
     def get_extents(self, element, ranges, range_type='combined'):
         return super(GraphPlot, self).get_extents(element.nodes, ranges, range_type)
 
@@ -330,7 +331,7 @@ class ChordPlot(GraphPlot):
     label_index = param.ClassSelector(default=None, class_=(basestring, int),
                                       allow_None=True, doc="""
       Index of the dimension from which the node labels will be drawn""")
-    
+
     # Map each glyph to a style group
     _style_groups = {'scatter': 'node', 'multi_line': 'edge', 'text': 'label',
                      'arc': 'arc'}
@@ -353,7 +354,7 @@ def get_extents(self, element, ranges, range_type='combined'):
         y0, y1 = max_range([ydim.range, (-rng, rng)])
         return (x0, y0, x1, y1)
 
-    
+
     def _init_glyphs(self, plot, element, ranges, source):
         super(ChordPlot, self)._init_glyphs(plot, element, ranges, source)
         # Ensure that arc glyph matches node style
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index c8ec4a2f1d..c6e216a6b2 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -782,7 +782,12 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
                     clim = -np.abs(clim).max(), np.abs(clim).max()
                 categorical = False
             else:
-                clim = (0, len(util.unique_array(values))-1)
+                range_key = dim_range_key(vdim)
+                if range_key in ranges and 'factors' in ranges[range_key]:
+                    factors = ranges[range_key]['factors']
+                else:
+                    factors = util.unique_array(values)
+                clim = (0, len(factors)-1)
                 categorical = True
         else:
             categorical = values.dtype.kind not in 'uif'
diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index 0fe7855418..c8c8fbf452 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -455,7 +455,7 @@ def _compute_group_range(cls, group, elements, ranges):
                     continue
                 if isinstance(v, dim) and v.applies(el):
                     dim_name = repr(v)
-                    values = v.apply(el, expanded=False)
+                    values = v.apply(el, expanded=False, all_values=True)
                     factors = None
                     if values.dtype.kind == 'M':
                         drange = values.min(), values.max()
@@ -493,7 +493,11 @@ def _compute_group_range(cls, group, elements, ranges):
                     if el_dim.values not in ([], None):
                         values = el_dim.values
                     elif el_dim in el:
-                        values = el.dimension_values(el_dim, expanded=False)
+                        if isinstance(el, Graph) and el_dim in el.kdims[:2]:
+                            # Graph start/end normalization should include all node indices
+                            values = el.nodes.dimension_values(2, expanded=False)
+                        else:
+                            values = el.dimension_values(el_dim, expanded=False)
                     elif isinstance(el, Graph) and el_dim in el.nodes:
                         values = el.nodes.dimension_values(el_dim, expanded=False)
                     factors = util.unique_array(values)
diff --git a/holoviews/tests/plotting/bokeh/testgraphplot.py b/holoviews/tests/plotting/bokeh/testgraphplot.py
index 4048ea02e1..719ce45cee 100644
--- a/holoviews/tests/plotting/bokeh/testgraphplot.py
+++ b/holoviews/tests/plotting/bokeh/testgraphplot.py
@@ -3,6 +3,7 @@
 import numpy as np
 from holoviews.core.data import Dataset
 from holoviews.element import Graph, Nodes, TriMesh, Chord, circular_layout
+from holoviews.util.transform import dim
 
 try:
     from bokeh.models import (NodesAndLinkedEdges, EdgesAndLinkedNodes, Patches)
@@ -491,6 +492,12 @@ def test_chord_nodes_label_text(self):
         source = plot.handles['text_1_source']
         self.assertEqual(source.data['text'], ['A', 'B', 'C'])
 
+    def test_chord_nodes_labels_mapping(self):
+        g = self.chord.opts(plot=dict(labels='Label'))
+        plot = bokeh_renderer.get_plot(g)
+        source = plot.handles['text_1_source']
+        self.assertEqual(source.data['text'], ['A', 'B', 'C'])
+
     def test_chord_nodes_categorically_colormapped(self):
         g = self.chord.opts(plot=dict(color_index='Label', label_index='Label'),
                             style=dict(cmap=['#FFFFFF', '#888888', '#000000']))
@@ -506,6 +513,23 @@ def test_chord_nodes_categorically_colormapped(self):
         self.assertEqual(arc_source.data['Label'], np.array(['A', 'B', 'C']))
         self.assertEqual(glyph.fill_color, {'field': 'Label', 'transform': cmapper})
 
+    def test_chord_nodes_style_map_node_color_colormapped(self):
+        g = self.chord.opts(plot=dict(labels='Label'),
+                            style=dict(node_color='Label', cmap=['#FFFFFF', '#888888', '#000000']))
+        plot = bokeh_renderer.get_plot(g)
+        cmapper = plot.handles['node_color_color_mapper']
+        source = plot.handles['scatter_1_source']
+        arc_source = plot.handles['multi_line_2_source']
+        glyph = plot.handles['scatter_1_glyph']
+        arc_glyph = plot.handles['multi_line_2_glyph']
+        self.assertIsInstance(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.factors, ['A', 'B', 'C'])
+        self.assertEqual(cmapper.palette, ['#FFFFFF', '#888888', '#000000'])
+        self.assertEqual(source.data['Label'], np.array(['A', 'B', 'C']))
+        self.assertEqual(arc_source.data['Label'], np.array(['A', 'B', 'C']))
+        self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(arc_glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+
     def test_chord_edges_categorically_colormapped(self):
         g = self.chord.opts(plot=dict(edge_color_index='start'),
                             style=dict(edge_cmap=['#FFFFFF', '#000000']))
@@ -519,3 +543,14 @@ def test_chord_edges_categorically_colormapped(self):
         self.assertEqual(edge_source.data['start_str__'], ['0', '0', '1'])
         self.assertEqual(glyph.line_color, {'field': 'start_str__', 'transform': cmapper})
 
+    def test_chord_edge_color_style_mapping(self):
+        g = self.chord.opts(style=dict(edge_color=dim('start').astype(str), edge_cmap=['#FFFFFF', '#000000']))
+        plot = bokeh_renderer.get_plot(g)
+        cmapper = plot.handles['edge_color_color_mapper']
+        edge_source = plot.handles['multi_line_1_source']
+        glyph = plot.handles['multi_line_1_glyph']
+        self.assertIsInstance(cmapper, CategoricalColorMapper)
+        self.assertEqual(cmapper.palette, ['#FFFFFF', '#000000', '#FFFFFF'])
+        self.assertEqual(cmapper.factors, ['0', '1'])
+        self.assertEqual(edge_source.data['edge_color'], np.array(['0', '0', '1']))
+        self.assertEqual(glyph.line_color, {'field': 'edge_color', 'transform': cmapper})
diff --git a/holoviews/tests/plotting/matplotlib/testgraphplot.py b/holoviews/tests/plotting/matplotlib/testgraphplot.py
index ec058a3f87..fb9a481c44 100644
--- a/holoviews/tests/plotting/matplotlib/testgraphplot.py
+++ b/holoviews/tests/plotting/matplotlib/testgraphplot.py
@@ -5,6 +5,7 @@
 from holoviews.core.options import Cycle
 from holoviews.core.spaces import HoloMap
 from holoviews.element import Graph, Nodes, TriMesh, Chord, circular_layout
+from holoviews.util.transform import dim
 
 # Standardize backend due to random inconsistencies
 try:
@@ -459,12 +460,23 @@ def setUp(self):
         self.nodes = Dataset([(0, 'A'), (1, 'B'), (2, 'C')], 'index', 'Label')
         self.chord = Chord((self.edges, self.nodes))
 
+    def make_chord(self, i):
+        edges = [(0, 1, 1+i), (0, 2, 2+i), (1, 2, 3+i)]
+        nodes = Dataset([(0, 0+i), (1, 1+i), (2, 2+i)], 'index', 'Label')
+        return Chord((edges, nodes), vdims='weight')
+
     def test_chord_nodes_label_text(self):
         g = self.chord.opts(plot=dict(label_index='Label'))
         plot = mpl_renderer.get_plot(g)
         labels = plot.handles['labels']
         self.assertEqual([l.get_text() for l in labels], ['A', 'B', 'C'])
 
+    def test_chord_nodes_labels_mapping(self):
+        g = self.chord.opts(plot=dict(labels='Label'))
+        plot = mpl_renderer.get_plot(g)
+        labels = plot.handles['labels']
+        self.assertEqual([l.get_text() for l in labels], ['A', 'B', 'C'])
+
     def test_chord_nodes_categorically_colormapped(self):
         g = self.chord.opts(plot=dict(color_index='Label'),
                             style=dict(cmap=['#FFFFFF', '#CCCCCC', '#000000']))
@@ -477,6 +489,16 @@ def test_chord_nodes_categorically_colormapped(self):
         self.assertEqual(arcs.get_colors(), colors)
         self.assertEqual(nodes.get_facecolors(), colors)
 
+    def test_chord_node_color_style_mapping(self):
+        g = self.chord.opts(style=dict(node_color='Label', cmap=['#FFFFFF', '#CCCCCC', '#000000']))
+        plot = mpl_renderer.get_plot(g)
+        arcs = plot.handles['arcs']
+        nodes = plot.handles['nodes']
+        self.assertEqual(nodes.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(arcs.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(nodes.get_clim(), (0, 2))
+        self.assertEqual(arcs.get_clim(), (0, 2))
+
     def test_chord_edges_categorically_colormapped(self):
         g = self.chord.opts(plot=dict(edge_color_index='start'),
                             style=dict(edge_cmap=['#FFFFFF', '#000000']))
@@ -486,3 +508,68 @@ def test_chord_edges_categorically_colormapped(self):
                            [ 1., 1., 1., 1. ],
                            [ 0., 0., 0., 1. ]])
         self.assertEqual(edges.get_edgecolors(), colors)
+
+    def test_chord_edge_color_style_mapping(self):
+        g = self.chord.opts(style=dict(edge_color=dim('start').astype(str), edge_cmap=['#FFFFFF', '#000000']))
+        plot = mpl_renderer.get_plot(g)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_array(), np.array([0, 0, 1]))
+        self.assertEqual(edges.get_clim(), (0, 1))
+
+    def test_chord_edge_color_linear_style_mapping_update(self):
+        hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(edge_color='weight', framewise=True)
+        plot = mpl_renderer.get_plot(hmap)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_array(), np.array([1, 2, 3]))
+        self.assertEqual(edges.get_clim(), (1, 3))
+        plot.update((1,))
+        self.assertEqual(edges.get_array(), np.array([2, 3, 4]))
+        self.assertEqual(edges.get_clim(), (2, 4))
+
+    def test_chord_node_color_linear_style_mapping_update(self):
+        hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(node_color='Label', framewise=True)
+        plot = mpl_renderer.get_plot(hmap)        
+        arcs = plot.handles['arcs']
+        nodes = plot.handles['nodes']
+        self.assertEqual(nodes.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(arcs.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(nodes.get_clim(), (0, 2))
+        self.assertEqual(arcs.get_clim(), (0, 2))
+        plot.update((1,))
+        self.assertEqual(nodes.get_array(), np.array([1, 2, 3]))
+        self.assertEqual(arcs.get_array(), np.array([1, 2, 3]))
+        self.assertEqual(nodes.get_clim(), (1, 3))
+        self.assertEqual(arcs.get_clim(), (1, 3))
+
+    def test_chord_edge_color_style_mapping_update(self):
+        hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(
+            edge_color=dim('weight').cat({1: 'red', 2: 'green', 3: 'blue', 4: 'black'})
+        )
+        plot = mpl_renderer.get_plot(hmap)
+        edges = plot.handles['edges']
+        self.assertEqual(edges.get_edgecolors(), np.array([
+            [1, 0, 0, 1], [0, 0.501961, 0, 1], [0, 0, 1, 1]
+        ]))
+        plot.update((1,))
+        self.assertEqual(edges.get_edgecolors(), np.array([
+            [0, 0.501961, 0, 1], [0, 0, 1, 1], [0, 0, 0, 1]
+        ]))
+
+    def test_chord_node_color_style_mapping_update(self):
+        hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(
+            node_color=dim('Label').cat({0: 'red', 1: 'green', 2: 'blue', 3: 'black'})
+        )
+        plot = mpl_renderer.get_plot(hmap)
+        arcs = plot.handles['arcs']
+        nodes = plot.handles['nodes']
+        colors = np.array([
+            [1, 0, 0, 1], [0, 0.501961, 0, 1], [0, 0, 1, 1]
+        ])
+        self.assertEqual(arcs.get_edgecolors(), colors)
+        self.assertEqual(nodes.get_facecolors(), colors)
+        plot.update((1,))
+        colors = np.array([
+            [0, 0.501961, 0, 1], [0, 0, 1, 1], [0, 0, 0, 1]
+        ])
+        self.assertEqual(arcs.get_edgecolors(), colors)
+        self.assertEqual(nodes.get_facecolors(), colors)
diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index 05d69b585d..439e0133b1 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -110,7 +110,7 @@ class dim(object):
 
     _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn}
 
-    def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
+    def __init__(self, obj, *args, **kwargs):
         ops = []
         if isinstance(obj, basestring):
             self.dimension = Dimension(obj)
@@ -119,13 +119,17 @@ def __init__(self, obj, fn=None, other=None, reverse=False, **kwargs):
         else:
             self.dimension = obj.dimension
             ops = obj.ops
+        if args:
+            fn = args[0]
+        else:
+            fn = None
         if isinstance(fn, str) or fn in self._op_registry:
             fn = self._op_registry.get(fn)
             if fn is None:
                 raise ValueError('dim transform %s not found' % fn)
         if fn is not None:
-            ops = ops + [{'other': other, 'fn': fn, 'kwargs': kwargs,
-                          'reverse': reverse}]
+            ops = ops + [{'args': args[1:], 'fn': fn, 'kwargs': kwargs,
+                          'reverse': kwargs.pop('reverse', False)}]
         self.ops = ops
 
     @classmethod
@@ -152,13 +156,13 @@ def __sub__(self, other):       return dim(self, operator.sub, other)
     def __truediv__(self, other):   return dim(self, operator.truediv, other)
 
     # Reverse binary operators
-    def __radd__(self, other):      return dim(self, operator.add, other, True)
-    def __rdiv__(self, other):      return dim(self, operator.div, other, True)
-    def __rfloordiv__(self, other): return dim(self, operator.floordiv, other, True)
-    def __rmod__(self, other):      return dim(self, operator.mod, other, True)
-    def __rmul__(self, other):      return dim(self, operator.mul, other, True)
-    def __rsub__(self, other):      return dim(self, operator.sub, other, True)
-    def __rtruediv__(self, other):  return dim(self, operator.truediv, other, True)
+    def __radd__(self, other):      return dim(self, operator.add, other, reverse=True)
+    def __rdiv__(self, other):      return dim(self, operator.div, other, reverse=True)
+    def __rfloordiv__(self, other): return dim(self, operator.floordiv, other, reverse=True)
+    def __rmod__(self, other):      return dim(self, operator.mod, other, reverse=True)
+    def __rmul__(self, other):      return dim(self, operator.mul, other, reverse=True)
+    def __rsub__(self, other):      return dim(self, operator.sub, other, reverse=True)
+    def __rtruediv__(self, other):  return dim(self, operator.truediv, other, reverse=True)
 
     ## NumPy operations
     def __array_ufunc__(self, *args, **kwargs):
@@ -228,36 +232,59 @@ def applies(self, dataset):
             if isinstance(dataset, Graph) and not applies:
                 applies = dataset.nodes.get_dimension(self.dimension) is not None
         for op in self.ops:
-            other = op.get('other')
-            if other is None:
+            args = op.get('args')
+            if not args:
                 continue
-            elif isinstance(other, basestring):
-                applies &= dim(other).applies(dataset)
-            elif isinstance(other, dim):
-                applies &= other.applies(dataset)
+            for arg in args:
+                if isinstance(arg, dim):
+                    applies &= arg.applies(dataset)
         return applies
 
-    def apply(self, dataset, flat=False, expanded=None, ranges={}):
+    def apply(self, dataset, flat=False, expanded=None, ranges={}, all_values=False):
         """
         Evaluates the transform on the supplied dataset.
+
+        Arguments
+        ---------
+
+        dataset: Dataset
+            Dataset object to evaluate the expression on
+        flat: boolean
+            Whether to flatten the returned array
+        expanded: boolean
+            Whether to use the expanded expression
+        ranges: dict
+            Dictionary for ranges along each dimension used for norm function
+        all_values: boolean
+            Whether to evaluate on all available values, for some element
+            types, such as Graphs, this may include values not included
+            in the referenced column
+
+        Returns
+        -------
+        values: np.ndarray
+            Array containing evaluated expression
         """
+        dimension = self.dimension
         if expanded is None:
-            expanded = not ((dataset.interface.gridded and self.dimension in dataset.kdims) or
-                            (dataset.interface.multi and dataset.interface.isscalar(dataset, self.dimension)))
+            expanded = not ((dataset.interface.gridded and dimension in dataset.kdims) or
+                            (dataset.interface.multi and dataset.interface.isscalar(dataset, dimension)))
         if isinstance(dataset, Graph):
-            dataset = dataset if self.dimension in dataset else dataset.nodes
-        data = dataset.dimension_values(self.dimension, expanded=expanded, flat=flat)
+            if dimension in dataset.kdims and all_values:
+                dimension = dataset.nodes.kdims[2]
+            dataset = dataset if dimension in dataset else dataset.nodes
+        data = dataset.dimension_values(dimension, expanded=expanded, flat=flat)
         for o in self.ops:
-            other = o['other']
-            if other is not None:
-                if isinstance(other, dim):
-                    other = other.apply(dataset, flat, expanded, ranges)
-                args = (other, data) if o['reverse'] else (data, other)
-            else:
-                args = (data,)
+            args = o['args']
+            fn_args = [data]
+            for arg in args:
+                if isinstance(arg, dim):
+                    arg = arg.apply(dataset, flat, expanded, ranges, all_values)
+                fn_args.append(arg)
+            args = tuple(fn_args[::-1] if o['reverse'] else fn_args)
             drange = ranges.get(str(self), {})
             drange = drange.get('combined', drange)
-            if o['fn'] == norm_fn and drange != {}:
+            if o['fn'] is norm_fn and drange != {}:
                 data = o['fn'](data, *drange)
             else:
                 data = o['fn'](*args, **o['kwargs'])
@@ -266,10 +293,9 @@ def apply(self, dataset, flat=False, expanded=None, ranges={}):
     def __repr__(self):
         op_repr = "'%s'" % self.dimension
         for o in self.ops:
-            arg = ', %r' % o['other'] if o['other'] else ''
+            args = ', '.join([repr(r) for r in o['args']]) if o['args'] else ''
             kwargs = sorted(o['kwargs'].items(), key=operator.itemgetter(0))
             kwargs = ', %s' % ', '.join(['%s=%s' % item for item in kwargs]) if kwargs else ''
-            op_repr = '{fn}({repr}{arg}{kwargs})'.format(fn=o['fn'].__name__, repr=op_repr,
-                                                         arg=arg, kwargs=kwargs)
+            op_repr = '{fn}({repr}, {args}{kwargs})'.format(fn=o['fn'].__name__, repr=op_repr,
+                                                            args=args, kwargs=kwargs)
         return op_repr
-

From f13a3243c3b08b5633ba64e6063f447df2b4ed47 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 18:55:44 +0000
Subject: [PATCH 100/117] Renamed dim transform helper functions

---
 holoviews/util/transform.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index 439e0133b1..b2c2c6c7c4 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -9,7 +9,7 @@
 from ..element import Graph
 
 
-def norm_fn(values, min=None, max=None):
+def _norm(values, min=None, max=None):
     """
     min-max normalizes to scale data into 0-1 range.
 
@@ -32,7 +32,7 @@ def norm_fn(values, min=None, max=None):
     return (values - min) / (max-min)
 
 
-def bin_fn(values, bins, labels=None):
+def _bin(values, bins, labels=None):
     """
     Bins data into declared bins. By default each bin is labelled
     with bin center values but an explicit list of bin labels may be
@@ -65,7 +65,7 @@ def bin_fn(values, bins, labels=None):
     return binned
 
 
-def cat_fn(values, categories, empty=None):
+def _categorize(values, categories, empty=None):
     """
     Replaces discrete values in input array into a fixed set of
     categories defined either as a list or dictionary.
@@ -108,7 +108,7 @@ class dim(object):
     binning and categorizing data.
     """
 
-    _op_registry = {'norm': norm_fn, 'bin': bin_fn, 'cat': cat_fn}
+    _op_registry = {'norm': _norm, 'bin': _bin, 'categorize': _categorize}
 
     def __init__(self, obj, *args, **kwargs):
         ops = []
@@ -194,9 +194,9 @@ def bin(self, bins, labels=None):
         empty: any (optional)
            Value assigned to input values no category could be assigned to
         """
-        return dim(self, bin_fn, bins, labels=labels)
+        return dim(self, _bin, bins, labels=labels)
 
-    def cat(self, categories, empty=None):
+    def categorize(self, categories, empty=None):
         """
         Bins data into declared bins. By default each bin is labelled
         with bin center values but an explicit list of bin labels may be
@@ -209,13 +209,13 @@ def cat(self, categories, empty=None):
         labels: np.ndarray or list (optional)
            Labels for bins should have length N-1 compared to bins
         """
-        return dim(self, cat_fn, categories=categories, empty=empty)
+        return dim(self, _categorize, categories=categories, empty=empty)
 
     def norm(self):
         """
         min-max normalizes to scale data into 0-1 range.
         """
-        return dim(self, norm_fn)
+        return dim(self, _norm)
 
     # Other methods
     
@@ -284,7 +284,7 @@ def apply(self, dataset, flat=False, expanded=None, ranges={}, all_values=False)
             args = tuple(fn_args[::-1] if o['reverse'] else fn_args)
             drange = ranges.get(str(self), {})
             drange = drange.get('combined', drange)
-            if o['fn'] is norm_fn and drange != {}:
+            if o['fn'] is _norm and drange != {}:
                 data = o['fn'](data, *drange)
             else:
                 data = o['fn'](*args, **o['kwargs'])

From 6c4262a5169694025ed6a49ca9b314933248ef16 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 19:09:47 +0000
Subject: [PATCH 101/117] Updated HexTiles

---
 examples/reference/elements/bokeh/HexTiles.ipynb      | 7 ++++---
 examples/reference/elements/matplotlib/HexTiles.ipynb | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/reference/elements/bokeh/HexTiles.ipynb b/examples/reference/elements/bokeh/HexTiles.ipynb
index af54d289df..076bb9b32f 100644
--- a/examples/reference/elements/bokeh/HexTiles.ipynb
+++ b/examples/reference/elements/bokeh/HexTiles.ipynb
@@ -19,6 +19,7 @@
    "source": [
     "import numpy as np\n",
     "import holoviews as hv\n",
+    "from holoviews import dim\n",
     "hv.extension('bokeh')"
    ]
   },
@@ -49,7 +50,7 @@
    "source": [
     "Note that the hover shows a ``Count`` by default, representing the number of points falling within each bin.\n",
     "\n",
-    "It is also possible to provide additional value dimensions and define an ``aggregator`` to aggregate by value. If multiple value dimensions are defined the dimension to be colormapped may be defined using the ``color_index``. Note however that multiple value dimensions are allowed and will be displayed in the hover tooltip."
+    "It is also possible to provide additional value dimensions and define an ``aggregator`` to aggregate by value. If multiple value dimensions are defined the dimension to be colormapped may be defined using the ``color`` option. Note however that multiple value dimensions are allowed and will be displayed in the hover tooltip."
    ]
   },
   {
@@ -69,7 +70,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The bokeh backend also supports scaling the size of each hexagon by a value, which can be enabled using the ``size_index`` option. The minimum and maximum scaling can be set using the ``min_scale`` and ``max_scale`` options, defining how large the bins are relative to the size of a hexagon under uniform tiling.\n",
+    "The bokeh backend also supports scaling the size of each hexagon by a value, which can be enabled using the ``scale`` option. Since we do not want zero sized bins we will scale the normalized counts by 0.5 and then add a minimum size of 0.3.\n",
     "\n",
     "Here we will generate two separate distributions and visualize them by scaling each bin by the 'Count'."
    ]
@@ -82,7 +83,7 @@
    "source": [
     "x, y = np.hstack([np.random.randn(2, 10000), np.random.randn(2, 10000)*0.8+2])\n",
     "hex_two_distributions = hv.HexTiles((x, y))\n",
-    "hex_two_distributions.options(size_index='Count', width=500, height=500, min_scale=0.3, max_scale=0.85)"
+    "hex_two_distributions.options(scale=(dim('Count').norm()*0.5)+0.3, width=500, height=500)"
    ]
   },
   {
diff --git a/examples/reference/elements/matplotlib/HexTiles.ipynb b/examples/reference/elements/matplotlib/HexTiles.ipynb
index 26a414fa0d..3a311120a3 100644
--- a/examples/reference/elements/matplotlib/HexTiles.ipynb
+++ b/examples/reference/elements/matplotlib/HexTiles.ipynb
@@ -49,7 +49,7 @@
    "source": [
     "Note that the hover shows a ``Count`` by default, representing the number of points falling within each bin.\n",
     "\n",
-    "It is also possible to provide additional value dimensions and define an ``aggregator`` to aggregate by value. If multiple value dimensions are defined the dimension to be colormapped may be defined using the ``color_index``. Note however that multiple value dimensions are allowed and will be displayed in the hover tooltip."
+    "It is also possible to provide additional value dimensions and define an ``aggregator`` to aggregate by value. If multiple value dimensions are defined the dimension to be colormapped may be defined using the ``size``. Note however that multiple value dimensions are allowed and will be displayed in the hover tooltip."
    ]
   },
   {

From 57400754604fe930e67bc5ae2d92e44d43bdec0d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 19:17:26 +0000
Subject: [PATCH 102/117] Add warning about size_index and scale transform on
 HexTilePlot

---
 holoviews/plotting/bokeh/hex_tiles.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/holoviews/plotting/bokeh/hex_tiles.py b/holoviews/plotting/bokeh/hex_tiles.py
index aeb0620611..2456d4d811 100644
--- a/holoviews/plotting/bokeh/hex_tiles.py
+++ b/holoviews/plotting/bokeh/hex_tiles.py
@@ -12,6 +12,7 @@
 from ...core.options import Compositor, SkipRendering
 from ...core.util import basestring, isfinite
 from ...element import HexTiles
+from ...util.transform import dim
 from .element import ColorbarPlot
 from .styles import line_properties, fill_properties
 from .util import bokeh_version
@@ -183,6 +184,11 @@ def get_data(self, element, ranges, style):
         style['size'] = size
         style['aspect_scale'] = scale
         scale_dim = element.get_dimension(self.size_index)
+        scale = style.get('scale')
+        if scale_dim and ((isinstance(scale, basestring) and scale in element) or isinstance(scale, dim)):
+            self.warning("Cannot declare style mapping for 'scale' option "
+                         "and declare a size_index; ignoring the size_index.")
+            scale_dim = None
         if scale_dim is not None:
             sizes = element.dimension_values(scale_dim)
             if self.aggregator is np.size:

From 523e3a1b14b5630a146c8c51098df3509751e459 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 19:24:07 +0000
Subject: [PATCH 103/117] Updated unit tests

---
 holoviews/tests/plotting/bokeh/testgraphplot.py      |  2 +-
 holoviews/tests/plotting/matplotlib/testgraphplot.py |  6 +++---
 holoviews/tests/util/testtransform.py                | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/holoviews/tests/plotting/bokeh/testgraphplot.py b/holoviews/tests/plotting/bokeh/testgraphplot.py
index 719ce45cee..853ea6c9a1 100644
--- a/holoviews/tests/plotting/bokeh/testgraphplot.py
+++ b/holoviews/tests/plotting/bokeh/testgraphplot.py
@@ -551,6 +551,6 @@ def test_chord_edge_color_style_mapping(self):
         glyph = plot.handles['multi_line_1_glyph']
         self.assertIsInstance(cmapper, CategoricalColorMapper)
         self.assertEqual(cmapper.palette, ['#FFFFFF', '#000000', '#FFFFFF'])
-        self.assertEqual(cmapper.factors, ['0', '1'])
+        self.assertEqual(cmapper.factors, ['0', '1', '2'])
         self.assertEqual(edge_source.data['edge_color'], np.array(['0', '0', '1']))
         self.assertEqual(glyph.line_color, {'field': 'edge_color', 'transform': cmapper})
diff --git a/holoviews/tests/plotting/matplotlib/testgraphplot.py b/holoviews/tests/plotting/matplotlib/testgraphplot.py
index fb9a481c44..fcd2728ea2 100644
--- a/holoviews/tests/plotting/matplotlib/testgraphplot.py
+++ b/holoviews/tests/plotting/matplotlib/testgraphplot.py
@@ -514,7 +514,7 @@ def test_chord_edge_color_style_mapping(self):
         plot = mpl_renderer.get_plot(g)
         edges = plot.handles['edges']
         self.assertEqual(edges.get_array(), np.array([0, 0, 1]))
-        self.assertEqual(edges.get_clim(), (0, 1))
+        self.assertEqual(edges.get_clim(), (0, 2))
 
     def test_chord_edge_color_linear_style_mapping_update(self):
         hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(edge_color='weight', framewise=True)
@@ -543,7 +543,7 @@ def test_chord_node_color_linear_style_mapping_update(self):
 
     def test_chord_edge_color_style_mapping_update(self):
         hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(
-            edge_color=dim('weight').cat({1: 'red', 2: 'green', 3: 'blue', 4: 'black'})
+            edge_color=dim('weight').categorize({1: 'red', 2: 'green', 3: 'blue', 4: 'black'})
         )
         plot = mpl_renderer.get_plot(hmap)
         edges = plot.handles['edges']
@@ -557,7 +557,7 @@ def test_chord_edge_color_style_mapping_update(self):
 
     def test_chord_node_color_style_mapping_update(self):
         hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(
-            node_color=dim('Label').cat({0: 'red', 1: 'green', 2: 'blue', 3: 'black'})
+            node_color=dim('Label').categorize({0: 'red', 1: 'green', 2: 'blue', 3: 'black'})
         )
         plot = mpl_renderer.get_plot(hmap)
         arcs = plot.handles['arcs']
diff --git a/holoviews/tests/util/testtransform.py b/holoviews/tests/util/testtransform.py
index ebf235d1b4..f800de662e 100644
--- a/holoviews/tests/util/testtransform.py
+++ b/holoviews/tests/util/testtransform.py
@@ -125,16 +125,16 @@ def test_bin_transform_with_labels(self):
         self.assertEqual(dim('int').bin([0, 5, 10], ['A', 'B']).apply(self.dataset),
                          np.array(['A', 'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', 'B']))
 
-    def test_cat_transform_list(self):
-        self.assertEqual(dim('categories').cat(['circle', 'square', 'triangle']).apply(self.dataset),
+    def test_categorize_transform_list(self):
+        self.assertEqual(dim('categories').categorize(['circle', 'square', 'triangle']).apply(self.dataset),
                          np.array((['circle', 'square', 'triangle']*3)+['circle']))
 
-    def test_cat_transform_dict(self):
-        self.assertEqual(dim('categories').cat({'A': 'circle', 'B': 'square', 'C': 'triangle'}).apply(self.dataset),
+    def test_categorize_transform_dict(self):
+        self.assertEqual(dim('categories').categorize({'A': 'circle', 'B': 'square', 'C': 'triangle'}).apply(self.dataset),
                          np.array((['circle', 'square', 'triangle']*3)+['circle']))
 
-    def test_cat_transform_dict_with_empty(self):
-        self.assertEqual(dim('categories').cat({'A': 'circle', 'B': 'square'}, empty='triangle').apply(self.dataset),
+    def test_categorize_transform_dict_with_empty(self):
+        self.assertEqual(dim('categories').categorize({'A': 'circle', 'B': 'square'}, empty='triangle').apply(self.dataset),
                          np.array((['circle', 'square', 'triangle']*3)+['circle']))
 
     # Complex expressions

From d047bc8ddedfa20aab591a7d7f8497c27d1cb51f Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 20:35:10 +0000
Subject: [PATCH 104/117] Fixed expansion of color/alpha options in bokeh

---
 holoviews/plotting/bokeh/element.py           | 48 ++++++++++++-------
 holoviews/plotting/bokeh/styles.py            |  6 ++-
 .../tests/plotting/bokeh/testgraphplot.py     | 26 +++++++---
 .../tests/plotting/bokeh/testpathplot.py      | 25 +++++++++-
 4 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 8a73638ffc..2cad38ed78 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -34,8 +34,8 @@
 from ..util import dynamic_update, process_cmap, color_intervals, dim_range_key
 from .plot import BokehPlot, TOOLS
 from .styles import (
-    legend_dimensions, line_properties, mpl_to_bokeh, rgba_tuple,
-    text_properties, validate
+    legend_dimensions, line_properties, mpl_to_bokeh, property_prefixes,
+    rgba_tuple, text_properties, validate
 )
 from .util import (
     bokeh_version, decode_bytes, get_tab_title, glyph_order,
@@ -737,24 +737,40 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
                 key = {'field': k, 'transform': cmapper}
             new_style[k] = key
 
+        # Process color/alpha styles and expand to fill/line style
         for style, val in list(new_style.items()):
-            # If mapped to color/alpha override static fill/line style
             for s in ('alpha', 'color'):
                 if prefix+s != style or style not in source.data:
                     continue
-                supports_fill = any(o.startswith(prefix+'fill') and getattr(self, 'filled', True)
-                                    for o in self.style_opts)
-                fill_style = new_style.get(prefix+'fill_'+s)
-                if ((fill_style is not None and validate(s, fill_style))
-                    or (fill_style is None and supports_fill)):
-                    new_style[prefix+'fill_'+s] = val
-
-                # If glyph has fill and line style is set skip setting line color
-                line_style = new_style.get(prefix+'line_'+s)
-                if supports_fill and line_style is not None:
-                    continue
-                if line_style and validate(s, line_style):
-                    new_style[prefix+'line_'+s] = val
+                supports_fill = any(
+                    o.startswith(prefix+'fill') and (prefix != 'edge_' or getattr(self, 'filled', True))
+                    for o in self.style_opts)
+                for pprefix in [p+'_' for p in property_prefixes]+['']:
+                    fill_key = prefix+pprefix+'fill_'+s
+                    fill_style = new_style.get(fill_key)
+
+                    # Do not override custom nonselection/muted alpha
+                    if ((pprefix in ('nonselection_', 'muted_') and s == 'alpha')
+                        or fill_key not in self.style_opts):
+                        continue
+
+                    # Override empty and non-vectorized fill_style if not hover style
+                    hover = pprefix == 'hover'
+                    if ((fill_style is None or (validate(s, fill_style, True) and not hover))
+                        and supports_fill):
+                        new_style[fill_key] = val
+
+                    line_key = prefix+pprefix+'line_'+s
+                    line_style = new_style.get(line_key)
+
+                    # If glyph has fill and line style is set overriding line color
+                    if supports_fill and line_style is not None:
+                        continue
+
+                    # If glyph does not support fill override non-vectorized line_color
+                    if ((line_style is not None and (validate(s, line_style) and not hover)) or
+                        (line_style is None and not supports_fill)):
+                        new_style[line_key] = val
 
         return new_style
 
diff --git a/holoviews/plotting/bokeh/styles.py b/holoviews/plotting/bokeh/styles.py
index cc5a92a427..077df713b0 100644
--- a/holoviews/plotting/bokeh/styles.py
+++ b/holoviews/plotting/bokeh/styles.py
@@ -111,7 +111,7 @@ def get_validator(style):
             return v
 
 
-def validate(style, value):
+def validate(style, value, scalar=False):
     """
     Validates a style and associated value.
 
@@ -121,6 +121,8 @@ def validate(style, value):
        The style to validate (e.g. 'color', 'size' or 'marker')
     value: 
        The style value to validate
+    scalar: bool
+
 
     Returns
     -------
@@ -131,6 +133,8 @@ def validate(style, value):
     if validator is None:
         return None
     if isinstance(value, (np.ndarray, list)):
+        if scalar:
+            return False
         return all(validator(v) for v in value)
     return validator(value)
 
diff --git a/holoviews/tests/plotting/bokeh/testgraphplot.py b/holoviews/tests/plotting/bokeh/testgraphplot.py
index 853ea6c9a1..0c40680f3c 100644
--- a/holoviews/tests/plotting/bokeh/testgraphplot.py
+++ b/holoviews/tests/plotting/bokeh/testgraphplot.py
@@ -168,7 +168,7 @@ def test_graph_op_node_color(self):
         cds = plot.handles['scatter_1_source']
         glyph = plot.handles['scatter_1_glyph']
         self.assertEqual(glyph.fill_color, {'field': 'node_color'})
-        self.assertEqual(glyph.line_color, {'field': 'node_color'})
+        self.assertEqual(glyph.line_color, 'black')
         self.assertEqual(cds.data['node_color'], np.array(['red', 'green', 'blue']))
 
     def test_graph_op_node_color_linear(self):
@@ -181,7 +181,7 @@ def test_graph_op_node_color_linear(self):
         glyph = plot.handles['scatter_1_glyph']
         cmapper = plot.handles['node_color_color_mapper']
         self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
         self.assertEqual(cds.data['node_color'], np.array([0.5, 1.5, 2.5]))
 
     def test_graph_op_node_color_categorical(self):
@@ -194,7 +194,7 @@ def test_graph_op_node_color_categorical(self):
         glyph = plot.handles['scatter_1_glyph']
         cmapper = plot.handles['node_color_color_mapper']
         self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
         self.assertEqual(cds.data['node_color'], np.array(['A', 'B', 'C']))
 
     def test_graph_op_node_size(self):
@@ -349,7 +349,7 @@ def test_trimesh_op_node_color(self):
         cds = plot.handles['scatter_1_source']
         glyph = plot.handles['scatter_1_glyph']
         self.assertEqual(glyph.fill_color, {'field': 'node_color'})
-        self.assertEqual(glyph.line_color, {'field': 'node_color'})
+        self.assertEqual(glyph.line_color, 'black')
         self.assertEqual(cds.data['node_color'], np.array(['red', 'green', 'blue', 'black']))
     
     def test_trimesh_op_node_color_linear(self):
@@ -361,7 +361,7 @@ def test_trimesh_op_node_color_linear(self):
         glyph = plot.handles['scatter_1_glyph']
         cmapper = plot.handles['node_color_color_mapper']
         self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
         self.assertEqual(cds.data['node_color'], np.array([2, 1, 3, 4]))
         self.assertEqual(cmapper.low, 1) 
         self.assertEqual(cmapper.high, 4)
@@ -375,7 +375,7 @@ def test_trimesh_op_node_color_categorical(self):
         glyph = plot.handles['scatter_1_glyph']
         cmapper = plot.handles['node_color_color_mapper']
         self.assertEqual(glyph.fill_color, {'field': 'node_color', 'transform': cmapper})
-        self.assertEqual(glyph.line_color, {'field': 'node_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
         self.assertEqual(cds.data['node_color'], np.array(['B', 'C', 'A', 'B']))
 
     def test_trimesh_op_node_size(self):
@@ -445,6 +445,20 @@ def test_trimesh_op_edge_color_linear(self):
         self.assertEqual(cmapper.low, 2.4)
         self.assertEqual(cmapper.high, 3.6)
 
+    def test_trimesh_op_edge_color_linear_filled(self):
+        edges = [(0, 1, 2, 2.4), (1, 2, 3, 3.6)]
+        nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
+        trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color', filled=True)
+        plot = bokeh_renderer.get_plot(trimesh)
+        cds = plot.handles['patches_1_source']
+        glyph = plot.handles['patches_1_glyph']
+        cmapper = plot.handles['edge_color_color_mapper']
+        self.assertEqual(glyph.fill_color, {'field': 'edge_color', 'transform': cmapper})
+        self.assertEqual(glyph.line_color, 'black')
+        self.assertEqual(cds.data['edge_color'], np.array([2.4, 3.6]))
+        self.assertEqual(cmapper.low, 2.4)
+        self.assertEqual(cmapper.high, 3.6)
+
     def test_trimesh_op_edge_color_categorical(self):
         edges = [(0, 1, 2, 'A'), (1, 2, 3, 'B')]
         nodes = [(-1, -1, 0), (0, 0, 1), (0, 1, 2), (1, 0, 3)]
diff --git a/holoviews/tests/plotting/bokeh/testpathplot.py b/holoviews/tests/plotting/bokeh/testpathplot.py
index a26b79e78d..1c51f060f4 100644
--- a/holoviews/tests/plotting/bokeh/testpathplot.py
+++ b/holoviews/tests/plotting/bokeh/testpathplot.py
@@ -2,7 +2,7 @@
 from unittest import SkipTest
 
 import numpy as np
-from holoviews.core import NdOverlay
+from holoviews.core import NdOverlay, HoloMap
 from holoviews.core.options import Cycle
 from holoviews.element import Path, Polygons, Contours
 from holoviews.plotting.bokeh.util import bokeh_version
@@ -304,6 +304,29 @@ def test_contours_linear_color_op(self):
         self.assertEqual(cmapper.low, 3)
         self.assertEqual(cmapper.high, 7)
 
+    def test_contours_linear_color_op_update(self):
+        contours = HoloMap({
+            0: Contours([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 7},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 3}
+            ], vdims='color'),
+            1: Contours([
+                {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 5},
+                {('x', 'y'): [(1, 0), (1, 1), (0, 1)], 'color': 2}
+            ], vdims='color')}).options(color='color', framewise=True)
+        plot = bokeh_renderer.get_plot(contours)
+        cds = plot.handles['source']
+        glyph = plot.handles['glyph']
+        cmapper = plot.handles['color_color_mapper']
+        self.assertEqual(glyph.line_color, {'field': 'color', 'transform': cmapper})
+        self.assertEqual(cds.data['color'], np.array([7, 3]))
+        self.assertEqual(cmapper.low, 3)
+        self.assertEqual(cmapper.high, 7)
+        plot.update((1,))
+        self.assertEqual(cds.data['color'], np.array([5, 2]))
+        self.assertEqual(cmapper.low, 2)
+        self.assertEqual(cmapper.high, 5)
+
     def test_contours_categorical_color_op(self):
         contours = Contours([
             {('x', 'y'): [(0, 0), (0, 1), (1, 0)], 'color': 'b'},

From bdf25988074505732b9f26dd0728e0ae5fc356f0 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 20:54:20 +0000
Subject: [PATCH 105/117] Normalize graph edges correctly

---
 holoviews/plotting/plot.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index c8c8fbf452..0a0709267f 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -481,7 +481,10 @@ def _compute_group_range(cls, group, elements, ranges):
 
             # Compute dimension normalization
             for el_dim in el.dimensions('ranges'):
-                data_range = el.range(el_dim, dimension_range=False)
+                if isinstance(el, Graph) and el_dim in el.kdims[:2]:
+                    data_range = el.nodes.range(2, dimension_range=False)
+                else:
+                    data_range = el.range(el_dim, dimension_range=False)
                 if el_dim.name not in group_ranges:
                     group_ranges[el_dim.name] = {'data': [], 'hard': [], 'soft': []}
                 group_ranges[el_dim.name]['data'].append(data_range)

From 1663316446b6c705524ecb872c72d2f065f7655d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 21:05:09 +0000
Subject: [PATCH 106/117] Fixed flake

---
 holoviews/plotting/plot.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index 0a0709267f..d6e33c0ccd 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -516,9 +516,8 @@ def _compute_group_range(cls, group, elements, ranges):
             dranges = {'data': data_range, 'hard': hard_range,
                        'soft': soft_range, 'combined': combined}
             if 'factors' in values:
-                factors = util.unique_array([
+                dranges['factors'] = util.unique_array([
                     v for factors in values['factors'] for v in factors])
-                dranges['factors'] = factors
             dim_ranges.append((gdim, dranges))
         ranges[group] = OrderedDict(dim_ranges)
 

From 2b8084016638a25333abfa32e63310782bdb737c Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 21:56:52 +0000
Subject: [PATCH 107/117] Fix for ChordPlot node style

---
 holoviews/plotting/bokeh/element.py | 10 ++++------
 holoviews/plotting/bokeh/graphs.py  | 26 ++++++++++++++++++++------
 holoviews/plotting/bokeh/heatmap.py |  4 ++--
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index 2cad38ed78..ebf4d9d383 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -755,7 +755,7 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
                         continue
 
                     # Override empty and non-vectorized fill_style if not hover style
-                    hover = pprefix == 'hover'
+                    hover = pprefix == 'hover_'
                     if ((fill_style is None or (validate(s, fill_style, True) and not hover))
                         and supports_fill):
                         new_style[fill_key] = val
@@ -962,7 +962,7 @@ def initialize_plot(self, ranges=None, plot=None, plots=None, source=None):
         return plot
 
 
-    def _update_glyphs(self, element, ranges):
+    def _update_glyphs(self, element, ranges, style):
         plot = self.handles['plot']
         glyph = self.handles.get('glyph')
         source = self.handles['source']
@@ -976,7 +976,6 @@ def _update_glyphs(self, element, ranges):
             current_id = element._plot_id
         self.handles['previous_id'] = current_id
         self.static_source = (self.dynamic and (current_id == previous_id))
-        style = self.style[self.cyclic_index]
         if self.batched:
             data, mapping, style = self.get_batched_data(element, ranges)
         else:
@@ -1033,7 +1032,7 @@ def update_frame(self, key, ranges=None, plot=None, element=None):
             self._update_ranges(style_element, ranges)
             self._update_plot(key, plot, style_element)
 
-        self._update_glyphs(element, ranges)
+        self._update_glyphs(element, ranges, self.style[self.cyclic_index])
         self._execute_hooks(element)
 
 
@@ -1136,7 +1135,7 @@ def _process_properties(self, key, properties, mapping):
         return group_props
 
 
-    def _update_glyphs(self, element, ranges):
+    def _update_glyphs(self, element, ranges, style):
         plot = self.handles['plot']
 
         # Cache frame object id to skip updating data if unchanged
@@ -1147,7 +1146,6 @@ def _update_glyphs(self, element, ranges):
             current_id = element._plot_id
         self.handles['previous_id'] = current_id
         self.static_source = (self.dynamic and (current_id == previous_id))
-        style = self.style[self.cyclic_index]
         data, mapping, style = self.get_data(element, ranges, style)
 
         keys = glyph_order(dict(data, **mapping), self._draw_order)
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 8296eea8cb..3d739eea81 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -354,20 +354,34 @@ def get_extents(self, element, ranges, range_type='combined'):
         y0, y1 = max_range([ydim.range, (-rng, rng)])
         return (x0, y0, x1, y1)
 
+    def _sync_arcs(self):
+        arc_renderer = self.handles['multi_line_2_glyph_renderer']
+        scatter_renderer = self.handles['scatter_1_glyph_renderer']
+        for gtype in ('selection_', 'nonselection_', 'muted_', 'hover_', ''):
+            glyph = getattr(scatter_renderer, gtype+'glyph')
+            arc_glyph = getattr(arc_renderer, gtype+'glyph')
+            if not glyph or not arc_glyph:
+                continue
+            scatter_props = glyph.properties_with_values(include_defaults=False)
+            styles = {k.replace('fill', 'line'): v for k, v in scatter_props.items()
+                      if 'fill' in k}
+            arc_glyph.update(**styles)
 
     def _init_glyphs(self, plot, element, ranges, source):
         super(ChordPlot, self)._init_glyphs(plot, element, ranges, source)
         # Ensure that arc glyph matches node style
         if 'multi_line_2_glyph' in self.handles:
-            scatter_props = self.handles['scatter_1_glyph'].properties_with_values()
-            styles = {k.replace('fill', 'line'): v for k, v in scatter_props.items() if 'fill' in k}
             arc_renderer = self.handles['multi_line_2_glyph_renderer']
             scatter_renderer = self.handles['scatter_1_glyph_renderer']
-            arc_renderer.data_source = scatter_renderer.data_source
             arc_renderer.view = scatter_renderer.view
-            self.handles['multi_line_2_glyph'].update(**styles)
+            arc_renderer.data_source = scatter_renderer.data_source
             self.handles['multi_line_2_source'] = scatter_renderer.data_source
+            self._sync_arcs()
 
+    def _update_glyphs(self, element, ranges, style):
+        if 'multi_line_2_glyph' in self.handles:
+            self._sync_arcs()
+        super(ChordPlot, self)._init_glyphs(element, ranges, style)
 
     def get_data(self, element, ranges, style):
         offset = style.pop('label_offset', 1.05)
@@ -458,6 +472,6 @@ def _init_glyphs(self, plot, element, ranges, source):
         element = self._process_vertices(element)
         super(TriMeshPlot, self)._init_glyphs(plot, element, ranges, source)
 
-    def _update_glyphs(self, element, ranges):
+    def _update_glyphs(self, element, ranges, style):
         element = self._process_vertices(element)
-        super(TriMeshPlot, self)._update_glyphs(element, ranges)
+        super(TriMeshPlot, self)._update_glyphs(element, ranges, style)
diff --git a/holoviews/plotting/bokeh/heatmap.py b/holoviews/plotting/bokeh/heatmap.py
index 52b6001014..26ce10d649 100644
--- a/holoviews/plotting/bokeh/heatmap.py
+++ b/holoviews/plotting/bokeh/heatmap.py
@@ -149,8 +149,8 @@ def _init_glyphs(self, plot, element, ranges, source):
         self._draw_markers(plot, element, self.ymarks, axis='y')
 
 
-    def _update_glyphs(self, element, ranges):
-        super(HeatMapPlot, self)._update_glyphs(element, ranges)
+    def _update_glyphs(self, element, ranges, style):
+        super(HeatMapPlot, self)._update_glyphs(element, ranges, style)
         plot = self.handles['plot']
         self._draw_markers(plot, element, self.xmarks, axis='x')
         self._draw_markers(plot, element, self.ymarks, axis='y')

From 655fcc3dc49ef309a1278028d8f945430ccfb659 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 22:40:59 +0000
Subject: [PATCH 108/117] Fixed a number of examples

---
 examples/gallery/demos/matplotlib/iris_splom_example.ipynb | 2 +-
 examples/user_guide/Plotting_with_Bokeh.ipynb              | 3 +--
 holoviews/plotting/mpl/element.py                          | 2 +-
 holoviews/plotting/util.py                                 | 5 +++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/gallery/demos/matplotlib/iris_splom_example.ipynb b/examples/gallery/demos/matplotlib/iris_splom_example.ipynb
index 756c7a000f..251bc93856 100644
--- a/examples/gallery/demos/matplotlib/iris_splom_example.ipynb
+++ b/examples/gallery/demos/matplotlib/iris_splom_example.ipynb
@@ -56,7 +56,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "grid.options('Scatter', bgcolor='#efe8e2', alpha=0.2, size=4)"
+    "grid.options('Scatter', bgcolor='#efe8e2', alpha=0.4, s=16)"
    ]
   }
  ],
diff --git a/examples/user_guide/Plotting_with_Bokeh.ipynb b/examples/user_guide/Plotting_with_Bokeh.ipynb
index 7a3ef121f5..2bef756499 100644
--- a/examples/user_guide/Plotting_with_Bokeh.ipynb
+++ b/examples/user_guide/Plotting_with_Bokeh.ipynb
@@ -76,8 +76,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from holoviews.plotting.bokeh.element import (line_properties, fill_properties,\n",
-    "                                              text_properties)\n",
+    "from holoviews.plotting.bokeh.styles import (line_properties, fill_properties, text_properties)\n",
     "print(\"\"\"\n",
     "Line properties: %s\\n\n",
     "Fill properties: %s\\n\n",
diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
index c6e216a6b2..aba7cec59c 100644
--- a/holoviews/plotting/mpl/element.py
+++ b/holoviews/plotting/mpl/element.py
@@ -745,7 +745,7 @@ def _norm_kwargs(self, element, ranges, opts, vdim, values=None, prefix=''):
                 expanded = not (
                     isinstance(element, Dataset) and
                     element.interface.multi and
-                    (element.level is not None or
+                    (getattr(element, 'level', None) is not None or
                      element.interface.isscalar(element, vdim.name))
                 )
                 values = np.asarray(element.dimension_values(vdim, expanded=expanded))
diff --git a/holoviews/plotting/util.py b/holoviews/plotting/util.py
index 14e7f059e0..9a1854c446 100644
--- a/holoviews/plotting/util.py
+++ b/holoviews/plotting/util.py
@@ -15,7 +15,8 @@
 from ..core.options import Cycle
 from ..core.spaces import get_nested_streams
 from ..core.util import (match_spec, wrap_tuple, basestring, get_overlay_spec,
-                         unique_iterator, closest_match, is_number, isfinite)
+                         unique_iterator, closest_match, is_number, isfinite,
+                         python2sort)
 from ..streams import LinkedStream
 from ..util.transform import dim
 
@@ -720,7 +721,7 @@ def list_cmaps(provider=None, records=False, name=None, category=None, source=No
 
     # Return results sorted by category if category information is provided
     if records:
-        return list(unique_iterator(sorted(matches,
+        return list(unique_iterator(python2sort(matches,
                     key=lambda r: (r.category.split(" ")[-1],r.bg,r.name.lower(),r.provider,r.source))))
     else:
         return list(unique_iterator(sorted([rec.name for rec in matches], key=lambda n:n.lower())))

From ebb716af46d1e44824d864fdc4ca97a27d83247b Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 23:34:21 +0000
Subject: [PATCH 109/117] Added utility to handle matplotlib style groups

---
 holoviews/plotting/mpl/graphs.py  | 15 ++++---------
 holoviews/plotting/mpl/heatmap.py | 23 +++++++-------------
 holoviews/plotting/mpl/sankey.py  |  5 ++---
 holoviews/plotting/mpl/util.py    | 36 +++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/holoviews/plotting/mpl/graphs.py b/holoviews/plotting/mpl/graphs.py
index d146125bed..39f6eb77ec 100644
--- a/holoviews/plotting/mpl/graphs.py
+++ b/holoviews/plotting/mpl/graphs.py
@@ -11,6 +11,7 @@
 from ...util.transform import dim
 from ..util import process_cmap
 from .element import ColorbarPlot
+from .util import filter_styles
 
 
 class GraphPlot(ColorbarPlot):
@@ -134,10 +135,7 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         # Draw edges
         color_opts = ['c', 'cmap', 'vmin', 'vmax', 'norm']
         groups = [g for g in self._style_groups if g != 'edge']
-        edge_opts = {k[5:] if 'edge_' in k else k: v
-                     for k, v in plot_kwargs.items()
-                     if not any(k.startswith(p) for p in groups)
-                     and k not in color_opts}
+        edge_opts = filter_styles(plot_kwargs, 'edge', groups, color_opts)
         if 'c' in edge_opts:
             edge_opts['array'] = edge_opts.pop('c')
         paths = plot_args['edges']
@@ -156,9 +154,7 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         # Draw nodes
         xs, ys = plot_args['nodes']
         groups = [g for g in self._style_groups if g != 'node']
-        node_opts = {k[5:] if 'node_' in k else k: v
-                     for k, v in plot_kwargs.items()
-                     if not any(k.startswith(p) for p in groups)}
+        node_opts = filter_styles(plot_kwargs, 'node', groups)
         nodes = ax.scatter(xs, ys, **node_opts)
 
         return {'nodes': nodes, 'edges': edges}
@@ -328,10 +324,7 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         if 'arcs' in plot_args:
             color_opts = ['c', 'cmap', 'vmin', 'vmax', 'norm']
             groups = [g for g in self._style_groups if g != 'arc']
-            edge_opts = {k[4:] if 'arc_' in k else k: v
-                         for k, v in plot_kwargs.items()
-                         if not any(k.startswith(p) for p in groups)
-                         and k not in color_opts}
+            edge_opts = filter_styles(plot_kwargs, 'arc', groups, color_opts)
             paths = plot_args['arcs']
             edges = LineCollection(paths, **edge_opts)
             ax.add_collection(edges)
diff --git a/holoviews/plotting/mpl/heatmap.py b/holoviews/plotting/mpl/heatmap.py
index 59f88590de..cd975612eb 100644
--- a/holoviews/plotting/mpl/heatmap.py
+++ b/holoviews/plotting/mpl/heatmap.py
@@ -12,6 +12,7 @@
 from ...core.spaces import HoloMap
 from .element import ColorbarPlot
 from .raster import RasterPlot
+from .util import filter_styles
 
 
 class HeatMapPlot(RasterPlot):
@@ -389,9 +390,7 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         # Draw edges
         color_opts = ['c', 'cmap', 'vmin', 'vmax', 'norm', 'array']
         groups = [g for g in self._style_groups if g != 'annular']
-        edge_opts = {k[8:] if 'annular_' in k else k: v
-                     for k, v in plot_kwargs.items()
-                     if not any(k.startswith(p) for p in groups)}
+        edge_opts = filter_styles(plot_kwargs, 'annular', groups)
         annuli = plot_args['annular']
         edge_opts.pop('interpolation', None)
         annuli = PatchCollection(annuli, transform=ax.transAxes, **edge_opts)
@@ -402,25 +401,19 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         paths = plot_args['xseparator']
         if paths:
             groups = [g for g in self._style_groups if g != 'xmarks']
-            edge_opts = {k[7:] if 'xmarks_' in k else k: v
-                         for k, v in plot_kwargs.items()
-                         if not any(k.startswith(p) for p in groups)
-                         and k not in color_opts}
-            edge_opts.pop('interpolation', None)
-            xseparators = LineCollection(paths, **edge_opts)
+            xmark_opts = filter_styles(plot_kwargs, 'xmarks', groups, color_opts)
+            xmark_opts.pop('interpolation', None)
+            xseparators = LineCollection(paths, **xmark_opts)
             ax.add_collection(xseparators)
             artists['xseparator'] = xseparators
 
         paths = plot_args['yseparator']
         if paths:
             groups = [g for g in self._style_groups if g != 'ymarks']
-            edge_opts = {k[7:] if 'ymarks_' in k else k: v
-                         for k, v in plot_kwargs.items()
-                         if not any(k.startswith(p) for p in groups)
-                         and k not in color_opts}
-            edge_opts.pop('interpolation', None)
+            ymark_opts = filter_styles(plot_kwargs, 'ymarks', groups, color_opts)
+            ymark_opts.pop('interpolation', None)
             yseparators = PatchCollection(paths, facecolor='none',
-                                          transform=ax.transAxes, **edge_opts)
+                                          transform=ax.transAxes, **ymark_opts)
             ax.add_collection(yseparators)
             artists['yseparator'] = yseparators
 
diff --git a/holoviews/plotting/mpl/sankey.py b/holoviews/plotting/mpl/sankey.py
index b3efe63efa..1c45928390 100644
--- a/holoviews/plotting/mpl/sankey.py
+++ b/holoviews/plotting/mpl/sankey.py
@@ -7,6 +7,7 @@
 
 from ...core.util import basestring, max_range
 from .graphs import GraphPlot
+from .util import filter_styles
 
 
 class SankeyPlot(GraphPlot):
@@ -104,9 +105,7 @@ def _update_labels(self, ax, data, style):
     def init_artists(self, ax, plot_args, plot_kwargs):
         artists = super(SankeyPlot, self).init_artists(ax, plot_args, plot_kwargs)
         groups = [g for g in self._style_groups if g != 'node']
-        node_opts = {k[5:] if 'node_' in k else k: v
-                     for k, v in plot_kwargs.items()
-                     if not (any(k.startswith(p) for p in groups) or k in ('s', 'node_s'))}
+        node_opts = filter_styles(plot_kwargs, 'node', groups, ('s', 'node_s'))
         rects = [Rectangle(**rect) for rect in plot_args['rects']]
         artists['rects'] = ax.add_collection(PatchCollection(rects, **node_opts))
         artists['labels'] = self._update_labels(ax, plot_args, plot_kwargs)
diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index dc785a20dc..229b789b6e 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -87,6 +87,42 @@ def validate(style, value, vectorized=True):
         return False
 
 
+def filter_styles(style, group, other_groups, blacklist=[]):
+    """
+    Filters styles which are specific to a particular artist, e.g.
+    for a GraphPlot this will filter options specific to the nodes and
+    edges.
+
+    Arguments
+    ---------
+    style: dict
+        Dictionary of styles and values
+    group: str
+        Group within the styles to filter for
+    other_groups: list
+        Other groups to filter out
+    blacklist: list (optional)
+        List of options to filter out
+
+    Returns
+    -------
+    filtered: dict
+        Filtered dictionary of styles
+    """
+    group = group+'_'
+    filtered = {}
+    for k, v in style.items():
+        if (any(k.startswith(p) for p in other_groups)
+            or k.startswith(group) or k in blacklist):
+            continue
+        filtered[k] = v
+    for k, v in style.items():
+        if not k.startswith(group):
+            continue
+        filtered[k[len(group):]] = v
+    return filtered
+
+
 def wrap_formatter(formatter):
     """
     Wraps formatting function or string in

From c5f25cc75e242f499ac534af4b8797902aa7355f Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 23:38:59 +0000
Subject: [PATCH 110/117] Fixed flake

---
 holoviews/plotting/plot.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/plotting/plot.py b/holoviews/plotting/plot.py
index d6e33c0ccd..895ef9f2d2 100644
--- a/holoviews/plotting/plot.py
+++ b/holoviews/plotting/plot.py
@@ -517,7 +517,7 @@ def _compute_group_range(cls, group, elements, ranges):
                        'soft': soft_range, 'combined': combined}
             if 'factors' in values:
                 dranges['factors'] = util.unique_array([
-                    v for factors in values['factors'] for v in factors])
+                    v for fctrs in values['factors'] for v in fctrs])
             dim_ranges.append((gdim, dranges))
         ranges[group] = OrderedDict(dim_ranges)
 

From 00f9de6da61ebbbb9f5212a31bb39ada9b0c01a4 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Wed, 21 Nov 2018 23:46:10 +0000
Subject: [PATCH 111/117] Fixed small bug

---
 holoviews/plotting/mpl/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/plotting/mpl/util.py b/holoviews/plotting/mpl/util.py
index 229b789b6e..6b37961211 100644
--- a/holoviews/plotting/mpl/util.py
+++ b/holoviews/plotting/mpl/util.py
@@ -117,7 +117,7 @@ def filter_styles(style, group, other_groups, blacklist=[]):
             continue
         filtered[k] = v
     for k, v in style.items():
-        if not k.startswith(group):
+        if not k.startswith(group) or k in blacklist:
             continue
         filtered[k[len(group):]] = v
     return filtered

From 43f4acaaa2e659313cb3fabaf5071ce9ccee37ff Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Thu, 22 Nov 2018 01:18:27 +0000
Subject: [PATCH 112/117] Updated SankeyPlot

---
 .../reference/elements/bokeh/Sankey.ipynb     |   6 +-
 .../elements/matplotlib/Sankey.ipynb          |   6 +-
 holoviews/plotting/bokeh/__init__.py          |   7 +-
 holoviews/plotting/bokeh/element.py           |   4 +-
 holoviews/plotting/bokeh/graphs.py            |  10 +-
 holoviews/plotting/bokeh/sankey.py            | 119 +++++++++++++-----
 holoviews/plotting/mpl/sankey.py              |  69 +++++++---
 7 files changed, 158 insertions(+), 63 deletions(-)

diff --git a/examples/reference/elements/bokeh/Sankey.ipynb b/examples/reference/elements/bokeh/Sankey.ipynb
index 8952c37bf3..16d02a90f6 100644
--- a/examples/reference/elements/bokeh/Sankey.ipynb
+++ b/examples/reference/elements/bokeh/Sankey.ipynb
@@ -18,6 +18,7 @@
    "outputs": [],
    "source": [
     "import holoviews as hv\n",
+    "from holoviews import dim\n",
     "hv.extension('bokeh')"
    ]
   },
@@ -50,7 +51,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Above the node labels are generated automatically from the supplied edges, however, frequently the edges are expressed as integer node indexes and labels are provided separately. We can explicitly define the set of nodes as a Dataset of indexes and labels as key and value dimensions respectively. We can also use the ``edge_color_index`` plot option to color each edge by a dimension and adjust the ``label_position`` from ``\"right\"`` to ``\"left\"``.\n",
+    "Above the node labels are generated automatically from the supplied edges, however, frequently the edges are expressed as integer node indexes and labels are provided separately. We can explicitly define the set of nodes as a Dataset of indexes and labels as key and value dimensions respectively. We can also use the ``edge_color`` style option to define a style mapping to a dimension and adjust the ``label_position`` from ``\"right\"`` to ``\"left\"``.\n",
     "\n",
     "Here we will plot a simple dataset of the career paths of UK PhD students source as described in a [2010 Royal Society policy report](http://royalsociety.org/uploadedFiles/Royal_Society_Content/policy/publications/2010/4294970126.pdf) entitled “The Scientific Century: securing our future prosperity”. We define the nodes enumerated by their integer index and the percentages flowing between each career stage. Finally we define a Dimension with units for the values and color by the target node which we label \"To\"."
    ]
@@ -70,7 +71,8 @@
     "\n",
     "value_dim = hv.Dimension('Percentage', unit='%')\n",
     "hv.Sankey((edges, nodes), ['From', 'To'], vdims=value_dim).options(\n",
-    "    label_index='label', label_position='left', width=900, height=300, edge_color_index='To'\n",
+    "    labels='label', label_position='right', width=900, height=300, edge_color=dim('To').str(),\n",
+    "    node_color=dim('index').str(), cmap='Set1'\n",
     ")"
    ]
   }
diff --git a/examples/reference/elements/matplotlib/Sankey.ipynb b/examples/reference/elements/matplotlib/Sankey.ipynb
index 727e71e005..f2b05e9f89 100644
--- a/examples/reference/elements/matplotlib/Sankey.ipynb
+++ b/examples/reference/elements/matplotlib/Sankey.ipynb
@@ -18,6 +18,7 @@
    "outputs": [],
    "source": [
     "import holoviews as hv\n",
+    "from holoviews import dim\n",
     "hv.extension('matplotlib')\n",
     "\n",
     "%output fig='svg'"
@@ -52,7 +53,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Above the node labels are generated automatically from the supplied edges, however, frequently the edges are expressed as integer node indexes and labels are provided separately. We can explicitly define the set of nodes as a Dataset of indexes and labels as key and value dimensions respectively. We can also use the ``edge_color_index`` plot option to color each edge by a dimension and adjust the ``label_position`` from ``\"right\"`` to ``\"left\"``.\n",
+    "Above the node labels are generated automatically from the supplied edges, however, frequently the edges are expressed as integer node indexes and labels are provided separately. We can explicitly define the set of nodes as a Dataset of indexes and labels as key and value dimensions respectively. We can also use the ``edge_color`` style option to define a style mapping to a dimension and adjust the ``label_position`` from ``\"right\"`` to ``\"left\"``.\n",
     "\n",
     "Here we will plot a simple dataset of the career paths of UK PhD students source as described in a [2010 Royal Society policy report](http://royalsociety.org/uploadedFiles/Royal_Society_Content/policy/publications/2010/4294970126.pdf) entitled “The Scientific Century: securing our future prosperity”. We define the nodes enumerated by their integer index and the percentages flowing between each career stage. Finally we define a Dimension with units for the values and color by the target node which we label \"To\"."
    ]
@@ -72,7 +73,8 @@
     "\n",
     "value_dim = hv.Dimension('Percentage', unit='%')\n",
     "hv.Sankey((edges, nodes), ['From', 'To'], vdims=value_dim).options(\n",
-    "    label_index='label', label_position='left', fig_size=250, edge_color_index='To'\n",
+    "    labels='label', label_position='right', fig_size=300, edge_color=dim('To').str(),\n",
+    "    node_color=dim('index').str(), cmap='Set1'\n",
     ")"
    ]
   }
diff --git a/holoviews/plotting/bokeh/__init__.py b/holoviews/plotting/bokeh/__init__.py
index 548b126057..6d7d0741e9 100644
--- a/holoviews/plotting/bokeh/__init__.py
+++ b/holoviews/plotting/bokeh/__init__.py
@@ -247,9 +247,10 @@ def colormap_generator(palette):
     selection_policy='nodes', width=1000, height=600, show_frame=False
 )
 options.Sankey = Options(
-    'style', node_line_alpha=0, node_nonselection_alpha=0.2,
-    node_size=10, edge_nonselection_alpha=0.2, edge_line_alpha=0,
-    edge_fill_alpha=0.6, label_text_font_size='8pt', cmap='Category20'
+    'style', node_nonselection_alpha=0.2, node_size=10, edge_nonselection_alpha=0.2,
+    edge_fill_alpha=0.6, label_text_font_size='8pt', cmap='Category20',
+    node_line_color='black', node_selection_line_color='black', node_hover_alpha=1,
+    edge_hover_alpha=0.9
 )
 
 
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index ebf4d9d383..0b682b8b6d 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -732,7 +732,7 @@ def _apply_transforms(self, element, source, ranges, style, group=None):
                         factors = util.unique_array(val)
                     kwargs['factors'] = factors
                 cmapper = self._get_colormapper(v, element, ranges,
-                                                style, name=k+'_color_mapper',
+                                                dict(style), name=k+'_color_mapper',
                                                 group=group, **kwargs)
                 key = {'field': k, 'transform': cmapper}
             new_style[k] = key
@@ -1305,7 +1305,7 @@ def _get_colormapper(self, eldim, element, ranges, style, factors=None, colors=N
             low, high = None, None
 
         prefix = '' if group is None else group+'_'
-        cmap = colors or style.get(prefix+'cmap', style.pop('cmap', 'viridis'))
+        cmap = colors or style.get(prefix+'cmap', style.get('cmap', 'viridis'))
         nan_colors = {k: rgba_tuple(v) for k, v in self.clipping_colors.items()}
         if isinstance(cmap, dict):
             if factors is None:
diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
index 3d739eea81..a3a567bbd0 100644
--- a/holoviews/plotting/bokeh/graphs.py
+++ b/holoviews/plotting/bokeh/graphs.py
@@ -268,9 +268,6 @@ def _init_glyphs(self, plot, element, ranges, source):
         properties.update(mappings)
 
         layout = data.pop('layout', {})
-        if data and mapping:
-            CompositeElementPlot._init_glyphs(self, plot, element, ranges, source,
-                                              data, mapping, style)
 
         # Define static layout
         layout = StaticLayoutProvider(graph_layout=layout)
@@ -310,6 +307,11 @@ def _init_glyphs(self, plot, element, ranges, source):
                 filtered = self._filter_properties(props, glyph_type, allowed_properties)
                 new_glyph = glyph_model(**dict(filtered, **edge_mapping))
                 setattr(renderer.edge_renderer, glyph_type+'glyph', new_glyph)
+
+        if data and mapping:
+            CompositeElementPlot._init_glyphs(self, plot, element, ranges, source,
+                                              data, mapping, style)
+
         self.handles[self.edge_glyph+'_glyph'] = renderer.edge_renderer.glyph
         if 'hover' in self.handles:
             if self.handles['hover'].renderers == 'auto':
@@ -381,7 +383,7 @@ def _init_glyphs(self, plot, element, ranges, source):
     def _update_glyphs(self, element, ranges, style):
         if 'multi_line_2_glyph' in self.handles:
             self._sync_arcs()
-        super(ChordPlot, self)._init_glyphs(element, ranges, style)
+        super(ChordPlot, self)._update_glyphs(element, ranges, style)
 
     def get_data(self, element, ranges, style):
         offset = style.pop('label_offset', 1.05)
diff --git a/holoviews/plotting/bokeh/sankey.py b/holoviews/plotting/bokeh/sankey.py
index ce4120177e..de4fe1b523 100644
--- a/holoviews/plotting/bokeh/sankey.py
+++ b/holoviews/plotting/bokeh/sankey.py
@@ -7,19 +7,15 @@
 
 from ...core.data import Dataset
 from ...core.util import basestring, max_range, dimension_sanitizer
+from ...util.transform import dim
 from .graphs import GraphPlot
 
 
 
 class SankeyPlot(GraphPlot):
 
-    color_index = param.ClassSelector(default=2, class_=(basestring, int),
-                                      allow_None=True, doc="""
-        Index of the dimension from which the node colors will be drawn""")
-
-    label_index = param.ClassSelector(default=2, class_=(basestring, int),
-                                      allow_None=True, doc="""
-        Index of the dimension from which the node labels will be drawn""")
+    labels = param.ClassSelector(class_=(basestring, dim), doc="""
+        The dimension or dimension value transform used to draw labels from.""")
 
     label_position = param.ObjectSelector(default='right', objects=['left', 'right'],
                                           doc="""
@@ -37,9 +33,19 @@ class SankeyPlot(GraphPlot):
     iterations = param.Integer(default=32, doc="""
         Number of iterations to run the layout algorithm.""")
 
-    _style_groups = dict(GraphPlot._style_groups, quad='nodes', text='label')
+    # Deprecated options
 
-    _draw_order = ['patches', 'quad', 'text']
+    color_index = param.ClassSelector(default=2, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Index of the dimension from which the node labels will be drawn""")
+
+    label_index = param.ClassSelector(default=2, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Index of the dimension from which the node labels will be drawn""")
+
+    _style_groups = dict(GraphPlot._style_groups, quad='node', text='label')
+
+    _draw_order = ['patches', 'quad', 'scatter', 'text']
 
     style_opts = GraphPlot.style_opts + ['edge_fill_alpha', 'nodes_line_color',
                                          'label_text_font_size']
@@ -56,20 +62,44 @@ def get_data(self, element, ranges, style):
         data, mapping, style = super(SankeyPlot, self).get_data(element, ranges, style)
         self._compute_quads(element, data, mapping)
         style['nodes_line_color'] = 'black'
-
-        lidx = element.nodes.get_dimension(self.label_index)
-        if lidx is None:
-            if self.label_index is not None:
-                dims = element.nodes.dimensions()[2:]
-                self.warning("label_index supplied to Sankey not found, "
-                             "expected one of %s, got %s." %
-                             (dims, self.label_index))
-            return data, mapping, style
-
         self._compute_labels(element, data, mapping)
         self._patch_hover(element, data)
         return data, mapping, style
 
+    def _init_glyphs(self, plot, element, ranges, source):
+        super(SankeyPlot, self)._init_glyphs(plot, element, ranges, source)
+        arc_renderer = self.handles['quad_1_glyph_renderer']
+        scatter_renderer = self.handles['scatter_1_glyph_renderer']
+        arc_renderer.view = scatter_renderer.view
+        arc_renderer.data_source = scatter_renderer.data_source
+        self.handles['quad_1_source'] = scatter_renderer.data_source
+        self._sync_nodes()
+
+    def _init_glyph(self, plot, mapping, properties, key):
+        if key == 'quad_1':
+            properties.pop('size', None)
+            mapping.pop('size', None)
+        return super(SankeyPlot, self)._init_glyph(plot, mapping, properties, key)
+
+    def _update_glyphs(self, element, ranges, style):
+        self._sync_nodes()
+        super(SankeyPlot, self)._update_glyphs(element, ranges, style)
+    
+    def _sync_nodes(self):
+        arc_renderer = self.handles['quad_1_glyph_renderer']
+        scatter_renderer = self.handles['scatter_1_glyph_renderer']
+        for gtype in ('selection_', 'nonselection_', 'muted_', 'hover_', ''):
+            glyph = getattr(scatter_renderer, gtype+'glyph')
+            arc_glyph = getattr(arc_renderer, gtype+'glyph')
+            print(gtype, glyph, arc_glyph)
+            if not glyph or not arc_glyph:
+                continue
+            scatter_props = glyph.properties_with_values(include_defaults=False)
+            styles = {k: v for k, v in scatter_props.items()
+                      if k in arc_glyph.properties()}
+            print(styles)
+            arc_glyph.update(**styles)
+
     def _compute_quads(self, element, data, mapping):
         """
         Computes the node quad glyph data.x
@@ -82,16 +112,14 @@ def _compute_quads(self, element, data, mapping):
             quad_data['y0'].append(node['y0'])
             quad_data['x1'].append(node['x1'])
             quad_data['y1'].append(node['y1'])
-        data['quad_1'] = quad_data
-        if 'node_fill_color' in mapping['scatter_1']:
-            quad_mapping['fill_color'] = mapping['scatter_1']['node_fill_color']
+            data['scatter_1'].update(quad_data)
+        data['quad_1'] = data['scatter_1']
         mapping['quad_1'] = quad_mapping
 
     def _compute_labels(self, element, data, mapping):
         """
         Computes labels for the nodes and adds it to the data.
         """
-        lidx = element.nodes.get_dimension(self.label_index)
         if element.vdims:
             edges = Dataset(element)[element[element.vdims[0].name]>0]
             nodes = list(np.unique([edges.dimension_values(i) for i in range(2)]))
@@ -99,17 +127,42 @@ def _compute_labels(self, element, data, mapping):
         else:
             nodes = element
 
+        label_dim = nodes.get_dimension(self.label_index)
+        labels = self.labels
+        if label_dim and labels:
+            if self.label_index not in [2, None]:
+                self.warning("Cannot declare style mapping for 'labels' option "
+                             "and declare a label_index; ignoring the label_index.")
+        elif label_dim:
+            labels = label_dim
+        if isinstance(labels, basestring):
+            labels = element.nodes.get_dimension(labels)
+
+        if labels is None:
+            text = []
+        if isinstance(labels, dim):
+            text = labels.apply(element, flat=True)
+        else:
+            text = element.nodes.dimension_values(labels)
+            text = [labels.pprint_value(v) for v in text]
+
         value_dim = element.vdims[0]
-        labels = [lidx.pprint_value(v) for v in nodes.dimension_values(lidx)]
-        if self.show_values:
-            value_labels = []
-            for i, node in enumerate(element._sankey['nodes']):
+        text_labels = []
+        for i, node in enumerate(element._sankey['nodes']):
+            if len(text):
+                label = text[i]
+            else:
+                label = ''
+            if self.show_values:
                 value = value_dim.pprint_value(node['value'])
-                label = '%s - %s' % (labels[i], value)
-                if value_dim.unit:
-                    label += ' %s' % value_dim.unit
-                value_labels.append(label)
-            labels = value_labels
+                if label:
+                    label = '%s - %s' % (label, value)
+                else:
+                    label = value
+            if value_dim.unit:
+                label += ' %s' % value_dim.unit
+            if label:
+                text_labels.append(label)
 
         ys = nodes.dimension_values(1)
         nodes = element._sankey['nodes']
@@ -118,7 +171,7 @@ def _compute_labels(self, element, data, mapping):
             xs = np.array([node['x1'] for node in nodes])+offset
         else:
             xs = np.array([node['x0'] for node in nodes])-offset
-        data['text_1'] = dict(x=xs, y=ys, text=[str(l) for l in labels])
+        data['text_1'] = dict(x=xs, y=ys, text=[str(l) for l in text_labels])
         align = 'left' if self.label_position == 'right' else 'right'
         mapping['text_1'] = dict(text='text', x='x', y='y', text_baseline='middle', text_align=align)
 
diff --git a/holoviews/plotting/mpl/sankey.py b/holoviews/plotting/mpl/sankey.py
index 1c45928390..7a671e91a1 100644
--- a/holoviews/plotting/mpl/sankey.py
+++ b/holoviews/plotting/mpl/sankey.py
@@ -6,19 +6,15 @@
 from matplotlib.collections import PatchCollection
 
 from ...core.util import basestring, max_range
+from ...util.transform import dim
 from .graphs import GraphPlot
 from .util import filter_styles
 
 
 class SankeyPlot(GraphPlot):
 
-    color_index = param.ClassSelector(default=2, class_=(basestring, int),
-                                      allow_None=True, doc="""
-        Index of the dimension from which the node labels will be drawn""")
-
-    label_index = param.ClassSelector(default=2, class_=(basestring, int),
-                                      allow_None=True, doc="""
-        Index of the dimension from which the node labels will be drawn""")
+    labels = param.ClassSelector(class_=(basestring, dim), doc="""
+        The dimension or dimension value transform used to draw labels from.""")
 
     show_values = param.Boolean(default=True, doc="""
         Whether to show the values.""")
@@ -36,6 +32,16 @@ class SankeyPlot(GraphPlot):
     iterations = param.Integer(default=32, doc="""
         Number of iterations to run the layout algorithm.""")
 
+    # Deprecated options
+
+    color_index = param.ClassSelector(default=2, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Index of the dimension from which the node labels will be drawn""")
+
+    label_index = param.ClassSelector(default=2, class_=(basestring, int),
+                                      allow_None=True, doc="""
+        Index of the dimension from which the node labels will be drawn""")
+
     filled = True
 
     def get_extents(self, element, ranges, range_type='combined'):
@@ -61,25 +67,50 @@ def get_extents(self, element, ranges, range_type='combined'):
     def get_data(self, element, ranges, style):
         data, style, axis_kwargs = super(SankeyPlot, self).get_data(element, ranges, style)
         rects, labels = [], []
+
         label_dim = element.nodes.get_dimension(self.label_index)
+        labels = self.labels
+        if label_dim and labels:
+            if self.label_index not in [2, None]:
+                self.warning("Cannot declare style mapping for 'labels' option "
+                             "and declare a label_index; ignoring the label_index.")
+        elif label_dim:
+            labels = label_dim
+        if isinstance(labels, basestring):
+            labels = element.nodes.get_dimension(labels)
+
+        if labels is None:
+            text = []
+        if isinstance(labels, dim):
+            text = labels.apply(element, flat=True)
+        else:
+            text = element.nodes.dimension_values(labels)
+            text = [labels.pprint_value(v) for v in text]
+
         value_dim = element.vdims[0]
-        values = [] if label_dim is None else element.nodes.dimension_values(label_dim)
+        text_labels = []
         for i, node in enumerate(element._sankey['nodes']):
             x0, x1, y0, y1 = (node[a+i] for a in 'xy' for i in '01')
             rect = {'height': y1-y0, 'width': x1-x0, 'xy': (x0, y0)}
             rects.append(rect)
-            if len(values):
-                label = label_dim.pprint_value(values[i])
-                if self.show_values:
-                    value = value_dim.pprint_value(node['value'])
+            if len(text):
+                label = text[i]
+            else:
+                label = ''
+            if self.show_values:
+                value = value_dim.pprint_value(node['value'])
+                if label:
                     label = '%s - %s' % (label, value)
-                    if value_dim.unit:
-                        label += ' %s' % value_dim.unit
+                else:
+                    label = value
+            if value_dim.unit:
+                label += ' %s' % value_dim.unit
+            if label:
                 x = x1+(x1-x0)/4. if self.label_position == 'right' else x0-(x1-x0)/4.
-                labels.append((label, (x, (y0+y1)/2.)))
+                text_labels.append((label, (x, (y0+y1)/2.)))
         data['rects'] = rects
-        if labels:
-            data['text'] = labels
+        if text_labels:
+            data['text'] = text_labels
         return data, style, axis_kwargs
 
     def _update_labels(self, ax, data, style):
@@ -107,6 +138,10 @@ def init_artists(self, ax, plot_args, plot_kwargs):
         groups = [g for g in self._style_groups if g != 'node']
         node_opts = filter_styles(plot_kwargs, 'node', groups, ('s', 'node_s'))
         rects = [Rectangle(**rect) for rect in plot_args['rects']]
+        if 'vmin' in node_opts:
+            node_opts['clim'] = node_opts.pop('vmin'), node_opts.pop('vmax')
+        if 'c' in node_opts:
+            node_opts['array'] = node_opts.pop('c')
         artists['rects'] = ax.add_collection(PatchCollection(rects, **node_opts))
         artists['labels'] = self._update_labels(ax, plot_args, plot_kwargs)
         return artists

From a55529eacb35282f3fc62cccc72fb00d145b5d14 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Thu, 22 Nov 2018 01:18:42 +0000
Subject: [PATCH 113/117] Added dim.str transform

---
 holoviews/plotting/bokeh/sankey.py | 2 --
 holoviews/util/transform.py        | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/holoviews/plotting/bokeh/sankey.py b/holoviews/plotting/bokeh/sankey.py
index de4fe1b523..cfa87fddec 100644
--- a/holoviews/plotting/bokeh/sankey.py
+++ b/holoviews/plotting/bokeh/sankey.py
@@ -91,13 +91,11 @@ def _sync_nodes(self):
         for gtype in ('selection_', 'nonselection_', 'muted_', 'hover_', ''):
             glyph = getattr(scatter_renderer, gtype+'glyph')
             arc_glyph = getattr(arc_renderer, gtype+'glyph')
-            print(gtype, glyph, arc_glyph)
             if not glyph or not arc_glyph:
                 continue
             scatter_props = glyph.properties_with_values(include_defaults=False)
             styles = {k: v for k, v in scatter_props.items()
                       if k in arc_glyph.properties()}
-            print(styles)
             arc_glyph.update(**styles)
 
     def _compute_quads(self, element, data, mapping):
diff --git a/holoviews/util/transform.py b/holoviews/util/transform.py
index b2c2c6c7c4..39c8f97870 100644
--- a/holoviews/util/transform.py
+++ b/holoviews/util/transform.py
@@ -217,6 +217,12 @@ def norm(self):
         """
         return dim(self, _norm)
 
+    def str(self):
+        """
+        Casts values to strings
+        """
+        return self.astype(str)
+
     # Other methods
     
     def applies(self, dataset):

From ec0487cff88e4146b9f82421e5d55359a5f10d52 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Thu, 22 Nov 2018 01:26:49 +0000
Subject: [PATCH 114/117] Further Sankey fixes

---
 .../gallery/demos/bokeh/energy_sankey.ipynb   |  2 +-
 .../demos/matplotlib/energy_sankey.ipynb      |  2 +-
 holoviews/plotting/bokeh/sankey.py            | 19 ++++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/examples/gallery/demos/bokeh/energy_sankey.ipynb b/examples/gallery/demos/bokeh/energy_sankey.ipynb
index e78915f0e2..9ee4a2d124 100644
--- a/examples/gallery/demos/bokeh/energy_sankey.ipynb
+++ b/examples/gallery/demos/bokeh/energy_sankey.ipynb
@@ -42,7 +42,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "hv.Sankey(edges).options(label_position='left')"
+    "hv.Sankey(edges, label='Energy Diagram').options(label_position='left', edge_color='target', node_color='index', cmap='tab20')"
    ]
   }
  ],
diff --git a/examples/gallery/demos/matplotlib/energy_sankey.ipynb b/examples/gallery/demos/matplotlib/energy_sankey.ipynb
index df3e99e484..4840ec2232 100644
--- a/examples/gallery/demos/matplotlib/energy_sankey.ipynb
+++ b/examples/gallery/demos/matplotlib/energy_sankey.ipynb
@@ -44,7 +44,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "hv.Sankey(edges).options(label_position='left')"
+    "hv.Sankey(edges, label='Energy Diagram').options(label_position='left', edge_color='target', node_color='index', cmap='tab20')"
    ]
   }
  ],
diff --git a/holoviews/plotting/bokeh/sankey.py b/holoviews/plotting/bokeh/sankey.py
index cfa87fddec..fb78ba5f9f 100644
--- a/holoviews/plotting/bokeh/sankey.py
+++ b/holoviews/plotting/bokeh/sankey.py
@@ -24,6 +24,9 @@ class SankeyPlot(GraphPlot):
     show_values = param.Boolean(default=True, doc="""
         Whether to show the values.""")
 
+    show_legend = param.Boolean(default=False, doc="""
+        Whether to show the values.""")
+
     node_width = param.Number(default=15, doc="""
         Width of the nodes.""")
 
@@ -56,6 +59,13 @@ def _init_glyphs(self, plot, element, ranges, source):
         ret = super(SankeyPlot, self)._init_glyphs(plot, element, ranges, source)
         renderer = plot.renderers.pop(plot.renderers.index(self.handles['glyph_renderer']))
         plot.renderers = [renderer] + plot.renderers
+        arc_renderer = self.handles['quad_1_glyph_renderer']
+        scatter_renderer = self.handles['scatter_1_glyph_renderer']
+        arc_renderer.view = scatter_renderer.view
+        arc_renderer.data_source = scatter_renderer.data_source
+        self.handles['quad_1_source'] = scatter_renderer.data_source
+        self._sync_nodes()
+
         return ret
 
     def get_data(self, element, ranges, style):
@@ -66,15 +76,6 @@ def get_data(self, element, ranges, style):
         self._patch_hover(element, data)
         return data, mapping, style
 
-    def _init_glyphs(self, plot, element, ranges, source):
-        super(SankeyPlot, self)._init_glyphs(plot, element, ranges, source)
-        arc_renderer = self.handles['quad_1_glyph_renderer']
-        scatter_renderer = self.handles['scatter_1_glyph_renderer']
-        arc_renderer.view = scatter_renderer.view
-        arc_renderer.data_source = scatter_renderer.data_source
-        self.handles['quad_1_source'] = scatter_renderer.data_source
-        self._sync_nodes()
-
     def _init_glyph(self, plot, mapping, properties, key):
         if key == 'quad_1':
             properties.pop('size', None)

From 30862245314a816b1347a093cd8c69319a22f4e6 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Thu, 22 Nov 2018 02:08:12 +0000
Subject: [PATCH 115/117] Updated nyc_airport_routes

---
 .../demos/bokeh/nyc_airport_connections.ipynb |   5 +-
 .../matplotlib/nyc_taxi_connections.ipynb     | 108 ++++++++++++++++++
 2 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 examples/gallery/demos/matplotlib/nyc_taxi_connections.ipynb

diff --git a/examples/gallery/demos/bokeh/nyc_airport_connections.ipynb b/examples/gallery/demos/bokeh/nyc_airport_connections.ipynb
index e86db43ea2..3b0b25ddd8 100644
--- a/examples/gallery/demos/bokeh/nyc_airport_connections.ipynb
+++ b/examples/gallery/demos/bokeh/nyc_airport_connections.ipynb
@@ -18,6 +18,7 @@
     "import numpy as np\n",
     "import networkx as nx\n",
     "import holoviews as hv\n",
+    "from holoviews import dim\n",
     "\n",
     "from holoviews.element.graphs import layout_nodes\n",
     "from bokeh.sampledata.airport_routes import routes, airports\n",
@@ -67,11 +68,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "cmap={'3697': 'red', '3797': 'blue'}\n",
+    "cmap={3697: 'red', 3797: 'blue'}\n",
     "\n",
     "plot = (\n",
     "    graph.options(\n",
-    "        bgcolor='gray', cmap=cmap, color_index='IATA', edge_cmap=cmap, edge_color_index='SourceID', \n",
+    "        bgcolor='gray', edge_color=dim('SourceID').categorize(cmap, 'gray'), node_color=dim('index').categorize(cmap, 'gray'),\n",
     "        width=800, height=800, xaxis=None, yaxis=None, xlim=(-1.2, 1.2), ylim=(-1.2, 1.2), \n",
     "    ) *\n",
     "    nyc_labels.options(text_color='white', yoffset=0.05, text_font_size='16pt') *\n",
diff --git a/examples/gallery/demos/matplotlib/nyc_taxi_connections.ipynb b/examples/gallery/demos/matplotlib/nyc_taxi_connections.ipynb
new file mode 100644
index 0000000000..8dba44db9a
--- /dev/null
+++ b/examples/gallery/demos/matplotlib/nyc_taxi_connections.ipynb
@@ -0,0 +1,108 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Most examples work across multiple plotting backends, this example is also available for:\n",
+    "\n",
+    "* [Bokeh NYC Taxi Connection](../bokeh/nyc_taxi_connections.ipynb)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import numpy as np\n",
+    "import networkx as nx\n",
+    "import holoviews as hv\n",
+    "from holoviews import dim\n",
+    "\n",
+    "from holoviews.element.graphs import layout_nodes\n",
+    "from bokeh.sampledata.airport_routes import routes, airports\n",
+    "\n",
+    "hv.extension('matplotlib')\n",
+    "%output fig='svg' size=300"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Declare data"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Create dataset indexed by AirportID and with additional value dimension\n",
+    "airports = hv.Dataset(airports, ['AirportID'], ['Name', 'IATA', 'City'])\n",
+    "source_airports = list(airports.select(City='New York').data.AirportID)\n",
+    "\n",
+    "# Add connections count to routes then aggregate and select just routes connecting to NYC\n",
+    "routes['connections'] = 1\n",
+    "nyc_graph = hv.Graph((routes, airports), ['SourceID', \"DestinationID\"], ['connections'], label='NYC Airport Connections').aggregate(function=np.count_nonzero).select(SourceID=source_airports)\n",
+    "\n",
+    "# Lay out graph weighting and weight by the number of connections\n",
+    "np.random.seed(14)\n",
+    "graph = layout_nodes(nyc_graph, layout=nx.layout.fruchterman_reingold_layout, kwargs={'weight': 'connections'})\n",
+    "labels = hv.Labels(graph.nodes, ['x', 'y'], ['IATA', 'City'])\n",
+    "nyc_labels = labels.select(City='New York')\n",
+    "other_labels = labels[labels['City']!='New York']"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Plot"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "cmap={3697: 'red', 3797: 'blue'}\n",
+    "\n",
+    "plot = (\n",
+    "    graph.options(\n",
+    "        bgcolor='gray', edge_color=dim('SourceID').categorize(cmap, 'gray'), node_color=dim('index').categorize(cmap, 'gray'),\n",
+    "        xaxis=None, yaxis=None, xlim=(-1.2, 1.2), ylim=(-1.2, 1.2)\n",
+    "     ) *\n",
+    "     nyc_labels.options(color='white', yoffset=0.05, size=16) *\n",
+    "     other_labels.options(color='white', size=8)\n",
+    ")\n",
+    "\n",
+    "plot.relabel('NYC Airport Connections')"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.6.6"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}

From f5f5c158e99561dae9b99929129ff18459b3a456 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Thu, 22 Nov 2018 02:28:58 +0000
Subject: [PATCH 116/117] Fixed issue in VectorField

---
 holoviews/plotting/bokeh/chart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/holoviews/plotting/bokeh/chart.py b/holoviews/plotting/bokeh/chart.py
index 1b981e22da..083831b6b4 100644
--- a/holoviews/plotting/bokeh/chart.py
+++ b/holoviews/plotting/bokeh/chart.py
@@ -284,7 +284,7 @@ def get_data(self, element, ranges, style):
 
         data = {'x0': x0s, 'x1': x1s, 'y0': y0s, 'y1': y1s}
         mapping = dict(x0='x0', x1='x1', y0='y0', y1='y1')
-        if cdim and color:
+        if cdim and color is not None:
             data[cdim.name] = color
             mapping.update(cmapping)
 

From d71c656fcae0282957e549c5ad91859069459bc0 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Thu, 22 Nov 2018 03:46:45 +0000
Subject: [PATCH 117/117] Fixed stray tuple dim format in examples

---
 examples/gallery/demos/bokeh/autompg_violins.ipynb | 3 ++-
 examples/gallery/demos/bokeh/boxplot_chart.ipynb   | 3 ++-
 examples/gallery/demos/bokeh/route_chord.ipynb     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/gallery/demos/bokeh/autompg_violins.ipynb b/examples/gallery/demos/bokeh/autompg_violins.ipynb
index 2a7f1735a5..880a1d864c 100644
--- a/examples/gallery/demos/bokeh/autompg_violins.ipynb
+++ b/examples/gallery/demos/bokeh/autompg_violins.ipynb
@@ -16,6 +16,7 @@
    "outputs": [],
    "source": [
     "import holoviews as hv\n",
+    "from holoviews import dim\n",
     "\n",
     "from  bokeh.sampledata.autompg import autompg\n",
     "hv.extension('bokeh')"
@@ -50,7 +51,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "violin.options(height=500, width=900, violin_fill_color=('Year', str), cmap='Set1')"
+    "violin.options(height=500, width=900, violin_fill_color=dim('Year').str(), cmap='Set1')"
    ]
   }
  ],
diff --git a/examples/gallery/demos/bokeh/boxplot_chart.ipynb b/examples/gallery/demos/bokeh/boxplot_chart.ipynb
index e75efb0506..d425a00930 100644
--- a/examples/gallery/demos/bokeh/boxplot_chart.ipynb
+++ b/examples/gallery/demos/bokeh/boxplot_chart.ipynb
@@ -18,6 +18,7 @@
    "outputs": [],
    "source": [
     "import holoviews as hv\n",
+    "from holoviews import dim\n",
     "hv.extension('bokeh')"
    ]
   },
@@ -53,7 +54,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "boxwhisker.options(show_legend=False, width=600, box_fill_color=('origin', str), cmap='Set1')"
+    "boxwhisker.options(show_legend=False, width=600, box_fill_color=dim('origin').str(), cmap='Set1')"
    ]
   }
  ],
diff --git a/examples/gallery/demos/bokeh/route_chord.ipynb b/examples/gallery/demos/bokeh/route_chord.ipynb
index 7f06424fdb..9d44d4e05e 100644
--- a/examples/gallery/demos/bokeh/route_chord.ipynb
+++ b/examples/gallery/demos/bokeh/route_chord.ipynb
@@ -57,7 +57,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Chord [labels='City' width=800 height=800] (edge_color=dim('SourceID').astype(str) node_color=dim('AirportID').astype(str) cmap='Category20')\n",
+    "%%opts Chord [labels='City' width=800 height=800] (edge_color=dim('SourceID').str() node_color=dim('AirportID').str() cmap='Category20')\n",
     "busiest_airports"
    ]
   }