Skip to content

add scatter_or_line argument to Learner1D.plot #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbweston merged 3 commits into from
Oct 14, 2019
Merged

add scatter_or_line argument to Learner1D.plot #215

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82a55f2
add scatter_or_line argument to Learner1D.plot
basnijholt Sep 5, 2019
a24fe9b
set 'scatter_or_line' by default to 'scatter'
basnijholt Oct 14, 2019
62a7d6b
wrap all plots in an Overlay
basnijholt Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions adaptive/learner/learner1D.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,23 +580,35 @@ def _loss(self, mapping, ival):
loss = mapping[ival]
return finite_loss(ival, loss, self._scale[0])

def plot(self):
def plot(self, *, scatter_or_line="scatter"):
"""Returns a plot of the evaluated data.

Parameters
----------
scatter_or_line : str, default: "scatter"
Plot as a scatter plot ("scatter") or a line plot ("line").

Returns
-------
plot : `holoviews.element.Scatter` (if vdim=1)\
else `holoviews.element.Path`
plot : `holoviews.Overlay`
Plot of the evaluated data.
"""
if scatter_or_line not in ("scatter", "line"):
raise ValueError("scatter_or_line must be 'scatter' or 'line'")
hv = ensure_holoviews()

xs, ys = zip(*sorted(self.data.items())) if self.data else ([], [])
if self.vdim == 1:
p = hv.Path([]) * hv.Scatter((xs, ys))
if scatter_or_line == "scatter":
if self.vdim == 1:
plots = [hv.Scatter((xs, ys))]
else:
plots = [hv.Scatter((xs, _ys)) for _ys in np.transpose(ys)]
else:
p = hv.Path((xs, ys)) * hv.Scatter([])
plots = [hv.Path((xs, ys))]

# Put all plots in an Overlay because a DynamicMap can't handle changing
# datatypes, e.g. when `vdim` isn't yet known and the live_plot is running.
p = hv.Overlay(plots)
# Plot with 5% empty margins such that the boundary points are visible
margin = 0.05 * (self.bounds[1] - self.bounds[0])
plot_bounds = (self.bounds[0] - margin, self.bounds[1] + margin)
Expand Down