Skip to content

remove duplicate args in @options() in region_plot #36296

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
merged 3 commits into from
Sep 24, 2023
Merged

remove duplicate args in @options() in region_plot #36296

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
beb94bc
remove duplicate args in @options() in region_plot
dimpase Sep 18, 2023
80fd0a9
Fix options in region_plot
egourgoulhon Sep 19, 2023
b7c6367
Merge branch 'region_plot' of github.com:egourgoulhon/sage into optio…
dimpase Sep 19, 2023
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
17 changes: 12 additions & 5 deletions src/sage/plot/contour_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,8 +1394,7 @@ def f(x,y):
@options(plot_points=100, incol='blue', outcol=None, bordercol=None,
borderstyle=None, borderwidth=None, frame=False, axes=True,
legend_label=None, aspect_ratio=1, alpha=1)
def region_plot(f, xrange, yrange, plot_points, incol, outcol, bordercol,
borderstyle, borderwidth, alpha, **options):
def region_plot(f, xrange, yrange, **options):
r"""
``region_plot`` takes a boolean function of two variables, `f(x, y)`
and plots the region where f is True over the specified
Expand Down Expand Up @@ -1659,6 +1658,14 @@ def region_plot(f, xrange, yrange, plot_points, incol, outcol, bordercol,
from warnings import warn
import numpy

plot_points = options['plot_points']
incol = options.pop('incol')
outcol = options.pop('outcol')
bordercol = options.pop('bordercol')
borderstyle = options.pop('borderstyle')
borderwidth = options.pop('borderwidth')
alpha = options.pop('alpha')

if not isinstance(f, (list, tuple)):
f = [f]

Expand All @@ -1677,9 +1684,9 @@ def region_plot(f, xrange, yrange, plot_points, incol, outcol, bordercol,
if neqs and not bordercol:
bordercol = incol
if not f:
return implicit_plot(feqs[0], xrange, yrange, plot_points=plot_points,
fill=False, linewidth=borderwidth,
linestyle=borderstyle, color=bordercol, **options)
return implicit_plot(feqs[0], xrange, yrange, fill=False,
linewidth=borderwidth, linestyle=borderstyle,
color=bordercol, **options)
f_all, ranges = setup_for_eval_on_grid(feqs + f,
[xrange, yrange],
plot_points)
Expand Down